texlive[66870] Master/texmf-dist: koma-script (17apr23)
commits+karl at tug.org
commits+karl at tug.org
Mon Apr 17 21:57:41 CEST 2023
Revision: 66870
http://tug.org/svn/texlive?view=revision&revision=66870
Author: karl
Date: 2023-04-17 21:57:41 +0200 (Mon, 17 Apr 2023)
Log Message:
-----------
koma-script (17apr23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/koma-script/MANIFEST.md
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-de.tex
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-headfootheight-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/common-textmarkup-de.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/common-textmarkup-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.bib
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrjura-de.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrjura-example-de.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-scrpage-de.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-scrpage-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-de.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-de.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/scrextend.dtx
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-bibliography.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-fonts.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-footnotes.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsandtabulars.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pseudolengths.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-title.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-variables.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrmain.ins
trunk/Master/texmf-dist/source/latex/koma-script/scrtime.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
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/koma-script/scrwfile.html
trunk/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx
trunk/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/MANIFEST.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/koma-script/MANIFEST.md 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/doc/latex/koma-script/MANIFEST.md 2023-04-17 19:57:41 UTC (rev 66870)
@@ -52,7 +52,6 @@
* `scrlfile-patcholdlatex.dtx`
* `scrlogo.dtx`
* `scrtime.dtx`
-* `scrwfile.dtx`
* `tocbasic.dtx`
* `scrjura.dtx`
* `scrmain.ins`
@@ -219,7 +218,6 @@
* `README.scrreport.cls`
* `README.scrreprt.cls`
* `README.scrtime.sty`
-* `README.scrwfile.sty`
* `README.tocbasic.sty`
* `README.typearea.sty`
* `releaselist.txt`
@@ -249,7 +247,6 @@
* `scrlfile.sty`
* `scrlogo.sty`
* `scrtime.sty`
-* `scrwfile.sty`
* `tocbasic.sty`
* `typearea.sty`
* `koma-script-source-doc.cls`
@@ -314,7 +311,6 @@
* `scrextend.html`
* `scrlayer-scrpage.html`
* `scrlfile-hook.html`
-* `scrwfile.html`
* `scrdate.html`
* `scrartcl.html`
* `scrlfile.html`
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/koma-script/README.md 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/doc/latex/koma-script/README.md 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,5 +1,5 @@
-# KOMA-Script 2022/10/12 v3.38
-Copyright [Markus Kohm](mailto:komascript at gmx.info) 1994–2022
+# KOMA-Script 2023/04/17 v3.39
+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: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -76,8 +76,8 @@
<pre>
Maintainer: Markus Kohm
E-Mail: komascript at gmx.info
-Abstract: scrreport is a very simple wrapper class to scrartcl. Is has
- been made, because several younger KOMA-Script users doe not
+Abstract: scrreport is a very simple wrapper class to scrartcl. It has
+ been made, because several younger KOMA-Script users do not
understand the 8.3 name scheme.
However it is still recommended to use scrartcl instead of
@@ -85,7 +85,7 @@
Requires: scrartcl.cls - KOMA-Script class
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -126,7 +126,7 @@
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -148,7 +148,7 @@
typearea - KOMA-Script package
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -169,7 +169,7 @@
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -200,7 +200,7 @@
etoolbox - tool-box for LaTeX programming using e-TeX
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -214,7 +214,7 @@
Requires: scrextend - some KOMA-Script features for other classes
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -234,7 +234,7 @@
xpatch - extending etoolbox patching commands
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -252,7 +252,7 @@
tocbasic - features for helper files and float environments
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -269,7 +269,7 @@
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -314,7 +314,7 @@
Requires: scrlayer.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -341,24 +341,22 @@
Requires: scrkbase.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
-### `scrletter` — wrapper class to scrlttr2
+### `scrletter` — wrapper class to scrartcl class + scrletter package
<pre>
Maintainer: Markus Kohm
E-Mail: komascript at gmx.info
-Abstract: scrreport is a very simple wrapper class to scrlttr2. Is has
- been made, because several younger KOMA-Script users doe not
- understand the 8.3 name scheme.
-
- However it is still recommended to use scrlttr2 instead of
- scrletter.
-Requires: scrlttr2.cls - KOMA-Script class
+Abstract: scrletter is a wrapper class to class scrartcl with package
+ scrletter. Is has been made, to provide a letter class, that
+ also supports features like sections and floats.
+Requires: scrartcl.cls – KOMA-Script class
+ scrletter.sty – KOMA-Script package
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -375,7 +373,7 @@
Recommended: marvosym - package by Martin Vogel providing symbols
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -388,7 +386,7 @@
Requires: scrlogo.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -401,7 +399,7 @@
Requires: scrlogo.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -421,7 +419,7 @@
Requires: scrlfile-hook.sty, scrlfile-patcholdlatex.sty, scrlogo.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -435,7 +433,7 @@
Requires:
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -470,7 +468,7 @@
Recommended: marvosym - package by Martin Vogel providing symbols
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -478,8 +476,8 @@
<pre>
Maintainer: Markus Kohm
E-Mail: komascript at gmx.info
-Abstract: scrreport is a very simple wrapper class to scrreprt. Is has
- been made, because several younger KOMA-Script users doe not
+Abstract: scrreport is a very simple wrapper class to scrreprt. It has
+ been made, because several younger KOMA-Script users do not
understand the 8.3 name scheme.
However it is still recommended to use scrreprt instead of
@@ -487,7 +485,7 @@
Requires: scrreprt.cls - KOMA-Script class
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -509,7 +507,7 @@
typearea - KOMA-Script package
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -523,41 +521,10 @@
Requires: scrkbase - internal package with some basics of KOMA-Script
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
-### `scrwfile` — Spare write handles for helper files to avoid `No room' messages
-<pre>
-Maintainer: Markus Kohm
-E-Mail: komascript at gmx.info
-Abstract: scrwfile is a LaTeX package of the KOMA-Script bundle. TeX
- makes only about 16 write handles available for \newwrite.
- With LaTeX, each auxiliary file, not only the main aux file
- but files such as the toc file, the lof file, the lot file,
- and the raw indexes and glossaries need one of these
- handles. scrwfile provides facilities to avoid using
- handles for auxiliary files that use the main aux file for
- intermediate writing. This means that the toc file, the lof
- file, the lot file, and files of packages like listings no
- longer need a write handle, so the user will have more write
- handles for files like indexes or glossaries and can avoid
- `No room for new \write' error messages.
-
- scrwfile also provides facilities to clone auxiliary files,
- e.g., to have two tables of contents with different tocdepth
- settings.
-Requires: scrbase - some basic features for class and package
- authors
- tocbasic - basic features for helper files and lists of
- floats
- scrlfile - control of package dependencies
-License: LPPL 1.3c or later
-State: Author maintained
-Version: 2022/10/06 v0.1.11
-</pre>
-***
-
### `tocbasic` — Management of tables and lists of contents using helper files
<pre>
Maintainer: Markus Kohm
@@ -581,7 +548,7 @@
Requires: scrbase - KOMA-Script package for some basic features.
License: LPPL 1.3c or later
State: Author maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</pre>
***
@@ -604,7 +571,7 @@
Requires: scrkbase - internal basic features for KOMA-Script packages
License: LPPL 1.3c or later
State: Autor maintained
-Version: 2022/10/12 v3.38
+Version: 2023/04/17 v3.39
</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-de.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/koma-script/examples/scrjura-example-de.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/doc/latex/koma-script/examples/scrjura-example-de.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -23,7 +23,7 @@
\subject{Satzung}
\title{VfVmai}
-\subtitle{Verein für Vereinsmaierei mit ai n.e.V.}
+\subtitle{Verein für Vereinsmaierei mit ai n.\,e.\,V.}
\date{11.\,11.\,2011}
\maketitle
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)
Deleted: trunk/Master/texmf-dist/doc/latex/koma-script/scrwfile.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/koma-script/scrwfile.html 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/doc/latex/koma-script/scrwfile.html 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
- <head>
- <meta name="keywords" content="KOMA-Script, scrwfile
- <meta name="DC.Title" content="Economising and Replacing Files with scrwfile" />
- <meta name="DC.Creator" content="l3build" />
- <meta name="DC.Subject" content="KOMA-Script Documentation" />
- <meta name="DC.Description" content="Where to find the KOMA-Script
- documentation of scrwfile" />
- <meta name="DC.Publisher" content="Markus kohm" />
- <meta name="DC.Date" content="2022-06-03" />
- <meta name="DC.Type" content="Text" />
- <meta name="DC.Format" content="text/html" />
- <meta name="DC.Identifier" content="scrwfile.html" />
- <meta name="DC.Language" content="en,de" />
- <meta name="DC.Relation" content="Link to documentation" />
- <meta name="DC.Coverage" content="Version since 3.00" />
- <meta name="DC.Rights" content="LaTeX Public Private License 1.3c" />
- <title>Economising and Replacing Files with scrwfile</title>
- <style type="text/css">
- <!--
- body {}
- #en { position:absolute; left:10px; width:45%; }
- #de { position:absolute; right:10px; width:45%; }
- #fn { position:absolute; bottom:0px; width:50%;
- border-top-width:1px; border-top-style:solid;
- font-size:x-small; }
- h1.right { text-align:right; }
- -->
- </style>
- </head>
- <body>
- <h1>Economising and Replacing Files with <tt>scrwfile</tt></h1>
- <h1 class="right">Dateien mit <tt>scrwfile</tt> sparen und ersetzen</h1>
- <div id="en">
- I think you are searching for the chapter
- <a href="scrguide-en.pdf#chapter.14">“Economising and Replacing Files with <tt>scrwfile</tt>”</a> in the
- KOMA-Script documentation.
- </div>
- <div id="de">
- Ich nehme an, Sie suchen nach dem Kapitel
- <a href="scrguide-de.pdf#chapter.14">„Dateien mit <tt>scrwfile</tt> sparen und ersetzen”</a> in der
- KOMA-Script-Anleitung.
- </div>
- <div id="fn">
- Markus Kohm, 2022-06-03
- <p><a
- href="http://validator.w3.org/check?uri=referer"><img
- src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1"
- height="31" width="88" /></a></p>
- </div>
- </body>
-</html>
-
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/common-headfootheight-en.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/common-headfootheight-en.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/common-headfootheight-en.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% common-headfootheight-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,9 +24,9 @@
% ============================================================================
\KOMAProvidesFile{common-headfootheight-en.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2023-04-06 09:05:58 +0200 (Do, 06. Apr 2023) $
KOMA-Script guide (common paragraph: Head and Foot Height)]
-\translator{Markus Kohm\and Jana Schubert\and Jens H\"uhne\and Karl Hagen}
+\translator{Markus Kohm\and Jana Schubert\and Jens Hühne\and Karl Hagen}
\section{Header and Footer Height}
\seclabel{height}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/common-textmarkup-de.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/common-textmarkup-de.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/common-textmarkup-de.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{common-textmarkup-de.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
KOMA-Script guide (common paragraphs)]
\section{Textauszeichnungen}
@@ -156,6 +156,54 @@
\fi
+\IfThisCommonLabelBaseOneOf{scrlayer-scrpage,scrjura,scrlayer-notecolumn}{%
+ \iffalse%
+}{%
+ \csname iftrue\endcsname%
+}%
+ \begin{Declaration}
+ \OptionVName{sfdefaults}{Ein-Aus-Wert}%
+ \Macro{maybesffamily}%
+ \Macro{textmaybesf}\Parameter{Text}%
+ \end{Declaration}
+ Die%
+ \IfThisCommonLabelBase{maincls}{%
+ \ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ }{%
+ \IfThisCommonLabelBase{scrextend}{%
+ \ChangedAt{v3.39}{\Package{screxend}}%
+ }{%
+ \IfThisCommonLabelBase{scrlttr2}{%
+ \ChangedAt{v3.39}{\Class{scrlttr2}}%
+ }{}%
+ }%
+ } Anweisungen \Macro{maybesffamily} und \Macro{textmaybesf} verhalten sich
+ je nach Einstellung von Option \Option{sfdefaults} unterschiedlich. Als
+ \PName{Ein-Aus-Wert} kann dabei einer der Standardwerte für einfache
+ Schalter aus \autoref{tab:truefalseswitch} verwendet werden. Nur bei
+ aktivierter Option führt \Macro{maybesffamily} zu \Macro{sffamily} und
+ \Macro{textmaybesf} zu \Macro{textsf}. \KOMAScript{} selbst verwendet
+ \Macro{maybesffamily} in der Voreinstellung der Elemente
+ \IfThisCommonLabelBase{scrextend}{}{%
+ \DescRef{\LabelBase.fontelement.descriptionlabel}, %
+ }%
+ \IfThisCommonLabelBase{scrlttr2}{%
+ \DescRef{\LabelBase.fontelement.backaddress}, %
+ \DescRef{\LabelBase.fontelement.refname} %
+ und \DescRef{\LabelBase.fontelement.lettertitle}%
+ }{%
+ \IfThisCommonLabelBase{scrextend}{%
+ \DescRef{maincls.fontelement.disposition}%
+ }{%
+ \DescRef{\LabelBase.fontelement.disposition}%
+ } %
+ und \DescRef{\LabelBase.fontelement.dictum}%
+ }.%
+ \EndIndexGroup%
+ \fi
+
+
\begin{Declaration}
\Macro{setkomafont}\Parameter{Element}\Parameter{Befehle}%
\Macro{addtokomafont}\Parameter{Element}\Parameter{Befehle}%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/common-textmarkup-en.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/common-textmarkup-en.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/common-textmarkup-en.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{common-textmarkup-en.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
KOMA-Script guide (common paragraphs)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and
Karl Hagen}
@@ -153,6 +153,53 @@
\fi
+\IfThisCommonLabelBaseOneOf{scrlayer-scrpage,scrjura,scrlayer-notecolumn}{%
+ \iffalse%
+}{%
+ \csname iftrue\endcsname%
+}%
+ \begin{Declaration}
+ \OptionVName{sfdefaults}{simple switch}%
+ \Macro{maybesffamily}%
+ \Macro{textmaybesf}\Parameter{text}%
+ \end{Declaration}
+ The%
+ \IfThisCommonLabelBase{maincls}{%
+ \ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrreprt}\and
+ \Class{scrartcl}}%
+ }{%
+ \IfThisCommonLabelBase{scrextend}{%
+ \ChangedAt{v3.39}{\Package{screxend}}%
+ }{%
+ \IfThisCommonLabelBase{scrlttr2}{%
+ \ChangedAt{v3.39}{\Class{scrlttr2}}%
+ }{}%
+ }%
+ } \Macro{maybesffamily} and \Macro{textmaybesf} commands behave differently
+ depending on the setting of option \Option{sfdefaults}. One of the default
+ values for simple switches from \autoref{tab:truefalseswitch} can be used
+ here. Only if this option is enabled will \Macro{maybesffamily} result in
+ \Macro{sffamily} and \Macro{textmaybesf} use \Macro{textsf}. KOMA-Script
+ itself uses \Macro{maybesffamily} in the default settings of elements
+ \IfThisCommonLabelBase{scrextend}{}{%
+ \DescRef{\LabelBase.fontelement.descriptionlabel}, %
+ }%
+ \IfThisCommonLabelBase{scrlttr2}{%
+ \DescRef{\LabelBase.fontelement.backaddress}, %
+ \DescRef{\LabelBase.fontelement.refname}, %
+ and \DescRef{\LabelBase.fontelement.lettertitle}%
+ }{%
+ \IfThisCommonLabelBase{scrextend}{%
+ \DescRef{maincls.fontelement.disposition}%
+ }{%
+ \DescRef{\LabelBase.fontelement.disposition}, %
+ }%
+ and \DescRef{\LabelBase.fontelement.dictum}%
+ }.%
+ \EndIndexGroup%
+\fi
+
+
\begin{Declaration}
\Macro{setkomafont}\Parameter{element}\Parameter{commands}%
\Macro{addtokomafont}\Parameter{element}\Parameter{commands}%
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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% scrbookreportarticle-en.tex
-% Copyright (c) Markus Kohm, 2001-2022
+% Copyright (c) Markus Kohm, 2001-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,11 +24,11 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle-en.tex}
- [$Date: 2022-07-17 12:37:12 +0200 (So, 17. Jul 2022) $
+ [$Date: 2023-04-06 09:05:58 +0200 (Do, 06. Apr 2023) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)]
\translator{Jens-Uwe Morawski\and Gernot Hassenpflug\and Markus Kohm\and
- Krickette Murabayashi\and Jana Schubert\and Jens H\"uhne\and Karl Hagen}
+ Krickette Murabayashi\and Jana Schubert\and Jens Hühne\and Karl Hagen}
\chapter{The Main Classes: \Class{scrbook}, \Class{scrreprt}, and
\Class{scrartcl}}
@@ -1615,7 +1615,7 @@
\ChangedAt{v3.12}{\Class{scrbook}\and\Class{scrreprt}\and\Class{scrartcl}}%
Reset the font settings for each of the standard sectioning levels and use
headings with the sizes of the standard classes. For chapter headings,
- \Class{scrbook} und \Class{scrreprt} set
+ \Class{scrbook} and \Class{scrreprt} set
\OptionValue{headings}{twolinechapter}.%
}%
\entry{\PValue{twolineappendix}, \PValue{appendixprefix},
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.bib
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.bib 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.bib 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% scrguide.bib
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -719,6 +719,16 @@
url = {CTAN://macros/latex/contrib/splitindex/}
}
+ at Misc{ package:scrwfile,
+ language= {english},
+ author = {Markus Kohm},
+ title = {{\Package{scrwfile}} -- Use {\LaTeX} {\File{.aux}} file in place of {\Macro{newfile}} files},
+ year = 2023,
+ month = apr,
+ edition = {0.1.99},
+ url = {https://www.ctan.org/pkg/scrwfile}
+}
+
@Misc{ package:supertabular,
language= {english},
author = {Braams, Johannes L. and Jurriens, Theo},
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrjura-de.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrjura-de.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrjura-de.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% scrjura-de.tex
-% Copyright (c) Markus Kohm, 2011-2022
+% Copyright (c) Markus Kohm, 2011-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{scrjura-de.tex}%
- [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
+ [$Date: 2023-04-16 13:50:16 +0200 (So, 16. Apr 2023) $
KOMA-Script guide (chapter: scrjura)]
\chapter{Unterstützung für die Anwaltspraxis durch \Package{scrjura}}
@@ -1069,7 +1069,7 @@
Wie Sie am Laden von \Package{fontenc} erkennen können, wird für das Beispiel
PDF\LaTeX{} verwendet. Soll stattdessen \LuaLaTeX{} oder \XeLaTeX{} verwendet
-werden, entfallen alle drei Zeilen. Wahlweise kann dann \Package{fontspec}
+werden, entfallen die beiden Zeilen. Wahlweise kann dann \Package{fontspec}
geladen oder einfach mit den Voreinstellungen gearbeitet werden.
\lstinputcode[{xleftmargin=2em,%
@@ -1136,7 +1136,7 @@
Der erste Paragraph erhält neben der Nummer auch einen Titel. Dies wird auch
bei den nachfolgenden Paragraphen so sein.
-Der erste Absatz des Vertrags enthält nichts ungewöhnliches. Da es nicht der
+Der erste Absatz des Vertrags enthält nichts Ungewöhnliches. Da es nicht der
einzige Absatz ist, werden bei der Ausgabe jedem Absatz automatisch
Absatznummern voran gestellt werden. Damit dies auch beim ersten Absatz
geschieht, sind allerdings zwei \LaTeX-Läufe notwendig. Da dies für das
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrjura-example-de.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrjura-example-de.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrjura-example-de.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -23,7 +23,7 @@
\subject{Satzung}
\title{VfVmai}
-\subtitle{Verein für Vereinsmaierei mit ai n.e.V.}
+\subtitle{Verein für Vereinsmaierei mit ai n.\,e.\,V.}
\date{11.\,11.\,2011}
\maketitle
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-scrpage-de.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-scrpage-de.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-scrpage-de.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% scrlayer-scrpage-de.tex
-% Copyright (c) Markus Kohm, 2013-2022
+% Copyright (c) Markus Kohm, 2013-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -23,7 +23,7 @@
% ============================================================================
\KOMAProvidesFile{scrlayer-scrpage-de.tex}%
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2023-04-06 10:35:02 +0200 (Do, 06. Apr 2023) $
KOMA-Script guide (chapter:scrlayer-scrpage)]
\chapter[{Kopf- und Fußzeilen mit \Package{scrlayer-scrpage}}]
@@ -386,6 +386,18 @@
wird, bleibt der Seitenstil \DescRef{\LabelBase.pagestyle.plain.scrheadings}
unverändert. Das Ergebnis ist für die erste Seite also tatsächlich korrekt.
+ Die explizite Verwendung von
+ \DescRef{maincls.cmd.pagestyle}\PParameter{scrheadings} ist nicht einmal
+ notwendig. Das Paket führt diese Anweisung bereits selbst beim Laden aus,
+ stellt den Seitenstil also automatisch auf
+ \DescRef{\LabelBase.pagestyle.scrheadings}\IndexPagestyle{scrheadings}
+ um. Dabei wird auch nicht nur der Seitenstil
+ \DescRef{maincls.pagestyle.headings}\IndexPagestyle{headings} automatisch in
+ \DescRef{\LabelBase.pagestyle.scrheadings} geändert, sondern auch
+ \DescRef{maincls.pagestyle.plain}\IndexPagestyle{plain} in
+ \DescRef{\LabelBase.pagestyle.plain.scrheadings}%
+ \IndexPagestyle{plain.scrheadings}.
+
Fügen Sie jetzt im Beispiel nach \DescRef{maincls.cmd.maketitle} so viel
Text ein, dass eine zweite Seite ausgegeben wird. Sie können dazu auch
einfach \Macro{usepackage}\PParameter{lipsum}\IndexPackage{lipsum} in der
@@ -404,7 +416,6 @@
{Peter Musterheinzel}
\rohead[Seitenstile mit \KOMAScript]
{Seitenstile mit \KOMAScript}
- \pagestyle{scrheadings}
\usepackage{lipsum}
\begin{document}
\title{Seitenstile mit \KOMAScript}
@@ -483,7 +494,6 @@
\usepackage{scrlayer-scrpage}
\lohead*{Peter Musterheinzel}
\rohead*{Seitenstile mit \KOMAScript}
- \pagestyle{scrheadings}
\usepackage{lipsum}
\begin{document}
\title{Seitenstile mit \KOMAScript}
@@ -693,7 +703,6 @@
\lohead{Peter Musterheinzel}
\rohead{Seitenstile mit \KOMAScript}
\lofoot{Verlag Naseblau, Irgendwo}
- \pagestyle{scrheadings}
\usepackage{lipsum}
\begin{document}
\title{Seitenstile mit \KOMAScript}
@@ -790,7 +799,6 @@
\lehead{Seitenstile mit \KOMAScript}
\refoot[Verlag Naseblau, Irgendwo]
{Verlag Naseblau, Irgendwo}
- \pagestyle{scrheadings}
\setkomafont{pageheadfoot}{\small}
\setkomafont{pagehead}{\bfseries}
\usepackage{lipsum}
@@ -864,7 +872,6 @@
\rehead{Peter Musterheinzel}
\lehead{Seitenstile mit \KOMAScript}
\refoot*{Verlag Naseblau, Irgendwo}
- \pagestyle{scrheadings}
\setkomafont{pageheadfoot}{\small}
\setkomafont{pagehead}{\bfseries}
\usepackage{lipsum}
@@ -936,7 +943,6 @@
\ohead{Seitenstile mit \KOMAScript}
\ifoot[Verlag Naseblau, Irgendwo]
{Verlag Naseblau, Irgendwo}
- \pagestyle{scrheadings}
\setkomafont{pageheadfoot}{\small}
\setkomafont{pagehead}{\bfseries}
\usepackage{lipsum}
@@ -1019,7 +1025,6 @@
\ihead{Peter Musterheinzel}
\ohead{Seitenstile mit \KOMAScript}
\ifoot*{Verlag Naseblau, Irgendwo}
- \pagestyle{scrheadings}
\setkomafont{pageheadfoot}{\small}
\setkomafont{pagehead}{\bfseries}
\usepackage{lipsum}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-scrpage-en.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-scrpage-en.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-scrpage-en.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% scrlayer-scrpage-en.tex
-% Copyright (c) Markus Kohm, 2013-2022
+% Copyright (c) Markus Kohm, 2013-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -23,9 +23,9 @@
% ============================================================================
\KOMAProvidesFile{scrlayer-scrpage-en.tex}%
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2023-04-06 09:06:52 +0200 (Do, 06. Apr 2023) $
KOMA-Script guide (chapter: scrlayer-scrpage)]
-\translator{Markus Kohm\and Jana Schubert\and Jens H\"uhne\and Karl Hagen}
+\translator{Markus Kohm\and Jana Schubert\and Jens Hühne\and Karl Hagen}
\chapter[{Headers and Footers with \Package{scrlayer-scrpage}}]
{Headers\ChangedAt{v3.12}{\Package{scrlayer-scrpage}} and
@@ -355,6 +355,7 @@
\usepackage{scrlayer-scrpage}
\lohead{John Doe}
\rohead{Page style with \KOMAScript}
+ \pagestyle{scrheadings}
\begin{document}
\title{Page styles with \KOMAScript}
\author{John Doe}
@@ -376,6 +377,17 @@
\DescRef{\LabelBase.pagestyle.plain.scrheadings} page style remains
unchanged and the result for the first page is actually correct.
+ The explicit use of \DescRef{maincls.cmd.pagestyle}\PParameter{scrheadings}
+ is not even necessary. The package already executes this command itself when
+ loading, so it automatically sets the page style to
+ \DescRef{\LabelBase.pagestyle.scrheadings}\IndexPagestyle{scrheadings}. This
+ also changes not only the page style
+ \DescRef{maincls.pagestyle.headings}\IndexPagestyle{headings} automatically
+ to \DescRef{\LabelBase.pagestyle.scrheadings}, but also
+ \DescRef{maincls.pagestyle.plain}\IndexPagestyle{plain} to
+ \DescRef{\LabelBase.pagestyle.plain.scrheadings}%
+ \IndexPagestyle{plain.scrheadings}.
+
Now add enough text to the example after \DescRef{maincls.cmd.maketitle}
so that a second page is printed. You can simply add
\Macro{usepackage}\PParameter{lipsum}\IndexPackage{lipsum} to the document
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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% scrlttr2-en.tex
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrlttr2-en.tex}%
- [$Date: 2022-10-12 08:12:27 +0200 (Mi, 12. Okt 2022) $
+ [$Date: 2023-03-20 09:42:36 +0100 (Mo, 20. Mär 2023) $
KOMA-Script guide (chapter: scrlttr2)]
\translator{Harald Bongartz\and Georg Grandke\and Raimund Kohl\and Jens-Uwe
@@ -4095,7 +4095,7 @@
he finds it quite annoying to copy this information to each new letter. To
simplify the effort of writing a new letter, he therefore creates an
\File{lco} file:%
- \lstinputcode[xleftmargin=1em]{ich.lco}%
+ \lstinputcode[xleftmargin=1em]{me.lco}%
With this, the size of his letter from the previous example shrinks
considerably: \lstinputcode[xleftmargin=1em]{letter-example-23-en.tex}%
Nevertheless, the result does not change, as shown in
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-de.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-de.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-de.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% scrwfile-de.tex
-% Copyright (c) Markus Kohm, 2001-2022
+% Copyright (c) Markus Kohm, 2010-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrwfile-de.tex}
- [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
+ [$Date: 2023-03-31 16:23:35 +0200 (Fr, 31. Mär 2023) $
KOMA-Script guide (chapter: scrwfile)]
\chapter{Dateien mit \Package{scrwfile} sparen und ersetzen}
@@ -31,243 +31,25 @@
\labelbase{scrwfile}
\BeginIndexGroup
-\BeginIndex{Package}{scrwfile}
-Eines der Probleme, die auch durch die Einführung von \eTeX{} nicht gelöst
-wurden, ist die Tatsache, dass \TeX{} nur 18 Dateien gleichzeitig zum Schreiben
-geöffnet haben kann. Diese Zahl erscheint zunächst recht groß. Allerdings ist
-zu berücksichtigen, dass bereits \LaTeX{} selbst einige dieser Dateien
-belegt. Inhaltsverzeichnis, Tabellenverzeichnis, Abbildungsverzeichnis, Index,
-Glossar und jedes weitere Verzeichnis, das von \LaTeX{} aus erzeugt wird,
-belegt in der Regel eine weitere Datei. Dazu kommen Hilfsdateien von Paketen
-wie \Package{hyperref} oder \Package{minitoc}.
-
-Im Endeffekt kann es daher geschehen, dass irgendwann die Meldung
-\begin{lstcode}
+\BeginIndex{Package}{scrwfile}%
+Von Version 3.10 bis 3.38 war das Paket
+\href{https://www.ctan.org/pkg/scrwfile}{\Package{scrwfile}} Bestandteil von
+\KOMAScript. Danach wurde es als eigenständiges Paket aus \KOMAScript{}
+herausgelöst. Das erschien und erscheint noch immer sinnvoll, weil das Paket
+immer experimentell und ohne offizielle Unterstützung war. Darüber hinaus
+lautet schon seit einiger Zeit die Empfehlung, stattdessen \LuaLaTeX{} zu
+verwenden, da mit \LuaLaTeX{} das Grundproblem:
+\begin{lstoutput}
! No room for a new \write .
\ch at ck ...\else \errmessage {No room for a new #3}
\fi
-\end{lstcode}
-erscheint. Seit einiger Zeit ist die einfachste Lösung dieses Problems die
-Verwendung von \LuaLaTeX{} anstelle von PDF\LaTeX{} oder \XeLaTeX. Damit
-entfällt die Beschränkung und die maximale Anzahl der gleichzeitig zum
-Schreiben geöffneten Dateien wird nur noch durch das Betriebssystem
-bestimmt. In der Realität braucht man sich darüber dann normalerweise keine
-Gedanken mehr zu machen.
+\end{lstoutput}
+nicht mehr existiert.
-Dass \LaTeX{} bei Verzeichnissen wie dem Inhaltsverzeichnis, dem
-Tabellenverzeichnis und dem Abbildungsverzeichnis immer sofort eine neue Datei
-zum Schreiben öffnet, hat aber auch noch einen weiteren Nachteil. Solche
-Verzeichnisse werden durch deren Befehle nicht nur direkt gesetzt, sie können
-auch kein weiteres Mal gesetzt werden, da die zugehörige Hilfsdatei nach dem
-jeweiligen Befehl bis zum Ende des Dokuments leer ist.
-
-Das Paket \Package{scrwfile} bietet hier eine grundsätzliche Änderung im
-\LaTeX-Kern, durch die beide Probleme nicht nur für \LuaLaTeX{} sondern auch
-bei Verwendung von PDF\LaTeX{} oder \XeLaTeX{} gelöst werden können.
-
-
-\section{Grundsätzliche Änderungen am \LaTeX-Kern}
-\seclabel{kernelpatches}
-
-\LaTeX-Klassen verwenden zum Öffnen eines Verzeichnisses, beispielsweise mit
-\Macro{tableofcontents} oder \Macro{listoffigures}, die \LaTeX-Kern-Anweisung
-\Macro{@starttoc}\IndexCmd{@starttoc}. \LaTeX{} selbst lädt bei dieser
-Anweisung nicht nur die zugehörige Hilfsdatei, sondern öffnet diese Hilfsdatei
-auch neu zum Schreiben. Werden anschließend mit \Macro{addtocontents} oder
-\Macro{addcontentsline} Einträge in dieses Verzeichnis vorgenommen, so wird
-jedoch nicht direkt in die geöffnete Hilfsdatei geschrieben. Stattdessen
-schreibt \LaTeX{} \Macro{@writefile}-Anweisungen\IndexCmd{@writefile} in die
-\File{aux}-Datei. Erst beim Einlesen der \File{aux}-Dateien am Ende des
-Dokuments wird dann über diese \Macro{@writefile}-Anweisungen in die
-tatsächlichen Hilfsdateien geschrieben. Die Hilfsdateien werden von \LaTeX{}
-auch nicht explizit geschlossen. Stattdessen verlässt sich \LaTeX{} hier
-darauf, dass \TeX{} die Dateien am Ende ohnehin schließt.
-
-Dieses Vorgehen sorgt dafür, dass die Hilfsdateien zwar erst innerhalb von
-\Macro{end}\PParameter{document} tatsächlich beschrieben werden, aber trotzdem
-während des gesamten \LaTeX-Laufs gleichzeitig offen sind. \Package{scrwfile}
-hat nun genau hier einen Ansatzpunkt: die Umdefinierung von \Macro{@starttoc}
-und \Macro{@writefile}.
-
-Natürlich\textnote{Achtung!} besitzen Änderungen am \LaTeX-Kern immer das
-Potential, dass es zu Unverträglichkeiten mit anderen Paketen kommen
-kann. Betroffen können in erster Linie Pakete sein, die ebenfalls
-\Macro{@starttoc} oder \Macro{@writefile} umdefinieren. In einigen Fällen kann
-es helfen, die Reihenfolge der Pakete zu ändern.%
-\iffalse % Umbruchkorrektur
-\ Wenn Sie auf ein solches Problem stoßen, sollten Sie sich an den
-\KOMAScript-Autor wenden.5
-\fi
-
-\section{Das Eindateiensystem}
-\seclabel{singlefilefeature}
-
-Bereits beim Laden des Pakets mit
-% Umbruchoptimierung: listings
-\begin{lstcode}
- \usepackage{scrwfile}
-\end{lstcode}
-wird \Macro{@starttoc}\IndexCmd{@starttoc} von \Package{scrwfile} so
-umdefiniert, dass davon selbst keine Datei mehr zum Schreiben angefordert und
-geöffnet wird. Unmittelbar vor dem Schließen der \File{aux}-Datei in
-\Macro{end}\PParameter{document} wird dann \Macro{@writefile} so umdefiniert,
-dass diese Anweisung statt in die eigentlichen Hilfsdateien in eine neue
-Hilfsdatei mit der Endung \File{wrt} schreibt. Nach dem Einlesen der
-\File{aux}-Dateien wird schließlich die \File{wrt}-Datei abgearbeitet und zwar
-ein Mal für jede der Hilfsdateien, in die mit \Macro{@writefile} geschrieben
-wird. Dabei muss aber nicht jede dieser Hilfsdateien gleichzeitig
-geöffnet sein. Stattdessen ist immer nur eine zum Schreiben geöffnet und wird
-auch wieder explizit geschlossen. Da dabei eine interne Schreibdatei von
-\LaTeX{} wiederverwendet wird, benötigt \Package{scrwfile} keine einzige
-eigene Schreibdatei für diese Art von Verzeichnissen.
-
-Selbst wenn bisher nur mit einem Inhaltsverzeichnis gearbeitet wird, steht
-nach dem Laden des Pakets bereits eine Schreibdatei mehr für
-Literaturverzeichnisse, Stichwortverzeichnisse, Glossare und ähnliche
-Verzeichnisse, die nicht mit \Macro{@starttoc} arbeiten, zur
-Verfügung. Darüber hinaus können beliebig viele Verzeichnisse, die mit
-\Macro{@starttoc}\IndexCmd{@starttoc} arbeiten, angelegt werden.%
-%
-
-\section{Das Klonen von Dateieinträgen}
-\seclabel{clonefilefeature}
-
-Nachdem \Macro{@writefile}\IndexCmd{@writefile} für das Eindateiensystem aus
-dem vorherigen Abschnitt bereits so geändert wurde, dass es nicht direkt in
-die entsprechende Hilfsdatei schreibt, lag eine weitere Idee nahe. Beim
-Kopieren der \Macro{@writefile}-Anweisungen in die \File{wrt}-Datei können
-diese auch für andere Zielendungen übernommen werden. Es sei ausdrücklich
-darauf hingewiesen, dass dies nur in der Dokumentpräambel funktioniert.
-
-\begin{Declaration}
- \Macro{TOCclone}\OParameter{Verzeichnisüberschrift}
- \Parameter{Quellendung}\Parameter{Zielendung}
- \Macro{listof\PName{Zielendung}}
-\end{Declaration}%
-Durch dieses Klonen von Dateieinträgen werden so ganze Verzeichnisse
-geklont. Dazu muss man nur die Endung der Hilfsdatei des Verzeichnisses
-kennen, dessen Einträge kopiert werden sollen. Zusätzlich muss man die Endung
-einer Zieldatei angeben. In diese werden die Einträge dann kopiert. Natürlich
-kann man in dieses geklonte Verzeichnis auch zusätzliche Einträge
-schreiben.
-
-Die \PName{Zielendung} der Zieldatei wird mit Hilfe von
-\hyperref[cha:tocbasic]{\Package{tocbasic}}%
-\important{\hyperref[cha:tocbasic]{\Package{tocbasic}}} (siehe
-\autoref{cha:tocbasic}) verwaltet. Steht eine solche Datei bereits unter
-Kontrolle von \hyperref[cha:tocbasic]{\Package{tocbasic}} wird eine Warnung
-ausgegeben. Anderenfalls wird mit Hilfe von
-\hyperref[cha:tocbasic]{\Package{tocbasic}} ein neues Verzeichnis für diese
-Endung angelegt. Die Überschrift des neuen Verzeichnisses kann man über das
-optionale Argument \PName{Verzeichnisüberschrift} bestimmen.
-
-Ausgeben kann man dieses neue Verzeichnis dann beispielsweise über die
-Anweisung \Macro{listof\PName{Zielendung}}. Die
-Verzeichniseigenschaften\important{\hyperref[cha:tocbasic]{\Package{tocbasic}}}
-\PValue{leveldown}, \PValue{numbered}, \PValue{onecolumn} und \PValue{totoc}
-(siehe Anweisung \DescRef{tocbasic.cmd.setuptoc} in
-\autoref{sec:tocbasic.toc}, \DescPageRef{tocbasic.cmd.setuptoc}) werden
-automatisch in das Zielverzeichnis übernommen, falls sie für das
-Quellverzeichnis bereits gesetzt waren. Die Eigenschaft \PValue{nobabel} wird
-für geklonte Verzeichnisse immer gesetzt, da die entsprechenden
-\Package{babel}-Einträge in das Quellverzeichnis ohnehin bereits kopiert
-werden.
-
-\begin{Example}
- Angenommen, Sie wollen zusätzlich zum normalen Inhaltsverzeichnis eine
- Gliederungsübersicht, in der nur die Kapitel angezeigt werden.
-\begin{lstcode}
- \usepackage{scrwfile}
- \TOCclone[Gliederungsübersicht]{toc}{stoc}
-\end{lstcode}
- Hierdurch wird zunächst ein neues Verzeichnis mit der Überschrift
- »Gliederungsübersicht« angelegt. Das neue Verzeichnis verwendet die
- Dateiendung \File{stoc}. Alle Einträge in die Datei mit der Endung
- \File{toc} werden auch in dieses Verzeichnis kopiert.
-
- Damit dieses neue Verzeichnis nun nur die Kapitelebene ausgibt, verwenden
- wir:
-\begin{lstcode}
- \addtocontents{stoc}{\protect\value{tocdepth}=0}
-\end{lstcode}
- Während\textnote{Achtung!} normalerweise erst ab
- \Macro{begin}\PParameter{document} Einträge in ein Verzeichnis vorgenommen
- werden können, funktioniert dies nach Laden von \Package{scrwfile} bereits
- in der Dokumentpräambel. Durch die hier gezeigte unkonventionelle Art, den
- Zähler \DescRef{maincls.counter.tocdepth} innerhalb der Verzeichnisdatei zu
- ändern, bleibt diese Änderung nur für dieses Verzeichnis wirksam.
-
- Später im Dokument wird das Verzeichnis mit der Endung \File{stoc} dann
- durch
-\begin{lstcode}[moretexcs={listofstoc}]
- \listofstoc
-\end{lstcode}
- ausgegeben und zeigt nur die Teile und Kapitel des Dokuments.
-
- Etwas schwieriger wird es, wenn das Inhaltsverzeichnis in der
- Gliederungsübersicht angezeigt werden soll. Dies wäre zwar mit
-\begin{lstcode}
- \addtocontents{toc}{%
- \protect\addxcontentsline
- {stoc}{chapter}{\protect\contentsname}%
- }
-\end{lstcode}
- möglich. Da jedoch alle Einträge in \File{toc} auch nach \File{stoc} kopiert
- werden, würde so von der Gliederungsübersicht dieser Eintrag ebenfalls
- übernommen. Also darf der Eintrag nicht aus der Verzeichnisdatei heraus
- erzeugt werden. Da das Paket \hyperref[cha:tocbasic]{\Package{tocbasic}}%
- \important{\hyperref[cha:tocbasic]{\Package{tocbasic}}} zum Einsatz kommt,
- kann aber%
- \phantomsection\xmpllabel{cmd.BeforeStartingTOC}%
-\begin{lstcode}
- \BeforeStartingTOC[toc]{%
- \addxcontentsline{stoc}{chapter}
- {\protect\contentsname}}
-\end{lstcode}
- verwendet werden. Natürlich\textnote{Achtung!} setzt dies voraus, dass die
- Datei mit Endung \File{toc} auch unter der Kontrolle von
- \hyperref[cha:tocbasic]{\Package{tocbasic}} steht. Dies ist bei allen
- \KOMAScript-Klassen der Fall. Näheres zur Anweisung
- \DescRef{tocbasic.cmd.BeforeStartingTOC} ist in \autoref{sec:tocbasic.toc}
- auf \DescPageRef{tocbasic.cmd.BeforeStartingTOC} zu finden. Die Erklärung zu
- \DescRef{tocbasic.cmd.addxcontentsline} findet sich in demselben Abschnitt
- auf \DescPageRef{tocbasic.cmd.addxcontentsline}.%
-\end{Example}%
-\EndIndexGroup%
-\ExampleEndFix
-
-
-\section{Hinweis zum Entwicklungsstand}
-\seclabel{draft}
-
-Obwohl das Paket bereits von mehreren Anwendern getestet wurde und vielfach im
-Einsatz ist, ist es vom Autor als experimentell eingestuft. Deshalb ist es
-theoretisch möglich, dass insbesondere an der internen Funktionsweise des
-Pakets noch Änderungen vorgenommen werden. Teilweise befindet sich auch Code
-für zusätzliche Erweiterungen im Paket. Da jedoch keine Benutzeranweisungen
-existieren, mit denen diese Möglichkeiten genutzt werden könnten, wurde auf
-eine Dokumentation derselben verzichtet.
-
-
-\section{Bekannte Paketunverträglichkeiten}
-\seclabel{incompatible}
-
-Wie in \autoref{sec:scrwfile.kernelpatches} bereits erwähnt, muss
-\Package{scrwfile} einige wenige Anweisungen des \LaTeX-Kerns
-umdefinieren. Dies geschieht nicht allein während des Ladens des Pakets,
-sondern vielmehr zu verschiedenen Zeitpunkten während der Abarbeitung eines
-Dokuments, beispielsweise vor dem Einlesen der
-\File{aux}-Datei. Das\textnote{Achtung!} führt dazu, dass \Package{scrwfile}
-sich nicht mit anderen Paketen verträgt, die dieselben Anweisungen ebenfalls
-zur Laufzeit umdefinieren.
-
-Ein Beispiel für eine solche Unverträglichkeit ist
-\Package{titletoc}\important{\Package{titletoc}}\IndexPackage{titletoc}. Das
-Paket definiert unter gewissen Umständen \Macro{@writefile} zur Laufzeit
-um. Werden \Package{scrwfile} und \Package{titletoc} zusammen verwendet, ist
-die Funktion beider Paket nicht mehr gewährleistet. Dies ist weder ein Fehler
-in \Package{titletoc} noch in \Package{scrwfile}.%
-%
+Sollten Sie das Paket dennoch verwendet haben und weiterhin benötigen, so kann
+es getrennt installiert wird. Verwenden Sie dazu vorzugsweise den Paketmanager
+Ihrer \TeX-Distribution. Näheres zu dem Paket finden Sie im
+CTAN-Katalogeintrag \cite{package:scrwfile}.%
\EndIndexGroup
%%% Local Variables:
@@ -278,8 +60,4 @@
%%% eval: (flyspell-mode 1)
%%% End:
-% LocalWords: Eindateiensystem Schreibdatei Zieldatei Zielendung Quellendung
-% LocalWords: Verzeichnisüberschrift Dateiendung Zielendungen Verzeichnisdatei
-% LocalWords: Benutzeranweisungen Dokumentpräambel Kapitelebene
-% LocalWords: Paketunverträglichkeiten Verzeichniseigenschaften
-
+% LocalWords: herausgelöst Paketmanager CTAN Katalogeintrag
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-en.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-en.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-en.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% scrwfile-en.tex
-% Copyright (c) Markus Kohm, 2010-2022
+% Copyright (c) Markus Kohm, 2010-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,10 +24,10 @@
% ============================================================================
\KOMAProvidesFile{scrwfile-en.tex}%
- [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
+ [$Date: 2023-03-31 16:23:35 +0200 (Fr, 31. Mär 2023) $
KOMA-Script guide (chapter: scrwfile)]
-\translator{Markus Kohm\and Jana Schubert\and Karl Hagen}
+\translator{Markus Kohm}
\chapter{Economising and Replacing Files with \Package{scrwfile}}
\labelbase{scrwfile}
@@ -34,228 +34,26 @@
\BeginIndexGroup
\BeginIndex{Package}{scrwfile}
-One of the problems not solved by the introduction of \eTeX{} is the fact that
-\TeX{} can support only 18 open write handles. This number seems quite large
-at first, but many of these handles are already reserved. \TeX{} itself uses
-handle 0 for the log file. \LaTeX{} needs handle 1 for \Macro{@mainaux},
-handle 2 for \Macro{@partaux}, one handle for \Macro{tableofcontents}, one
-handle for \Macro{listoffigures}, one handle for \Macro{listoftables}, and one
-handle for \Macro{makeindex}. Every other such list generates another handle,
-and packages like \Package{hyperref} or \Package{minitoc} require write
-handles too.
-
-The bottom line is that eventually you may get the following error message:
-\begin{lstcode}
+From version 3.10 to 3.38, the package
+\href{https://www.ctan.org/pkg/scrwfile}{\Package{scrwfile}} was part of
+\KOMAScript. After that, it was separated from \KOMAScript{} as a standalone
+package. This seemed and still seems reasonable because the package was always
+experimental and without official support. Moreover, for some time now the
+recommendation has been to use \LuaLaTeX{} instead, since with \LuaLaTeX{} the
+basic problem:
+\begin{lstoutput}
! No room for a new \write .
\ch at ck ...\else \errmessage {No room for a new #3}
- \fi
-\end{lstcode}
+ \fi
+\end{lstoutput}
+no longer exists.
-For some time, the simplest solution to this problem has been to use
-\mbox{\LuaLaTeX} instead of \mbox{pdf\LaTeX} or \XeLaTeX. This eliminates the
-restriction, and the maximum number of files you can have open for writing is
-then limited only by the operating system. In reality, you usually so not need
-to worry about it any more.
-
-The fact that \LaTeX{} always opens a new file for writing every table of
-contents, list of figures, list of tables, etc. has another disadvantage. Such
-lists are not only output by their respective commands, they also could not be
-output a second time because the associated auxiliary file\footnote{The term
- \emph{auxiliary file} here refers not to the main \File{aux} file but to the
- other internal files used indirectly via the \File{aux} file, e.\,g. the
- \File{toc} file, the \File{lof} file, or the \File{lot} file.} is empty
-after the respective command until the end of the document.
-
-The \Package{scrwfile} package makes a fundamental change to the \LaTeX{}
-kernel, which can solve both problems not only for \mbox{\LuaLaTeX} but also
-for \mbox{pdf\LaTeX} or \XeLaTeX.
-
-\section{Fundamental Changes to the \LaTeX{} Kernel}
-\seclabel{kernelpatches}
-
-\LaTeX{} classes use the \LaTeX{} kernel command
-\Macro{@starttoc}\IndexCmd{@starttoc} to allocate a new file handle, such as
-for \Macro{tableofcontents} or \Macro{listoffigures}. This command not only
-loads the associated auxiliary file but also reopens it for writing. If
-entries to these lists are added using \Macro{addcontentsline}, however, the
-system does not write directly to these auxiliary files. Instead, \LaTeX{}
-writes \Macro{@writefile}\IndexCmd{@writefile} commands to the \File{aux}
-file. Only while reading the \File{aux} file at the end of the document do
-those \Macro{@writefile} commands become actual write operations in the
-auxiliary files. Additionally, \LaTeX{} does not close the auxiliary files
-explicitly. Instead it relies on \TeX{} to close all open files at the end.
-
-This procedure ensures that the auxiliary files are only written to within
-\Macro{end}\PParameter{document}, but they remain open throughout the entire
-\LaTeX{} run. \Package{scrwfile} takes is starting point here, by redefining
-\Macro{@starttoc} and \Macro{@writefile}.
-
-Of course\textnote{Attention!} changes to the \LaTeX{} kernel always have the
-potential to cause incompatibilities with other packages. Those primarily
-affected may be those which also redefine \Macro{@starttoc} or
-\Macro{@writefile}. In some cases, it may help to change the order the
-packages are loaded. If you encounter such a problem, please contact the
-\KOMAScript{} author.
-
-\section{The Single-File Method}
-\seclabel{singlefilefeature}
-
-As soon as the package is loaded with
-\begin{lstcode}
- \usepackage{scrwfile}
-\end{lstcode}
-\Package{scrwfile} redefines \Macro{@starttoc}\IndexCmd{@starttoc} so that it
-no longer allocates a write handle or opens a file for writing.
-\Macro{@writefile} is redefined so that immediately before closing the
-\File{aux} file in \Macro{end}\PParameter{document}, it writes not to the
-usual auxiliary files but to a single new file with extension \File{wrt}.
-After reading the \File{aux} file, this \File{wrt} file will be processed once
-for each of the auxiliary files that \Macro{@writefile} writes information to.
-However these auxiliary files do not all have to be open at the same time.
-Instead, only one is open at a time and is explicitly closed afterwards. Since
-\LaTeX{} reuses an internal write file, \Package{scrwfile} doesn't need its
-own write handle for this type of table of contents or list of floating
-environments.
-
-Because of this behaviour, even if you have only one table of contents, once
-you load \Package{scrwfile} you will have access to a write file handle for
-bibliographies, indexes, glossaries, and similar lists that do not use
-\Macro{@starttoc}. Additionally, you can create any number of tables of
-contents and other lists that use \Macro{@starttoc}\IndexCmd{@starttoc}.
-
-\section{The File Cloning Method}
-\seclabel{clonefilefeature}
-
-Since \Macro{@writefile}\IndexCmd{@writefile} has already been modified for
-the single-file method described in the previous system so that it no longer
-writes directly to the corresponding auxiliary file, a further possibility
-suggests itself. When copying the \Macro{@writefile} statements into the
-\File{wrt} file, you can also copy them to other destinations. It should be
-explicitly noted that this only works in the document preamble.
-
-\begin{Declaration}
- \Macro{TOCclone}%
- \OParameter{list heading}\Parameter{source extension}%
- \Parameter{destination extension}
-\end{Declaration}
-This cloning of file entries copies entire tables of contents or other lists.
-For this, you only need to specify the extension of the auxiliary file whose
-entries should be copied and the extension of a destination file. The entries
-are then copied there. Of course, you can also write additional entries to
-this cloned file.
-
-You can manage the \PName{destination extention} using
-\hyperref[cha:tocbasic]{\Package{tocbasic}}%
-\important{\hyperref[cha:tocbasic]{\Package{tocbasic}}} (see
-\autoref{cha:tocbasic}). If such a file is already under the control of
-\hyperref[cha:tocbasic]{\Package{tocbasic}}, a warning will be issued.
-Otherwise, a new list for this extension will be created using
-\hyperref[cha:tocbasic]{\Package{tocbasic}}. You can set the heading for this
-list with the optional argument \PName{list heading}.
-
-You can then output this new content list, for example, with the command
-\Macro{listof\PName{destination extension}}. The content-list
-attributes\important{\hyperref[cha:tocbasic]{\Package{tocbasic}}}
-\PValue{leveldown}, \PValue{numbered}, \PValue{onecolumn}, and \PValue{totoc}
-(see \DescRef{tocbasic.cmd.setuptoc} in \autoref{sec:tocbasic.toc},
-\DescPageRef{tocbasic.cmd.setuptoc}) are automatically copied to the
-destination list if they were already set in the source list. The
-\PValue{nobabel} attribute is always set for cloned content lists, because the
-language-selection commands in the source content list are already copied
-anyway.
-
-\begin{Example}
- Suppose you want a short table of contents with only the chapter level in
- addition to the normal the table of contents:
-\begin{lstcode}
- \usepackage{scrwfile}
- \TOCclone[Summary Contents]{toc}{stoc}
-\end{lstcode}
- This creates a new table of contents with the heading ``Summary Contents''.
- The new table of contents uses an auxiliary file with the extension
- \File{stoc}. All entries to the auxiliary file with extension \File{toc}
- will also be copied to this new auxiliary file.
-
- In order to have the new short table of contents display only the chapter
- entries, we use:
-\begin{lstcode}
- \addtocontents{stoc}{\protect\value{tocdepth}=0}
-\end{lstcode}
- Although\textnote{Attention!} normally you cannot write to an auxiliary file
- before \Macro{begin}\PParameter{document}, the code above works in the
- preamble after loading \Package{scrwfile}. Owing to the unconventional way
- of changing the \DescRef{maincls.counter.tocdepth} counter within the TOC
- file, this change only applies to this content list.
-
- Later in the document, we then output the content list with the file
- extension \File{stoc} with:
-\begin{lstcode}[moretexcs={listofsttoc}]
- \listofstoc
-\end{lstcode}
- and this shows only the parts and chapters of the document.
-
- Things become a bit more difficult if the summary contents are to be
- listed in the table of contents. This would seem to be possible with
-\begin{lstcode}
- \addtocontents{toc}{%
- \protect\addxcontentsline
- {stoc}{chapter}{\protect\contentsname}%
- }
-\end{lstcode}
-However, since all entries in \File{toc} are also copied to \File{stoc}, this
-entry would also be copied from the summary contents. So we cannot generate
-the entry from the content list. Because we use the
-\Package{tocbasic}\important{\Package{tocbasic}} package, we can use the
-following:
-\phantomsection\xmpllabel{cmd.BeforeStartingTOC}
-\begin{lstcode}
- \BeforeStartingTOC[toc]{%
- \addcontentslinedefault{stoc}{chapter}
- {\protect\contentsname}%
- }
-\end{lstcode}
-Of course, this assumes that the \File{toc} file is under the control
-of the \Package{tocbasic} package, which is indeed the case for all
-\KOMAScript{} classes. See \autoref{sec:tocbasic.toc} on
-\DescPageRef{tocbasic.cmd.BeforeStartingTOC} for more information about
-\DescRef{tocbasic.cmd.BeforeStartingTOC}.%
-\end{Example}
-Incidentally, the \DescRef{tocbasic.cmd.addxcontentsline} command used in the
-examples is also documented in \autoref{cha:tocbasic},
-\DescPageRef{tocbasic.cmd.addxcontentsline}.%
+If you have been using the package and still need it, you can install install
+it separately. Preferably use the package manager of your \TeX{}
+distribution. More information about the package can be found in the CTAN
+catalog entry \cite{package:scrwfile}.%
\EndIndexGroup
-
-\section{Note on the State of Development}
-\seclabel{draft}
-
-Although this package has already been tested by many users and is often in
-production use, its development is still ongoing. Therefore, it is
-theoretically possible that there might be changes, especially to the internal
-functionality. It is likely that the package will be extended in the future.
-Some code for such extensions is already in the package. However, as there are
-no user commands that make use of these features, they are currently
-undocumented.
-
-\section{Known Package Incompatibilities}
-\seclabel{incompatible}
-
-As mentioned in \autoref{sec:scrwfile.kernelpatches}, \Package{scrwfile}
-redefines some commands of the \LaTeX{} kernel. This happens not only while
-loading the package, but indeed at various times while the document is
-processed, for example just before reading the \File{aux} file.
-This\textnote{Attention!} results in incompatibility with packages that also
-redefine these commands at run time.
-
-The \Package{titletoc}\important{Package{titletoc}}\IndexPackage{titletoc}
-package is an example for such an incompatibility. That package redefines
-\Macro{@writefile} under some conditions at run time. If you use both
-\Package{scrwfile} and \Package{titletoc}, there is no warranty for the
-correct behaviour of either one. This is neither an error of
-\Package{titletoc} nor of \Package{scrwfile}.%
-%
-\EndIndexGroup
-
%%% Local Variables:
%%% mode: latex
%%% TeX-master: "scrguide-en.tex"
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-de.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-de.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-de.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% tocbasic-de.tex
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{tocbasic-de.tex}
- [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
+ [$Date: 2023-04-04 10:50:12 +0200 (Di, 04. Apr 2023) $
KOMA-Script guide (package tocbasic)]
\chapter{Verzeichnisse verwalten mit Hilfe von \Package{tocbasic}}
@@ -196,14 +196,14 @@
Das Paket \hyperref[cha:scrhack]{\Package{scrhack}}\IndexPackage{scrhack}%
\important{ \hyperref[cha:scrhack]{\Package{scrhack}}} enthält übrigens
-Patches für mehrere Pakete wie \Package{float} oder \Package{listings}, die
-eigene Verzeichnisse bereitstellen. Bei Verwendung von
-\hyperref[cha:scrhack]{\Package{scrhack}} wird unter anderem die jeweilige
-Dateierweiterung der Liste der bekannten Dateierweiterungen hinzugefügt. Dabei
-wird als \PName{Besitzer} »\PValue{float}« verwendet. Dies ist sozusagen der
-grundlegende Baustein, um die Möglichkeiten von \Package{tocbasic} und der
-\KOMAScript-Klassen auch für diese Verzeichnisse automatisch nutzen zu
-können.%
+Patches für mehrere Pakete wie \Package{float}\IndexPackage{float} oder
+\Package{listings}\IndexPackage{listings}, die eigene Verzeichnisse
+bereitstellen. Bei Verwendung von \hyperref[cha:scrhack]{\Package{scrhack}}
+wird unter anderem die jeweilige Dateierweiterung der Liste der bekannten
+Dateierweiterungen hinzugefügt. Dabei wird als \PName{Besitzer}
+»\PValue{float}« verwendet. Dies ist sozusagen der grundlegende Baustein, um
+die Möglichkeiten von \Package{tocbasic} und der \KOMAScript-Klassen auch für
+diese Verzeichnisse automatisch nutzen zu können.%
\EndIndexGroup
@@ -533,16 +533,17 @@
\fi
\end{lstoutput}
führen, wenn keine Schreibdateien mehr zur Verfügung stehen. Abhilfe kann in
-diesem Fall das Laden des in \autoref{cha:scrwfile} beschriebenen Pakets
+diesem Fall das Laden von Paket
\Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile}
-oder die Verwendung von \LuaLaTeX{} bieten.
+\cite{package:scrwfile} oder die Verwendung von \LuaLaTeX{} bieten.
Das Paket \hyperref[cha:scrhack]{\Package{scrhack}}\IndexPackage{scrhack}%
\important{ \hyperref[cha:scrhack]{\Package{scrhack}}} enthält übrigens
-Patches für mehrere Pakete wie \Package{float} oder \Package{listings}, damit
-deren Verzeichnisbefehle \Macro{listoftoc} verwenden. Dadurch stehen viele
-Möglichkeiten von \Package{tocbasic} und den \KOMAScript-Klassen auch für
-deren Verzeichnisse zur Verfügung.%
+Patches für mehrere Pakete wie \Package{float}\IndexPackage{float} oder
+\Package{listings}\IndexPackage{listings}, damit deren Verzeichnisbefehle
+\Macro{listoftoc} verwenden. Dadurch stehen viele Möglichkeiten von
+\Package{tocbasic} und den \KOMAScript-Klassen auch für deren Verzeichnisse
+zur Verfügung.%
\EndIndexGroup
@@ -561,12 +562,7 @@
Einlesen der Datei ausführen, wenn Sie diese mit \Macro{AfterStartingTOC}
definieren. Während der Ausführung der \PName{Anweisungen} ist
\Macro{@currext}\IndexCmd{@currext}\important{\Macro{@currext}} die
-Dateierweiterung der Datei, die eingelesen wird bzw. gerade eingelesen wurde.
-
-Ein Beispiel\textnote{Beispiel} zur Verwendung von \Macro{BeforeStartingTOC}
-ist in \autoref{sec:scrwfile.clonefilefeature} auf
-\PageRefxmpl{scrwfile.cmd.BeforeStartingTOC} zu finden.
-%
+Dateierweiterung der Datei, die eingelesen wird bzw. gerade eingelesen wurde.%
\EndIndexGroup
@@ -687,9 +683,9 @@
werden, die nur in einer festen Sprache erstellt werden, in denen also
Sprachumschaltungen im Dokument nicht zu berücksichtigen sind. Sie wird
außerdem vom Paket
- \Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile} für
- Klonziele verwendet, da die Erweiterungen dort bereits durch das Klonen
- selbst aus der Klonquelle übernommen werden.
+ \Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile}
+ \cite{package:scrwfile} für Klonziele verwendet, da die Erweiterungen dort
+ bereits durch das Klonen selbst aus der Klonquelle übernommen werden.
Es ist zu beachten\textnote{Achtung!}, dass die Eigenschaft bereits vor dem
Hinzufügen der Dateierweiterung zu der Liste der bekannten
@@ -1366,13 +1362,14 @@
Kopiermöglichkeit mit \Option{:=} ist hierbei ebenfalls verfügbar. Die
Addition mit Hilfe von \Option{+=} wird derzeit jedoch nicht unterstützt.
-Bei\ChangedAt{v3.20}{\Package{tocbasic}} Verwendung als Optionen
-für \DescRef{maincls-experts.cmd.DeclareSectionCommand}%
+Bei\ChangedAt{v3.20}{\Package{tocbasic}} Verwendung als Optionen für
+\DescRef{maincls-experts.cmd.DeclareSectionCommand}%
\IndexCmd{DeclareSectionCommand}\IndexCmd{DeclareNewSectionCommand}%
\IndexCmd{RedeclareSectionCommand}\IndexCmd{ProvideSectionCommand} (siehe
\DescPageRef{maincls-experts.cmd.DeclareSectionCommand}) und verwandten
Anweisungen sind die Namen der Eigenschaften mit dem Präfix \PValue{toc} zu
-versehen, also beispielsweise \Option{toclevel} anstelle von \PValue{level}. Hierbei existiert derzeit weder die Kopiermöglichkeit mit
+versehen, also beispielsweise \Option{toclevel} anstelle von
+\PValue{level}. Hierbei existiert derzeit weder die Kopiermöglichkeit mit
\Option{:=} noch die Addition mit \Option{+=}.
Letztlich führt der Aufruf von \Macro{DeclareTOCStyleEntry} zur Definition der
@@ -1521,10 +1518,12 @@
entsprechenden Eigenschaften existiert. Bei den Stilen
\PValue{dottedtocline}, \PValue{undottedtocline} und \PValue{tocline}
findet für die Eintragsebenen \PValue{part} bis \PValue{subparagraph}
- sowie \PValue{figure} und \PValue{table} eine Initialisierung mit Werten
- entsprechend der Standardklassen statt. Alle anderen Ebenen erhalten keine
- Initialisierung. Für sie ist eine explizite Angabe daher bei der ersten
- Verwendung zwingend.
+ sowie \PValue{figure}, \PValue{table} und
+ \ChangedAt{v3.39}{\Package{tocbasic}}\PValue{lstlisting} eine
+ Initialisierung mit Werten entsprechend der Standardklassen
+ beziehungsweise des Paket \Package{listings}\IndexPackage{listings}
+ statt. Alle anderen Ebenen erhalten keine Initialisierung. Für sie ist
+ eine explizite Angabe daher bei der ersten Verwendung zwingend.
Ist für ein Verzeichnis die Eigenschaft \PValue{noindent} via
\DescRef{\LabelBase.cmd.setuptoc} gesetzt, so ignorieren die Einträge bei
@@ -1559,11 +1558,14 @@
\PValue{tocline}, \PValue{toctext} und \PValue{undottedtocline} findet für
die \PName{Eintragsebene} \PValue{part}, \PValue{chapter},
\PValue{section}, \PValue{subsection}, \PValue{subsubsection},
- \PValue{paragraph}, \PValue{subparagraph}, \PValue{figure} und
- \PValue{table} automatisch eine Initialisierung aufgrund des Namens
- statt. Für andere Ebenen findet eine Initialisierung mit dem Wert der
- Gliederungsebene statt, falls kompatibel zu den \KOMAScript-Klassen
- \Macro{\PName{Eintragsebene}numdepth} definiert ist.%
+ \PValue{paragraph}, \PValue{subparagraph}, \PValue{figure}, \PValue{table}
+ und \ChangedAt{v3.39}{\Package{tocbasic}}\PValue{lstlisting} automatisch
+ eine Initialisierung aufgrund des Namens statt. Für andere Ebenen findet
+ eine Initialisierung mit dem Wert der Gliederungsebene statt, falls
+ kompatibel zu den \KOMAScript-Klassen
+ \Macro{\PName{Eintragsebene}numdepth} definiert ist. Als letzter Ausweg
+ kann auch das interne \Package{hyperref}-Makro
+ \Macro{toclevel@\PName{Eintragsebene}} herangezogen werden.%
}%
\entry{\OptionVName{linefill}{Code}}{%
Beim Stil \PValue{tocline} kann zwischen dem Ende des Eintragstextes und
@@ -1610,10 +1612,12 @@
vorgenommen, falls eine solche Ebene mit entsprechender Eigenschaft
existiert. Bei den Stilen \PValue{dottedtocline}, \PValue{undottedtocline}
und \PValue{tocline} findet für die Eintragsebenen \PValue{part} bis
- \PValue{subparagraph} sowie \PValue{figure} und \PValue{table} eine
- Initialisierung mit Werten entsprechend der Standardklassen statt. Alle
- anderen Ebenen erhalten keine Initialisierung. Für sie ist eine explizite
- Angabe daher bei der ersten Verwendung zwingend.%
+ \PValue{subparagraph} sowie \PValue{figure}, \PValue{table} und
+ \ChangedAt{v3.39}{\Package{tocbasic}}\PValue{lstlisting} eine
+ Initialisierung mit Werten entsprechend der Standardklassen
+ beziehungsweise des Pakets \Package{listings}\IndexPackage{listings}
+ statt. Alle anderen Ebenen erhalten keine Initialisierung. Für sie ist
+ eine explizite Angabe daher bei der ersten Verwendung zwingend.%
}%
\entry{\OptionVName{onendentry}{Code}}{%
\ChangedAt{v3.27}{\Package{tocbasic}}%
@@ -2133,9 +2137,9 @@
\fi
\end{lstoutput}
führen, wenn keine Schreibdateien mehr zur Verfügung stehen. Abhilfe kann in
-diesem Fall das Laden des in \autoref{cha:scrwfile} beschriebenen Pakets
+diesem Fall das Laden des Pakets
\Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile}
-oder die Verwendung von \LuaLaTeX{} bieten.%
+\cite{package:scrwfile} oder die Verwendung von \LuaLaTeX{} bieten.%
\EndIndexGroup
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-en.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-en.tex 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-en.tex 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% tocbasic-en.tex
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{tocbasic-en.tex}
- [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
+ [$Date: 2023-04-04 10:50:12 +0200 (Di, 04. Apr 2023) $
KOMA-Script guide (package tocbasic)]
\translator{Markus Kohm\and Arndt Schubert\and Karl Hagen}
@@ -184,13 +184,15 @@
By the way, the \hyperref[cha:scrhack]{\Package{scrhack}}%
\IndexPackage{scrhack}\important{\hyperref[cha:scrhack]{\Package{scrhack}}}
-package contains patches for several packages, such as \Package{float} or
-\Package{listings}, which provide their own content lists. If you use
-\hyperref[cha:scrhack]{\Package{scrhack}}, among other things, the respective
-file extensions will be added to the list of known file extensions. Their
-\PName{owner} is also ``\PValue{float}''. This is the basic building block, so
-to speak, allowing you to use the features of \Package{tocbasic} and the
-\KOMAScript{} classes with these content lists as well.%
+package contains patches for several packages, such as
+\Package{float}\IndexPackage{float} or
+\Package{listings}\IndexPackage{listings}, which provide their own content
+lists. If you use \hyperref[cha:scrhack]{\Package{scrhack}}, among other
+things, the respective file extensions will be added to the list of known file
+extensions. Their \PName{owner} is also ``\PValue{float}''. This is the basic
+building block, so to speak, allowing you to use the features of
+\Package{tocbasic} and the \KOMAScript{} classes with these content lists as
+well.%
\EndIndexGroup
@@ -496,14 +498,14 @@
\end{lstoutput}
if there are no more write handles left. Loading the
\Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile}
-package (see \autoref{cha:scrwfile}) can solve this problem.
+package \cite{package:scrwfile} can solve this problem.
Also, the \hyperref[cha:scrhack]{\Package{scrhack}}\IndexPackage{scrhack}%
\important{\hyperref[cha:scrhack]{\Package{scrhack}}} package contains patches
-for several packages, such as \Package{float} or \Package{listings}, so that
-their content-list commands can use \Macro{listoftoc}. As a result, many
-features of \Package{tocbasic} and the \KOMAScript{} classes are also
-available for their content lists.%
+for several packages, such as \Package{float}\IndexPackage{float} or
+\Package{listings}\IndexPackage{listings}, so that their content-list commands
+can use \Macro{listoftoc}. As a result, many features of \Package{tocbasic}
+and the \KOMAScript{} classes are also available for their content lists.%
\EndIndexGroup
@@ -523,12 +525,7 @@
one, and the general after-hook is called after the individual one. While
executing the commands in these hooks,
\Macro{@currext}\IndexCmd{@currext}\important{\Macro{@currext}} is the
-extension of the TOC file which is about to be or has just been read.
-
-You can find an example\textnote{Example} using \Macro{BeforeStartingTOC} in
-\autoref{sec:scrwfile.clonefilefeature} on
-\PageRefxmpl{scrwfile.cmd.BeforeStartingTOC}.
-%
+extension of the TOC file which is about to be or has just been read.%
\EndIndexGroup
@@ -635,8 +632,9 @@
lists that are created in a fixed language, which means that changes of the
language inside of the document will no longer affect the content list. The
\Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile}
- package also uses this feature for cloned destinations, as because those
- files already inherit any language changes from the cloning source.
+ \cite{package:scrwfile} package also uses this feature for cloned
+ destinations, as because those files already inherit any language changes
+ from the cloning source.
Note\textnote{Attention!} that you must set this feature before you add a
file extension to the list of known extensions. Changing the feature
@@ -1405,10 +1403,12 @@
without this prefix. For the \PValue{dottedtocline},
\PValue{undottedtocline}, and \PValue{tocline} styles, the initial values
of levels \PValue{part} down to \PValue{subparagraph} and the levels
- \PValue{figure} and \PValue{table} are compatible with the standard
- classes. All other levels do not have an initial value. Therefore you have
- to set an explicit value for such levels when they are defined first
- time.
+ \PValue{figure}, \PValue{table} and
+ \ChangedAt{v3.39}{\Package{tocbasic}}\PValue{lstlisting} are compatible
+ with the standard classes resp. package
+ \Package{listings}\IndexPackage{listings}. All other levels do not have an
+ initial value. Therefore you have to set an explicit value for such levels
+ when they are defined first time.
If the \PValue{noindent} attribute is set for a content list via
\DescRef{\LabelBase.cmd.setuptoc}, the entries of all styles provided by
@@ -1429,10 +1429,13 @@
the entry level of the same name without this prefix plus one. For the
\PValue{dottedtocline}, \PValue{largetocline}, \PValue{tocline},
\PValue{toctext}, and \PValue{undottedtocline} styles, the entry levels
- from \PValue{part} to \PValue{subparagraph}, as well as \PValue{figure}
- and \PValue{table}, are initialised to be compatible with the standard
- classes. For all other levels, the initialisation is done with the value
- of \Macro{\PName{entry level}numdepth}, if this is defined.%
+ from \PValue{part} to \PValue{subparagraph}, as well as \PValue{figure},
+ \PValue{table} and
+ \ChangedAt{v3.39}{\Package{tocbasic}}\PValue{lstlisting}, are initialised
+ to be compatible with the standard classes resp. package
+ \Package{listings}\IndexPackage{listings}. For all other levels, the
+ initialisation is done with the value of \Macro{\PName{entry
+ level}numdepth}, if this is defined.%
}%
\entry{\OptionVName{indentfollows}{list of levels}}{%
\ChangedAt{v3.31}{\Package{tocbasic}}%
@@ -1485,10 +1488,12 @@
attributes exists. With the \PValue{dottedtocline},
\PValue{undottedtocline}, and \PValue{tocline} styles, the initial
\PName{length}s of levels from \PValue{part} to \PValue{subparagraph}, as
- well as \PName{figure} and \PName{table}, are compatible with those of the
- standard classes. All other levels do not have an initial value. Therefore
- you must set \PValue{numwidth} explicitly when the entry level is first
- used.%
+ well as \PName{figure}, \PName{table} and
+ \ChangedAt{v3.39}{\Package{tocbasic}}\PName{lstlisting}, are compatible
+ with those of the standard classes resp. package
+ \Package{listings}\IndexPackage{listings}. All other levels do not have an
+ initial value. Therefore you must set \PValue{numwidth} explicitly when
+ the entry level is first used.%
}%
\entry{\OptionVName{onendentry}{code}}{%
\ChangedAt{v3.27}{\Package{tocbasic}}%
@@ -1967,7 +1972,7 @@
\end{lstoutput}
if no more write handles are available. You can solve this problem by loading
the \Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile}
-package described in \autoref{cha:scrwfile}, or by using \LuaLaTeX{}.%
+package \cite{package:scrwfile} or by using \LuaLaTeX{}.%
\EndIndexGroup
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrextend.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrextend.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrextend.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrextend.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrextend.dtx 3985 2022-11-11 11:24:31Z kohm $
%<preidentify>%%% (run: preidentify)
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
@@ -26,9 +26,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3985 $
\endgroup
\ProvidesFile{scrextend.dtx}[\filedate\space\filerevision\space
KOMA-Script package source
@@ -202,6 +202,8 @@
% \begin{option}{extendedfeature}
% \changes{v3.12}{2013/03/05}{using state signaling with \cs{FamilyKeyState}}
% \changes{v3.17}{2015/03/09}{internal value storage}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macrocode}
%<*option>
\KOMA at key{extendedfeature}{%
@@ -219,7 +221,7 @@
}%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@xadd{.scrextend.sty}{extendedfeature}{#1}%
+ \KOMA at kav@xadd{scrextend.sty}{extendedfeature}{#1}%
}
\AtEndOfPackage{%
\KOMA at key{extendedfeature}{%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrhack.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrhack.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrhack.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrhack.dtx
-% Copyright (c) Markus Kohm, 2008-2022
+% Copyright (c) Markus Kohm, 2008-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -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 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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: 2022-06-09 14:11:14 +0200 (Do, 09. Jun 2022) $
+ \filedate$Date: 2023-03-15 17:09:39 +0100 (Mi, 15. Mär 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3889 $
+ \filerevision$Revision: 4015 $
\endgroup
\ProvidesFile{scrhack.dtx}[\filedate\space\filerevision\space
%</dtx>
@@ -286,6 +286,8 @@
% \pkg{hyperref}}
% \changes{v3.18}{2015/05/22}{newer versions of \KOMAScript{} classes also
% deactivate the the hack}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA at key}
+% and \cs{KOMAExecuteOptions} removed}
% This is a little bit tricky, because \pkg{hyperref} loads the driver file
% via \cs{AtEndOfPackage} and the hack cannot be loaded before loading the
% driver file. Using \cs{AfterPackage*} would not be good enough therefore,
@@ -301,7 +303,7 @@
\PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak
detection of KOMA-Script class, that doesn't\MessageBreak
need that hack,}%
- \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}%
+ \KOMAExecuteOptions[scrhack.sty]{hyperref=false}%
}%
}
\AfterPackage*{hyperref}{%
@@ -310,10 +312,10 @@
\PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak
detection of hyperref version, that doesn't\MessageBreak
need that hack,}%
- \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}%
+ \KOMAExecuteOptions[scrhack.sty]{hyperref=false}%
}{%
\AtEndOfPackage{%
- \KOMA at key[.scrhack.sty]{hyperref}{%
+ \KOMA at key[scrhack.sty]{hyperref}{%
\PackageWarning{scrhack}{option `hyperref=#1' ignored}%
\FamilyKeyStateProcessed
}%
@@ -458,6 +460,8 @@
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyStateProcessed}}
% \changes{v3.17}{2015/03/09}{using \cs{KOMAExecuteOptions}}
% \changes{v3.34}{2021/06/03}{deactivation of the \pkg{float} hack}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA at key}
+% removed}
% \begin{macrocode}
%<*package&option>
\KOMA at ifkey{floatrow}{@scrhack at floatrow}
@@ -467,7 +471,7 @@
\AfterPackage*{floatrow}{%
\KOMAoptions{float=false}%
\PackageInfo{scrhack}{option `float' deactivated}%
- \KOMA at key[.scrhack.sty]{floatrow}{%
+ \KOMA at key[scrhack.sty]{floatrow}{%
\PackageWarning{scrhack}{option `floatrow' ignored}%
\FamilyKeyStateProcessed
}%
@@ -594,6 +598,8 @@
% \begin{option}{float}
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyStateProcessed}}
% \changes{v3.17}{2015/03/09}{using \cs{KOMAExecuteOptions}}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA at key}
+% removed}
% \begin{macrocode}
%<*package&option>
\KOMA at ifkey{float}{@scrhack at float}%
@@ -601,7 +607,7 @@
%</package&option>
%<*package&body>
\AfterPackage*{float}{%
- \KOMA at key[.scrhack.sty]{float}{%
+ \KOMA at key[scrhack.sty]{float}{%
\PackageWarning{scrhack}{option `float' ignored}%
\FamilyKeyStateProcessed
}%
@@ -737,6 +743,8 @@
% \begin{option}{listings}
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyStateProcessed}}
% \changes{v3.17}{2015/03/09}{using \cs{KOMAExecuteOptions}}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA at key}
+% removed}
% \begin{macrocode}
%<*package&option>
\KOMA at ifkey{listings}{@scrhack at listings}
@@ -744,7 +752,7 @@
%</package&option>
%<*package&body>
\AfterPackage*{listings}{%
- \KOMA at key[.scrhack.sty]{listings}{%
+ \KOMA at key[scrhack.sty]{listings}{%
\PackageWarning{scrhack}{option `listings' ignored}%
\FamilyKeyStateProcessed
}%
@@ -870,6 +878,8 @@
%
% \begin{option}{nomencl}
% \changes{v3.23}{2017/03/31}{added}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA at key}
+% removed}
% \begin{macrocode}
%<*package&option>
\RequirePackage{xpatch}%
@@ -878,7 +888,7 @@
%</package&option>
%<*package&body>
\AfterPackage*{nomencl}{%
- \KOMA at key[.scrhack.sty]{nomencl}{%
+ \KOMA at key[scrhack.sty]{nomencl}{%
\PackageWarning{scrhack}{option `nomencl' ignored}%
\FamilyKeyStateProcessed
}%
@@ -1083,6 +1093,8 @@
%
% \begin{option}{setspace}
% \changes{v3.17}{2015/04/16}{added}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA at key}
+% removed}
% \begin{macrocode}
%<*package&option>
\KOMA at ifkey{setspace}{@scrhack at setspace}
@@ -1090,7 +1102,7 @@
%</package&option>
%<*package&body>
\AfterPackage*{setspace}{%
- \KOMA at key[.scrhack.sty]{setspace}{%
+ \KOMA at key[scrhack.sty]{setspace}{%
\PackageWarning{scrhack}{option `setspace' ignored}%
\FamilyKeyStateProcessed
}%
@@ -1125,9 +1137,34 @@
\expandafter\setstretch\expandafter{\strip at pt\@tempdima}%
}%
}{%
- \PackageWarning{scrhack}{unknown \string\onehalfspacing\space
- definition found!\MessageBreak
- Maybe you are using a unsupported setpace version}%
+% \end{macrocode}
+% \changes{v3.39}{2023/03/15}{support for \pkg{setspace} 6.7b added}
+% \begin{macrocode}
+ \scr at ifexpected{\onehalfspacing}{%
+ \long\def\onehalfspacing{%
+ \setstretch{1.25}% default
+% DPC 6.7b guard \@ptsize
+ \ifx\@ptsize\@undefined\else
+ \ifcase \@ptsize \relax % 10pt
+ \setstretch {1.25}%
+ \or % 11pt
+ \setstretch {1.213}%
+ \or % 12pt
+ \setstretch {1.241}%
+ \fi
+ \fi
+ }%
+ }{%
+ \renewcommand*{\onehalfspacing}{%
+ \@tempdima=\dimexpr (\f at size pt)*1500/
+ (\dimexpr \f at baselineskip\relax)*\p@/1000\relax
+ \expandafter\setstretch\expandafter{\strip at pt\@tempdima}%
+ }%
+ }{%
+ \PackageWarning{scrhack}{unknown \string\onehalfspacing\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported setpace version}%
+ }%
}
% \end{macrocode}
% \end{command}
@@ -1154,9 +1191,34 @@
\expandafter\setstretch\expandafter{\strip at pt\@tempdima}%
}%
}{%
- \PackageWarning{scrhack}{unknown \string\doublespacing\space
- definition found!\MessageBreak
- Maybe you are using a unsupported setpace version}%
+% \end{macrocode}
+% \changes{v3.39}{2023/03/15}{support for \pkg{setspace} 6.7b added}
+% \begin{macrocode}
+ \scr at ifexpected{\doublespacing}{%
+ \long\def\doublespacing{%
+ \setstretch {1.667}% default
+% DPC 6.7b guard \@ptsize
+ \ifx\@ptsize\@undefined\else
+ \ifcase \@ptsize \relax % 10pt
+ \setstretch {1.667}%
+ \or % 11pt
+ \setstretch {1.618}%
+ \or % 12pt
+ \setstretch {1.655}%
+ \fi
+ \fi
+ }%
+ }{%
+ \renewcommand*{\doublespacing}{%
+ \@tempdima=\dimexpr (\f at size pt)*2000/
+ (\dimexpr \f at baselineskip\relax)*\p@/1000\relax
+ \expandafter\setstretch\expandafter{\strip at pt\@tempdima}%
+ }%
+ }{%
+ \PackageWarning{scrhack}{unknown \string\doublespacing\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported setpace version}%
+ }%
}
%</setspace&body>
% \end{macrocode}
@@ -1180,6 +1242,8 @@
% \begin{option}{lscape}
% \changes{v3.18a}{2015/07/07}{added}
% \changes{v3.20}{2016/05/07}{loading \pkg{xpatch} in option part already}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of \cs{KOMA at key}
+% removed}
% \begin{macrocode}
%<*package&option>
\RequirePackage{xpatch}%
@@ -1189,7 +1253,7 @@
%<*package&body>
\AfterPackage*{lscape}{%
\if at scrhack@lscape\scr at hack@load\@pkgextension{lscape}\else
- \KOMA at key[.scrhack.sty]{lscape}{%
+ \KOMA at key[scrhack.sty]{lscape}{%
\PackageWarning{scrhack}{option `lscape' ignored}%
\FamilyKeyStateProcessed
}%
@@ -1899,6 +1963,8 @@
% \end{command}^^A \partlineswithprefixformat …
%
% \begin{option}{headings}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% The \KOMAScript{} option does not make sense any longer. So it is
% deactivated and usage will throw an error.
% \begin{macrocode}
@@ -1908,7 +1974,7 @@
because of loading standard classes sections hack%
}%
\RelaxFamilyKey[.\KOMAClassFileName]{KOMA}{headings}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{headings}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{headings}%
}
% \end{macrocode}
% \end{option}^^A headings
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrjura.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrjura.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrjura.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% The KOMA-Script bundle consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-16 08:13:45 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3991 $
\endgroup
\expandafter\ifx\csname ProvidesFile\endcsname\relax
\def\ProvidesFile#1[#2]{}
@@ -193,6 +193,8 @@
% \end{option}
%
% \begin{option}{juratotoc}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% Allow to set the toc level of the entries. Value \optvalue{true} is the same
% like \optvalue{2}, value \optvalue{false} is the same like \cs{maxdimen}.
% \changes{v0.7}{2013/11/04}{usage of renewed interface with
@@ -219,9 +221,9 @@
\else
\DeclareTOCStyleEntry[level=#1]{default}{cpar}%
\fi
- \KOMA at kav@xreplacevalue{.scrjura.sty}{juratotoc}{\cpartocdepth}%
+ \KOMA at kav@xreplacevalue{scrjura.sty}{juratotoc}{\cpartocdepth}%
}
-\KOMA at kav@xadd{.scrjura.sty}{juratotoc}{\cpartocdepth}%
+\KOMA at kav@xadd{scrjura.sty}{juratotoc}{\cpartocdepth}%
%</options>
% \end{macrocode}
% \end{macro}
@@ -234,6 +236,8 @@
% \changes{v0.7}{2013/11/04}{usage of renewed interface with
% \cs{FamilyKeyState}}
% \changes{v0.9a}{2015/03/09}{internal value storage}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{ilength}{\cpar at numberwidth,\cpar at indent}
% \changes{v0.6}{2011/09/29}{new}
% \changes{v3.27}{2019/02/25}{replaced by usage of \cs{DeclareTOCStyleEntry}}
@@ -243,15 +247,15 @@
\KOMA at key{juratocnumberwidth}{%
\DeclareTOCStyleEntry[numwidth=#1]{default}{cpar}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.scrjura.sty}{juratocnumberwidth}{#1}%
+ \KOMA at kav@replacevalue{scrjura.sty}{juratocnumberwidth}{#1}%
}
-\KOMA at kav@add{.scrjura.sty}{juratocnumberwidth}{2em}
+\KOMA at kav@add{scrjura.sty}{juratocnumberwidth}{2em}
\KOMA at key{juratocindent}{%
\DeclareTOCStyleEntry[indent=#1]{default}{cpar}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.scrjura.sty}{juratocindent}{#1}%
+ \KOMA at kav@replacevalue{scrjura.sty}{juratocindent}{#1}%
}
-\KOMA at kav@add{.scrjura.sty}{juratocindent}{1.5em}%
+\KOMA at kav@add{scrjura.sty}{juratocindent}{1.5em}%
%</options>
% \end{macrocode}
% \end{ilength}
@@ -279,6 +283,8 @@
% \cs{FamilyKeyState}}
% \changes{v0.9a}{2015/03/09}{internal value storage}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed into \cs{Ifstr}}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% The options switches the (automatic) paragraph numbering.
% \begin{macrocode}
%<*options>
@@ -287,24 +293,24 @@
\Ifstr{#1}{auto}{%
\AutoPar
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.scrjura.sty}{parnumber}{manual}%
- \KOMA at kav@remove{.scrjura.sty}{parnumber}{auto}%
- \KOMA at kav@add{.scrjura.sty}{parnumber}{auto}%
+ \KOMA at kav@remove{scrjura.sty}{parnumber}{manual}%
+ \KOMA at kav@remove{scrjura.sty}{parnumber}{auto}%
+ \KOMA at kav@add{scrjura.sty}{parnumber}{auto}%
}{%
\Ifstr{#1}{manual}{%
\ManualPar
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.scrjura.sty}{parnumber}{manual}%
- \KOMA at kav@remove{.scrjura.sty}{parnumber}{auto}%
- \KOMA at kav@add{.scrjura.sty}{parnumber}{manual}%
+ \KOMA at kav@remove{scrjura.sty}{parnumber}{manual}%
+ \KOMA at kav@remove{scrjura.sty}{parnumber}{auto}%
+ \KOMA at kav@add{scrjura.sty}{parnumber}{manual}%
}{%
\KOMA at set@ifkey{parnumber}{parnumber}{#1}%
- \KOMA at kav@replacebool{.scrjura.sty}{parnumber}{parnumber}%
+ \KOMA at kav@replacebool{scrjura.sty}{parnumber}{parnumber}%
}%
}%
}
-\KOMA at kav@add{.scrjura.sty}{parnumber}{true}
-\KOMA at kav@add{.scrjura.sty}{parnumber}{auto}
+\KOMA at kav@add{scrjura.sty}{parnumber}{true}
+\KOMA at kav@add{scrjura.sty}{parnumber}{auto}
%</options>
% \end{macrocode}
% \end{option}
@@ -314,8 +320,11 @@
% \changes{v0.7}{2013/11/04}{usage of renewed interface with
% \cs{FamilyKeyState}}
% \changes{v0.9a}{2015/03/09}{internal value storage}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{option}{markright,markboth}
% \changes{v0.7}{2013/11/04}{deprecated}
+% \changes{v3.39}{2022/11/16}{only with \KOMAScript~3}
% \begin{command}{\Clausemark}
% \changes{v0.5e}{2011/08/31}{support for \cs{MakeMarkcase}}
% The options are used to activate either \cs{markright} or \cs{markboth} for
@@ -368,11 +377,13 @@
\endgroup
\FamilyKeyStateUnknownValue
\fi
- \KOMA at kav@xreplacevalue{.scrjura.sty}{clausemark}{#1}%
+ \KOMA at kav@xreplacevalue{scrjura.sty}{clausemark}{#1}%
}
-\KOMA at kav@add{.scrjura.sty}{clausemark}{false}
-\KOMA at DeclareDeprecatedOption[scrjura]{markright}{clausemark=forceright}
-\KOMA at DeclareDeprecatedOption[scrjura]{markboth}{clausemark=forceboth}
+\KOMA at kav@add{scrjura.sty}{clausemark}{false}
+\@ifundefined{KOMA at DeclareDeprecatedOption}{}{%
+ \KOMA at DeclareDeprecatedOption[scrjura]{markright}{clausemark=forceright}%
+ \KOMA at DeclareDeprecatedOption[scrjura]{markboth}{clausemark=forceboth}%
+}
\KOMA at key{paragraphmark}{%
\PackageWarningNoLine{scrjura}{%
You've used obsolete option `paragraphmark'.\MessageBreak
@@ -394,8 +405,11 @@
% \changes{v0.7}{2013/11/04}{usage of renewed interface with
% \cs{FamilyKeyState}}
% \changes{v0.9a}{2015/03/09}{internal value storage}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{option}{parcitename,sentencecitename}
% \changes{v0.5d}{2010/06/07}{deprecated}
+% \changes{v3.39}{2022/11/16}{only with \KOMAScript~3}
% The formatting of the references of paragraphs and sentences. There are a
% long a short and a numeric form.
% \begin{macro}{\parcite at format,\sentencecite at format}
@@ -467,32 +481,34 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrjura.sty}{ref}%
+ \KOMA at kav@removekey{scrjura.sty}{ref}%
\ifcase\parcite at format
- \KOMA at kav@add{.scrjura.sty}{ref}{parlong}%
+ \KOMA at kav@add{scrjura.sty}{ref}{parlong}%
\or
- \KOMA at kav@add{.scrjura.sty}{ref}{parshort}%
+ \KOMA at kav@add{scrjura.sty}{ref}{parshort}%
\or
- \KOMA at kav@add{.scrjura.sty}{ref}{parnumeric}%
+ \KOMA at kav@add{scrjura.sty}{ref}{parnumeric}%
\or
- \KOMAQkav at add{.scrjura.sty}{ref}{paroff}%
+ \KOMA at kav@add{scrjura.sty}{ref}{paroff}%
\fi
\ifcase\sentencecite at format
- \KOMA at kav@add{.scrjura.sty}{ref}{sentencelong}%
+ \KOMA at kav@add{scrjura.sty}{ref}{sentencelong}%
\or
- \KOMA at kav@add{.scrjura.sty}{ref}{sentenceshort}%
+ \KOMA at kav@add{scrjura.sty}{ref}{sentenceshort}%
\or
- \KOMA at kav@add{.scrjura.sty}{ref}{sentencenumeric}%
+ \KOMA at kav@add{scrjura.sty}{ref}{sentencenumeric}%
\or
- \KOMA at kav@add{.scrjura.sty}{ref}{sentenceoff}%
+ \KOMA at kav@add{scrjura.sty}{ref}{sentenceoff}%
\fi
\fi
}
-\KOMA at kav@add{.scrjura.sty}{ref}{parlong}%
-\KOMA at kav@add{.scrjura.sty}{ref}{sentencelong}%
-\KOMA at DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong}
-\KOMA at DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
-%</options>
+\KOMA at kav@add{scrjura.sty}{ref}{parlong}%
+\KOMA at kav@add{scrjura.sty}{ref}{sentencelong}%
+\@ifundefined{KOMA at DeclareDeprecatedOption}{}{%
+ \KOMA at DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong}
+ \KOMA at DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
+}
+%</options>
% \end{macrocode}
% \end{option}
% \end{option}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z 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: 2022-06-28 09:45:49 +0200 (Di, 28. Jun 2022) $
+ \filedate$Date: 2022-11-16 11:43:42 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
- \filerevision$Revision: 3913 $
+ \filerevision$Revision: 4004 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-basics.dtx}%
@@ -518,15 +518,16 @@
% \begin{macro}{\KOMA at key}
% \changes{v2.97c}{2007/04/19}{optional argument added}
% \changes{v3.17}{2015/02/24}{rudimentary value storage}
+% \changes{v3.39}{2022/11/11}{initial dot added automatically}
% \pkg{keyval} keys of \KOMAScript{} are defined with \cs{KOMAkey} to setup
% the family to ``\texttt{KOMA}'' automatically. Additionally the value
% storage is initialized.
% \begin{macrocode}
%<*koma>
-\newcommand*{\KOMA at key}[1][.\@currname.\@currext]{%
- \DefineFamilyMember[{#1}]{KOMA}%
- \@ifundefined{scr at kav@KOMA#1}{\@namedef{scr at kav@KOMA#1}{}}{}%
- \DefineFamilyKey[{#1}]{KOMA}%
+\newcommand*{\KOMA at key}[1][\@currname.\@currext]{%
+ \DefineFamilyMember[{.#1}]{KOMA}%
+ \@ifundefined{scr at kav@KOMA.#1}{\@namedef{scr at kav@KOMA.#1}{}}{}%
+ \DefineFamilyKey[{.#1}]{KOMA}%
}
%</koma>
% \end{macrocode}
@@ -534,6 +535,7 @@
%
% \begin{macro}{\KOMA at kav@add}
% \changes{v3.17}{2015/02/24}{added}
+% \changes{v3.39}{2022/11/11}{initial dot added automatically}
% This macro stores a \texttt{\meta{key}=\meta{value}} pair in a internal
% list. The first argument is the family member, the second the \meta{key} and
% the third the \meta{value}.
@@ -540,10 +542,10 @@
% \begin{macrocode}
%<*koma>
\newcommand*{\KOMA at kav@add}[3]{%
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@add{#1}%
}{%
- \expandafter\l at addto@macro\csname scr at kav@KOMA#1\endcsname{\do{{#2}{#3}}}%
+ \expandafter\l at addto@macro\csname scr at kav@KOMA.#1\endcsname{\do{{#2}{#3}}}%
}%
}
%</koma>
@@ -559,11 +561,11 @@
% \begin{macrocode}
%<*koma>
\newcommand*{\KOMA at kav@xadd}[3]{%
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@xadd{#1}%
}{%
\protected at edef\reserved at a{{#2}{#3}}%
- \expandafter\l at addto@macro\csname scr at kav@KOMA#1\expandafter\endcsname
+ \expandafter\l at addto@macro\csname scr at kav@KOMA.#1\expandafter\endcsname
\expandafter{\expandafter\do\expandafter{\reserved at a}}%
}%
}
@@ -579,23 +581,23 @@
% \begin{macrocode}
%<*koma>
\newcommand*{\KOMA at kav@remove}[3]{%
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@remove{#1}%
}{%
\begingroup
- \def\reserved at a{\endgroup\@namedef{scr at kav@KOMA#1}{}}%
+ \def\reserved at a{\endgroup\@namedef{scr at kav@KOMA.#1}{}}%
\edef\reserved at b{\detokenize{{#2}{#3}}}%
\def\do##1{%
\edef\reserved at c{\detokenize{##1}}%
\ifx\reserved at b\reserved at c\else
\l at addto@macro\reserved at a{%
- \expandafter\l at addto@macro\csname scr at kav@KOMA#1\endcsname{%
+ \expandafter\l at addto@macro\csname scr at kav@KOMA.#1\endcsname{%
\do{##1}%
}%
}%
\fi
}%
- \@nameuse{scr at kav@KOMA#1}%
+ \@nameuse{scr at kav@KOMA.#1}%
\reserved at a
}%
}
@@ -605,6 +607,7 @@
%
% \begin{macro}{\KOMA at kav@removekey}
% \changes{v3.17}{2015/02/24}{added}
+% \changes{v3.39}{2022/11/11}{initial dot added automatically}
% This macro removes all \texttt{\meta{key}=\meta{value}} pairs of a given
% \meta{key} from the internal list. The first argument is the family member,
% the second the \meta{key}.
@@ -611,11 +614,11 @@
% \begin{macrocode}
%<*koma>
\newcommand*{\KOMA at kav@removekey}[2]{%
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@removekey{#1}%
}{%
\begingroup
- \def\reserved at a{\endgroup\@namedef{scr at kav@KOMA#1}{}}%
+ \def\reserved at a{\endgroup\@namedef{scr at kav@KOMA.#1}{}}%
\edef\reserved at b{\detokenize{#2}}%
\def\reserved at d##1##2{\edef\reserved at c{\detokenize{##1}}}%
\def\do##1{%
@@ -622,13 +625,13 @@
\reserved at d##1\relax
\ifx\reserved at b\reserved at c\else
\l at addto@macro\reserved at a{%
- \expandafter\l at addto@macro\csname scr at kav@KOMA#1\endcsname{%
+ \expandafter\l at addto@macro\csname scr at kav@KOMA.#1\endcsname{%
\do{##1}%
}%
}%
\fi
}%
- \@nameuse{scr at kav@KOMA#1}%
+ \@nameuse{scr at kav@KOMA.#1}%
\reserved at a
}%
}
@@ -638,6 +641,7 @@
%
% \begin{macro}{\KOMA at kav@replacevalue,\KOMA at kav@xreplacevalue}
% \changes{v3.17}{2015/02/25}{added}
+% \changes{v3.39}{2022/11/11}{initial dot added automatically}
% If \cs{FamilyKeyState} is \cs{FamilyKeyStateProcessed},
% these macros replace a \texttt{\meta{key}=\meta{value}} pair in the internal list.
% The first argument is the family member, the second the \meta{key} and the
@@ -647,7 +651,7 @@
%<*koma>
\newcommand*{\KOMA at kav@replacevalue}[3]{%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@replacevalue{#1}%
}{%
\KOMA at kav@removekey{#1}{#2}%
@@ -657,7 +661,7 @@
}
\newcommand*{\KOMA at kav@xreplacevalue}[3]{%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@replacevalue{#1}%
}{%
\KOMA at kav@removekey{#1}{#2}%
@@ -671,6 +675,7 @@
%
% \begin{macro}{\KOMA at kav@replacebool}
% \changes{v3.17}{2015/02/24}{added}
+% \changes{v3.39}{2022/11/11}{initial dot added automatically}
% If \cs{FamilyKeyState} is \cs{FamilyKeyStateProcessed},
% this macro replaces the value of a if key in the internal list.
% The first argument is the family member, the second the \meta{key} and the
@@ -679,7 +684,7 @@
%<*koma>
\newcommand*{\KOMA at kav@replacebool}[3]{%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@replacebool{#1}%
}{%
\KOMA at kav@remove{#1}{#2}{false}%
@@ -699,6 +704,7 @@
%
% \begin{macro}{\KOMA at kav@defall}
% \changes{v3.17}{2015/02/24}{added}
+% \changes{v3.39}{2022/11/11}{initial dot added automatically}
% This macro defines a macro/command with the \texttt{\meta{key}=\meta{value}}
% list of all stored pairs. The first argument is the macro/command to be
% defined with the list. The second is the family member.
@@ -705,7 +711,7 @@
% \begin{macrocode}
%<*koma>
\newcommand*{\KOMA at kav@defall}[2]{%
- \@ifundefined{scr at kav@KOMA#2}{%
+ \@ifundefined{scr at kav@KOMA.#2}{%
\KOMA at internal@error\KOMA at kav@defall{#1}%
}{%
\begingroup
@@ -712,7 +718,7 @@
\let\reserved at a\@empty
\def\reserved at b##1##2{\l at addto@macro\reserved at a{,{##1=##2}}}%
\def\do##1{\reserved at b##1}%
- \@nameuse{scr at kav@KOMA#2}%
+ \@nameuse{scr at kav@KOMA.#2}%
\ifx\reserved at a\@empty
\def\reserved at b{\endgroup\let#1\@empty}%
\else
@@ -732,6 +738,7 @@
% \begin{macro}{\KOMA at kav@defone}
% \changes{v3.17}{2015/02/25}{added}
% \changes{v3.28}{2019/11/18}{\cs{ifstrstart} renamed to \cs{Ifstrstart}}
+% \changes{v3.39}{2022/11/11}{initial dot added automatically}
% This macro defines a macro/command with all stored values of a \meta{key}
% from the internal list of \texttt{\meta{key}=\meta{value}} pairs.
% The first argument is the macro/command to be defined. The second is the
@@ -739,7 +746,7 @@
% \begin{macrocode}
%<*koma>
\newcommand*{\KOMA at kav@defone}[3]{%
- \@ifundefined{scr at kav@KOMA#2}{%
+ \@ifundefined{scr at kav@KOMA.#2}{%
\KOMA at internal@error\KOMA at kav@defall{#1}%
}{%
\begingroup
@@ -748,7 +755,7 @@
\Ifstr{##1}{#3}{\l at addto@macro\reserved at a{,{##2}}}{}%
}%
\def\do##1{\reserved at b##1}%
- \@nameuse{scr at kav@KOMA#2}%
+ \@nameuse{scr at kav@KOMA.#2}%
\ifx\reserved at a\@empty
\def\reserved at b{\endgroup\let#1\@empty}%
\else
@@ -767,6 +774,7 @@
%
% \begin{macro}{\KOMA at internal@error}
% \changes{v3.17}{2015/02/24}{added}
+% \changes{v3.39}{2022/11/11}{bug report address changed}
% General internal error message with the recommendation to report a bug.
% \begin{macrocode}
%<*koma>
@@ -779,7 +787,7 @@
that\MessageBreak
shows this error, to komascript at gmx dot info or report it
at\MessageBreak
- <http://www.komascript.de/forum/20> (you need an account to do so).%
+ <https://sf.net/p/koma-script/tickets/> (you need an account to do so).%
}%
}
%</koma>
@@ -3370,6 +3378,8 @@
% \changes{v2.97c}{2007/04/19}{added}
% \changes{v3.00}{2008/04/30}{no optional argument}
% \changes{v3.12}{2013/03/04}{can be used after the document preamble}
+% \changes{v3.39}{2022/11/11}{initial dot added automatically}
+% \changes{v3.99}{2022/11/16}{do not handle deprecated initial dot}
% Executes a \meta{list of options} (\texttt{\#3}) of a \meta{member} (optional
% \texttt{\#1}) of a \meta{family} (\texttt{\#2}). The default for the
% \meta{member} is \file{.\cs{@currname}.\cs{@currext}}. Note: If
@@ -3379,8 +3389,19 @@
% optional argument to set a definite \meta{member}.
% \begin{macrocode}
%<*koma>
-\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
- \FamilyExecuteOptions[#1]{KOMA}%
+\newcommand*{\KOMAExecuteOptions}[1][\@currname.\@currext]{%
+%<*!v4>
+ \Ifstrstart{#1}{.}{%
+ \PackageWarning{scrkbase}{Deprecated initial dot of member
+ argument\MessageBreak
+ of \string\KOMAExecuteOptions\space detected%
+ }%
+ \expandafter\FamilyExecuteOptions[#1]%
+ }{%
+%</!v4>
+ \FamilyExecuteOptions[.#1]%
+%<!v4> }%
+ {KOMA}%
}
%</koma>
% \end{macrocode}
@@ -3932,6 +3953,8 @@
%
% \begin{command}{\KOMAoptionsOf}
% \changes{v3.17}{2015/02/25}{added}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% \cs{KOMA at kac@defall}}
% Ask for the currently set options of a supporting \KOMAScript{} class or
% package. The optional first argument (\texttt{\#1}) is a command or macro,
% that will be execute with the list of options as an argument. The second
@@ -3948,7 +3971,7 @@
}{%
\begingroup
\def\reserved at a{#1}%
- \KOMA at kav@defall\reserved at b{.#2}%
+ \KOMA at kav@defall\reserved at b{#2}%
\expandafter\expandafter\expandafter\endgroup
\expandafter\reserved at a\expandafter{\reserved at b}%
}%
@@ -3976,7 +3999,7 @@
}{%
\begingroup
\def\reserved at a{#1}%
- \KOMA at kav@defone\reserved at b{.#2}{#3}%
+ \KOMA at kav@defone\reserved at b{#2}{#3}%
\ifx\reserved at b\@empty
\PackageWarning{scrkbase}{option `#3' for `#2' unset}%
\endgroup
@@ -4292,6 +4315,7 @@
% \begin{macro}{\KOMA at ifkey}
% \changes{v3.02c}{2009/02/04}{defines the member if needed}
% \changes{v3.17}{2015/03/02}{replaces the value in the storage}
+% \changes{v3.39}{2022/11/11}{initial dot added automatically}
% This is an extended version of \cs{FamilyBoolKey} with static family
% |KOMA|. So the syntax is:
% \begin{quote}
@@ -4307,7 +4331,7 @@
% was not defined, the initialized value is \opt{false}.
% \begin{macrocode}
%<*koma>
-\newcommand*{\KOMA at ifkey}[2][.\@currname.\@currext]{%
+\newcommand*{\KOMA at ifkey}[2][\@currname.\@currext]{%
\begingroup\edef\reserved at a{\noexpand\KOMA@@ifkey{#1}{#2}}%
\expandafter\endgroup\reserved at a
}
@@ -4838,7 +4862,7 @@
% e.g., using \cs{KOMA at kav@add}.
% \begin{macrocode}
%<*koma>
-\newcommand*{\KOMA at ncmdkey}[2][.\@currname.\@currext]{%
+\newcommand*{\KOMA at ncmdkey}[2][\@currname.\@currext]{%
\begingroup\edef\reserved at a{\noexpand\KOMA@@ncmdkey{#1}{#2}}%
\expandafter\endgroup\reserved at a
}
@@ -4950,6 +4974,7 @@
% \changes{v3.01a}{2008/11/20}{added}
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel at ifnextchar}}
+% \changes{v3.99}{2022/11/16}{not with \KOMAScript~4}
% Used to define a deprecated \meta{classic option} by an up-to-date
% \meta{\pkg*{keyval} option}.
% \begin{quote}
@@ -4961,7 +4986,7 @@
% \begin{macro}{\KOMA@@DeclareDeprecatedOption,\KOMA@@@DeclareDeprecatedOption}
% \changes{v3.01a}{2008/11/20}{added}
% \begin{macrocode}
-%<*koma>
+%<*koma&!v4>
\newcommand*{\KOMA at DeclareDeprecatedOption}{%
\kernel at ifnextchar [%]
{\KOMA@@DeclareDeprecatedOption}%
@@ -5024,7 +5049,7 @@
}%
\reserved at a
}
-%</koma>
+%</koma&!v4>
% \end{macrocode}
% \end{macro}^^A \KOMA at UseDeprecatedOption
% \end{macro}^^A \KOMA@@DeclareDeprecatedOption,\KOMA@@@DeclareDeprecatedOption
@@ -5101,6 +5126,7 @@
% \begin{macro}{\KOMA at newobsoletecommand,\KOMA at newdeprecatedcommand}
% \changes{v3.12}{2013/03/04}{\cs{KOMA at newobsoletecommand} renamed to
% \cs{KOMA at newdeprecatedcommand}}
+% \changes{v3.99}{2022/11/16}{not with \KOMAScript~4}
% Defines a deprecated command or \meta{macro}, represented by a
% \meta{\pkg*{keyval} option}:
% \begin{quote}
@@ -5114,7 +5140,7 @@
% \changes{v3.12}{2013/03/04}{\cs{KOMA at UseObsoleteCommand} renamed to
% \cs{KOMA at UseDeprecatedCommand}}
% \begin{macrocode}
-%<*koma>
+%<*koma&!v4>
\newcommand*{\KOMA at newdeprecatedcommand}[3][\@gobbletwo]{%
\newcommand*{#2}{\KOMA at UseDeprecatedCommand{#1}{\string#2}{#3}}%
}
@@ -5128,7 +5154,7 @@
}%
\KOMAoptions{#3}%
}
-%</koma>
+%</koma&!v4>
% \end{macrocode}
% \end{macro}^^A \KOMA at UseDeprecatedCommand
% \end{macro}^^A \KOMA at newdeprecatedcommand
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-bibliography.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-bibliography.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-bibliography.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-16 08:11:05 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3990 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-bibliography.dtx}%
@@ -148,6 +148,8 @@
% \changes{v3.17}{2015/03/12}{added}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
% \changes{v3.36}{2022/02/21}{add expanded name to list}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% To be able to change the current value of option \opt{bibliography} we need
% to know the current style and save it in \cs{scr at current@bibstyle}. We also
% have to correct the value in the storage by activating a style.
@@ -155,7 +157,7 @@
\@ifundefined{scr at current@bibstyle}{}{%
\Ifstr{\scr at current@bibstyle}{}{}{%
\edef\reserved at a{%
- \noexpand\KOMA at kav@remove{.\KOMAClassFileName}{bibliography}%
+ \noexpand\KOMA at kav@remove{\KOMAClassFileName}{bibliography}%
{\scr at current@bibstyle}%
}\reserved at a
}%
@@ -164,7 +166,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macrocode}
- \KOMA at kav@xadd{.\KOMAClassFileName}{bibliography}{#2}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{bibliography}{#2}%
\csname scr at bibstyle@#1\endcsname
#3%
}%
@@ -302,6 +304,8 @@
% \changes{v3.25}{2017/10/13}{using always \cs{@mkright} and \cs{@mkdouble}}
% \changes{v3.25}{2017/10/13}{redefining \cs{bibliography at heading} instead of
% \cs{bib at heading}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \KOMAScript provides several configurations for the bibliography or
% references using a single option.
% \begin{macro}{\bib at leveldownfalse,\bib at leveldowntrue,\ifbib at leveldown}
@@ -358,14 +362,14 @@
{standardlevel}{4}%
}{#1}%
\ifcase \@tempa\relax % notoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{notoc}%
\renewcommand*{\bibliography at heading}[1]{%
\ifbib at leveldown
%<article> \subsection*{##1}%
@@ -378,14 +382,14 @@
\fi
}%
\or% totoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{totoc}%
\renewcommand*{\bibliography at heading}[1]{%
%<*article>
\ifbib at leveldown
@@ -420,14 +424,14 @@
%</book|report>
}%
\or% numbered
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{numbered}%
\renewcommand*{\bibliography at heading}[1]{%
%<*article>
\ifbib at leveldown
@@ -451,14 +455,14 @@
%</book|report>
}
\or% leveldown
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{leveldown}%
\bib at leveldowntrue
\or% standardlevel
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{standardlevel}%
\bib at leveldownfalse
\fi
}{%
@@ -473,7 +477,7 @@
% \begin{macrocode}
\FamilyKeyStateProcessed
\edef\reserved at a{%
- \noexpand\KOMA at kav@remove{.\KOMAClassFileName}{bibliography}%
+ \noexpand\KOMA at kav@remove{\KOMAClassFileName}{bibliography}%
{\scr at current@bibstyle}%
}\reserved at a
\csname scr at bibstyle@#1\endcsname
@@ -503,6 +507,7 @@
% \changes{v2.7j}{2001/06/27}{preamble printing moved to \env{thebibliography}}
% \changes{v2.98c}{2008/02/15}{obsolete}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.39}{2022/11/16}{not with \KOMAScript~4}
% \begin{option}{bibtotocnumbered}
% \changes{v2.3h}{1995/01/21}{added}
% \changes{v2.6b}{2000/05/26}{\cs{@mkboth} added}
@@ -514,12 +519,15 @@
% \changes{v2.9p}{2003/07/07}{number in running head}
% \changes{v2.98c}{2008/02/15}{obsolete}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.39}{2022/11/16}{not with \KOMAScript~4}
% Deprecated options \opt{bibtotoc} and \opt{bibtotocnumbered} are mapped to
% \opt{bibliography=totoc} resp. \opt{bibliography=totocnumbered}.
% \begin{macrocode}
+%<*!v4>
\KOMA at DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA at DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%</option>
+%</!v4>
+%</option>
% \end{macrocode}
% \end{option}^^A bibtotocnumbered
% \end{option}^^A bibtotoc
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<option>%%% (run: option)
@@ -27,9 +27,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
- \filedate$Date: 2022-08-09 12:05:50 +0200 (Di, 09. Aug 2022) $
+ \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
- \filerevision$Revision: 3949 $
+ \filerevision$Revision: 3985 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-compatibility.dtx}%
@@ -89,6 +89,17 @@
%
% \section{Implementation of Compatibility Selection}
%
+% \changes{v3.99}{2022/10/25}{begin of less compatibility of \KOMAScript~4}
+% For \KOMAScript{} before version 4 there are a lot of compatibility
+% settings. However, testing of all those are almost impossible and with all
+% those new features of new \LaTeX{} kernels it will become harder and
+% harder. So from \KOMAScript~4, compatibility to prior versions will be
+% reduced a lot. If users need such compatibility, they should use older
+% releases. However, for some time, at least before the first official release
+% of \KOMAScript~4, conditionally the sources support generation of a
+% \KOMAScript~3 compatible version or alternatively of a \KOMAScript~4
+% compatible version.
+%
% \subsection{Options for compatibility with the standard classes}
% There is only one such option, which can only be used while loading a
% \KOMAScript{} class.
@@ -139,13 +150,21 @@
%
%
% \subsection{Options for compatibility with prior versions of \KOMAScript}
-% There is also a single option to select compatibility with exactly one
-% \KOMAScript{} version. The compatibility changes are limited to feature
-% changes. Bug changes are not affected. So you would never be able to get
-% exactly the result of the given version using this option. However falling
-% back to compatibility with a prior version usually also deactivates other
-% features of the current version.
%
+% \changes{v3.99}{2022/10/25}{\KOMAScript~3 only}
+% All features of this section are limited to \KOMAScript~3. \KOMAScript~4
+% will not implement it.
+% \begin{macrocode}
+%<*!v4>
+% \end{macrocode}
+%
+% For \KOMAScript~3 there is a single option to select compatibility with
+% exactly one \KOMAScript{} version. The compatibility changes are limited to
+% feature changes. Bug changes are not affected. So you would never be able to
+% get exactly the result of the given version using this option. However
+% falling back to compatibility with a prior version usually also deactivates
+% other features of the current version.
+%
% \changes{v3.01b}{2008/12/09}{compatibility definitions in packages only, if
% not yet defined}
%
@@ -152,6 +171,8 @@
% \begin{option}{version}
% \changes{v2.9u}{2005/03/05}{added}
% \changes{v2.95}{2006/03/16}{can be used while loading only}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\scr at compatibility}
% \changes{v2.9u}{2005/03/05}{added}
% \changes{v3.01a}{2008/11/20}{default is \opt{\quotechar=last}}
@@ -185,7 +206,7 @@
Because of this, version was set to `first'%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
%<package&typearea> typearea.\scr at pkgextension
@@ -205,7 +226,7 @@
%<class|extend|letter> \edef\scr at compatibility{\@nameuse{scr at v@#1}}%
%<typearea> \edef\scr at ta@compatibility{\@nameuse{scr at v@#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
%<package&typearea> typearea.\scr at pkgextension
@@ -236,7 +257,7 @@
\fi
}%
}
-%<class>\KOMA at kav@add{.\KOMAClassFileName}{version}{last}
+%<class>\KOMA at kav@add{\KOMAClassFileName}{version}{last}
% \end{macrocode}
% We do not use \cs{FamilyKeyState} if the option is set to late, but
% immediately report an error.
@@ -432,6 +453,8 @@
% \changes{v3.37}{2022/05/04}{added}
% \begin{macro}{\scr at v@3.38}
% \changes{v3.38}{2022/07/06}{added}
+% \begin{macro}{\scr at v@3.39}
+% \changes{v3.39}{2022/10/13}{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
@@ -519,6 +542,7 @@
\@namedef{scr at v@3.36}{20}
\@namedef{scr at v@3.37}{20}
\@namedef{scr at v@3.38}{20}
+\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@last}{20}
% \end{macrocode}
% \end{macro}
@@ -605,6 +629,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
% \end{option}
% \begin{macrocode}
%</init>
@@ -643,6 +668,18 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\scr at v@is at eq}
+% \changes{v3.39}{2022/10/25}{added}
+% Similar to the above for equality test.
+% \begin{macrocode}
+%<*option&(class|extend)>
+\newcommand*{\scr at v@is at eq}[1]{%
+ \scr at compatibility=\@nameuse{scr at v@#1}
+}
+%</option&(class|extend)>
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\scr at ta@v at is@lt,\scr at ta@v at is@gt,\scr at ta@v at is@le,\scr at ta@v at is@ge}
% \changes{v3.17}{2015/03/10}{Neu (intern)}
% The same conditions are defined for \pkg*{typearea}.
@@ -664,6 +701,11 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macrocode}
+%</!v4>
+% \end{macrocode}
+%
+% \subsection{Compatibility with used \LaTeX{} kernel version}
% \changes{v3.37}{2022/06/21}{version test added}
% We also do some version tests at |\begin{document}| because of the extremely
% high speed of \LaTeX{} kernel development.
@@ -733,6 +775,7 @@
% The deprecated command has been used to set a boolean switch to true or
% false using one of the values |true|, |false|, |on|, or |off|.
% \begin{macrocode}
+%<*!v4>
%<*class&letter&body>
\expandafter\ifnum \@nameuse{scr at v@2.95}>\scr at compatibility\relax
\newcommand*{\@setif}[2][]{%
@@ -746,6 +789,7 @@
}%
\fi
%</class&letter&body>
+%</!v4>
% \end{macrocode}
% \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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14: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: 2022-07-20 12:37:02 +0200 (Mi, 20. Jul 2022) $
+ \filedate$Date: 2022-11-16 08:14:51 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3946 $
+ \filerevision$Revision: 3992 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-floats.dtx}%
@@ -180,6 +180,8 @@
% \opt{figureheading}, \opt{figuresignature}}
% \changes{v3.17}{2015/03/11}{using \cs{FamilyKeyState}}
% \changes{v3.17}{2015/03/11}{using internal value storage}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% This is the general option for the settings of captions. Because of
% compatibility with package \pkg{caption}, several of the macros, that are
% used to handle the values to the option, cannot be renamed and have to be
@@ -298,101 +300,101 @@
\@tablecaptionabovetrue
\@figurecaptionabovetrue
\@captionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{heading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{signature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{heading}%
\or % signature
\@tablecaptionabovefalse
\@figurecaptionabovefalse
\@captionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{heading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{signature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{signature}%
\or % tableheading
\@tablecaptionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{tableheading}%
\or % tablesignature
\@tablecaptionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{tablesignature}%
\or % figureheading
\@figurecaptionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{figureheading}%
\or % figuresignature
\@figurecaptionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{figuresignature}%
\or % oneline
\onelinecaptionstrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{oneline}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{oneline}%
\or % nooneline
\onelinecaptionsfalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{oneline}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{nooneline}%
\or % rightbeside
\renewcommand*{\scap at pos}{r}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{rightbeside}%
\or % leftbeside
\renewcommand*{\scap at pos}{l}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{leftbeside}%
\or % innerbeside
\renewcommand*{\scap at pos}{i}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{innerbeside}%
\or % outerbeside
\renewcommand*{\scap at pos}{o}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{outerbeside}%
\or % topbeside
\renewcommand*{\scap at valign}{t}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{topbeside}%
\or % centeredbeside
\renewcommand*{\scap at valign}{c}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{centeredbeside}%
\or % bottombeside
\renewcommand*{\scap at valign}{b}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{bottombeside}%
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{signature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{tablesignature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{figuresignature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{oneline}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{rightbeside}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{bottombeside}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{signature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{tablesignature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{figuresignature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{oneline}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{rightbeside}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{bottombeside}
% \end{macrocode}
% \end{option}^^A captions
%
@@ -401,11 +403,14 @@
% \changes{v2.8k}{2001/08/15}{moved from \pkg*{typearea} into the classes}
% \changes{v2.98c}{2008/02/18}{obsolete}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{not with \KOMAScript~4}
% Implementation of deprecated options by mapping them to corresponding
% \pkg*{keyval} options.
% \begin{macrocode}
+%<*!v4>
\KOMA at DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading}
\KOMA at DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature}
+%</!v4>
% \end{macrocode}
% \end{option}^^A tablecaptionabove,tablecaptionbelow
%
@@ -428,12 +433,15 @@
% \changes{v2.98c}{2008/03/03}{obsolete}
% \changes{v2.98c}{2008/03/03}{extra code for \pkg{caption2} removed}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{not with \KOMAScript~4}
% Implementation of deprecated options by mapping them to corresponding
% \pkg*{keyval} options.
% \begin{macrocode}
+%<*!v4>
\KOMA at DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA at DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%</option>
+%</!v4>
+%</option>
% \end{macrocode}
% \end{option}^^A onelinecaption,noonelinecaption
%
@@ -612,11 +620,18 @@
% \begin{macro}{\c at pti@nb at sid@}
% \changes{v2.8q}{2001/11/22}{added}
% \changes{v2.98c}{2008/03/11}{vertical alignment fixed}
-% \changes{v3.07a}{2010/11/04}{vertical alignment \texttt{t} and \texttt{b} fixed}
+% \changes{v3.07a}{2010/11/04}{vertical alignment \texttt{t} and \texttt{b}
+% fixed}
+% \changes{v3.99}{2022/11/10}{vertical alignment fixed}
% This is the real beginning of the environment. After collecting all the
-% arguments into local macros.
+% arguments into local macros. Until version 4 the vertical alignment was
+% totally broken at least, if font element \fnt{caption} changes font
+% size. From version 4 we try to take care on this. However, the current
+% solution could still fail, if the first resp. last line of content of the
+% environment changes the font size.
% \begin{macrocode}
\newcommand{\c at pti@nb at sid@}{}
+%<*!v4>
\long\def\c at pti@nb at sid@[#1]#2{%
\def\scap at caption{%
\if c\scap at valign
@@ -633,6 +648,33 @@
}%
\begin{lrbox}{\c at pti@nb at sid@b at x}%
}
+%</!v4>
+%<*v4>
+\long\def\c at pti@nb at sid@[#1]#2{%
+ \def\scap at caption{%
+ \abovecaptionskip\z@
+ \belowcaptionskip\z@
+ \if t\scap at valign
+ {%
+ \usekomafont{caption}{%
+ \global\@tempdima\ht\strutbox
+ }%
+ }%
+ \setlength{\abovecaptionskip}{-\@tempdima}%
+ \fi
+ \if b\scap at valign
+ {%
+ \usekomafont{caption}{%
+ \global\@tempdima\dp\strutbox
+ }%
+ }%
+ \setlength{\belowcaptionskip}{\dimexpr\dp\strutbox-2\@tempdima\relax}%
+ \fi
+ \captionbelow[{#1}]{#2}%
+ }%
+ \begin{lrbox}{\c at pti@nb at sid@b at x}%
+}
+%</v4>
% \end{macrocode}
% \end{macro}^^A \c at pti@nb at sid@
% Now we can use all of the helper macros to begin the environment. We use
@@ -1761,6 +1803,7 @@
% \changes{v3.35}{2021/10/12}{redefine \cs{thefigure} only if compatibility is
% less or equal 2.97d resp. less than 3.35}
% \begin{macrocode}
+%<*!v4>
%<*book|report>
\expandafter\ifnum\scr at v@is at le{2.97d}%
\renewcommand*\thefigure{\thechapter.\@arabic\c at figure}
@@ -1771,6 +1814,7 @@
\renewcommand*\thefigure{\@arabic\c at figure}
\fi
%</article>
+%</!v4>
% \end{macrocode}
% \end{command}
% \begin{macro}{\fnum at figure}
@@ -1835,9 +1879,10 @@
% \changes{v2.97e}{2007/11/23}{using chapter number in main-matter only}
% \changes{v3.27}{2019/06/26}{\cs{relax} replaced by percent}
% \changes{v3.35}{2021/10/12}{use chapter number only of greater than zero}
-% \changes{v3.35}{2021/10/12}{redefine \cs{thefigure} only if compatibility is
+% \changes{v3.35}{2021/10/12}{redefine \cs{thetable} only if compatibility is
% less or equal 2.97d resp. less than 3.35}
% \begin{macrocode}
+%<*!v4>
%<*book|report>
\expandafter\ifnum\scr at v@is at le{2.97d}%
\renewcommand*\thetable{\thechapter.\@arabic\c at table}
@@ -1848,6 +1893,7 @@
\renewcommand*\thetable{\@arabic\c at table}
\fi
%</article>
+%</!v4>
%</body>
% \end{macrocode}
% \end{command}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-fonts.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%<identify>%%% (run: identify)
%<option>%%% (run: option)
%<body>%%% (run: body)
@@ -29,9 +29,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-10-06 14:44:28 +0200 (Do, 06. Okt 2022) $
+ \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3958 $
+ \filerevision$Revision: 4021 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-fonts.dtx}%
@@ -89,10 +89,8 @@
% \MaybeStop{\PrintIndex}
%
%
-% \section{Implementation of \KOMAScript{} Font Features}
+% \section{Implementation of Options of the Font Fize Files Fenerator Package}
%
-% \subsection{Options of the font size files generator package}
-%
% From version 3.09 there exist package \pkg*{scrfontsizes}, which is currently
% very rudimentary. However it can used to generate font size files that can
% be modified by the user afterwards. Currently it does not provide any options.
@@ -103,7 +101,7 @@
%</generator&option>
% \end{macrocode}
%
-% \subsection{Font size options of the \KOMAScript{} classes}
+% \section{Implementation of Font Size Options of the \KOMAScript{} Classes}
%
% \begin{option}{10pt,11pt,12pt}
% These options do not exist as explicit options but are handled by
@@ -193,6 +191,8 @@
% \changes{v2.98c}{2008/03/26}{loading font size file if available}
% \changes{v3.12}{2013/03/05}{signaling using \cs{FamilyKeyStateProcessed}}
% \changes{v3.38}{2022/10/06}{error message in horizontal mode added}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% The option itself. Note, that it supports also font sizes like
% \texttt{10.3pt}.
% \begin{macrocode}
@@ -260,7 +260,7 @@
\@tempa
}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
%<class> \KOMAClassFileName
%<extend> scrextend.\scr at pkgextension
}{fontsize}{#1}%
@@ -270,7 +270,7 @@
% \end{option}
%
%
-% \subsection{Packages required by the font size file generator package}
+% \section{Loading Packages Required by the Font Size File Generator Package}
%
% \pkg*{scrfontsizes} needs command \cs{changefontsizes}. This can either be
% provided by a \KOMAScript{} class or package \pkg*{scrextend}.
@@ -281,7 +281,7 @@
% \end{macrocode}
%
%
-% \subsection{The font size files}
+% \section{Implementation of The Font Size Files}
%
% \changes{v2.6}{2000/01/04}{reading font size files works independent from size}
% \changes{v2.98c}{2008/03/26}{using my own \file{scrsize\dots.clo} files}
@@ -582,6 +582,8 @@
% \begin{macro}{\simple at changefontsizes}
% \changes{v3.17}{2015/02/23}{added}
% \changes{v3.17}{2015/03/25}{\cs{par at updaterelative} added}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% Fallback calculation of font size settings relative to known 10\,pt values:
% \begin{quote}
% \cs{changefontsizes}\oarg{baseline skip}\marg{font size}
@@ -602,9 +604,9 @@
% \begin{macrocode}
%<*body&(class|extend)>
\newcommand*\scr at setlength[4]{%
- \expandafter\ifnum\scr at v@is at lt{3.12}\relax
- \setlength{#1}{#2 \@plus#3 \@minus#4}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.12}\relax
+%<!v4> \setlength{#1}{#2 \@plus#3 \@minus#4}%
+%<!v4> \else
\ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
\ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
\ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
@@ -634,7 +636,7 @@
\fi
\fi
\fi
- \fi
+%<!v4> \fi
}
% \end{macrocode}
% \end{macro}
@@ -643,7 +645,7 @@
% from 2021/10/04}
% \begin{macrocode}
\providecommand*{\simple at changefontsizes}[2][1.2\@tempdima]{%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
%<class> \KOMAClassFileName
%<extend> scrextend.\scr at pkgextension
}{fontsize}%
@@ -666,19 +668,19 @@
%
% Calculation and definition of \cs{normalsize}:
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.12}\relax
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.12}\relax
+%<!v4> \setlength{\abovedisplayskip}{%
+%<!v4> \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+%<!v4> \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+%<!v4> \setlength{\belowdisplayshortskip}{%
+%<!v4> .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+%<!v4> \else
\scr at setlength{\abovedisplayskip}%
{.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
\scr at setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
\scr at setlength{\belowdisplayshortskip}%
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
- \fi
+%<!v4> \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
\edef\reserved at a{%
\noexpand\@setfontsize\noexpand\normalsize
@@ -696,19 +698,19 @@
% \begin{macrocode}
\setlength{\@tempdima}{0.9125\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \expandafter\ifnum\scr at v@is at lt{3.12}\relax
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.12}\relax
+%<!v4> \setlength{\abovedisplayskip}{%
+%<!v4> \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+%<!v4> \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+%<!v4> \setlength{\belowdisplayshortskip}{%
+%<!v4> .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+%<!v4> \else
\scr at setlength{\abovedisplayskip}%
{.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
\scr at setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
\scr at setlength{\belowdisplayshortskip}%
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
- \fi
+%<!v4> \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
\edef\reserved at a{%
\noexpand\@setfontsize\noexpand\small
@@ -726,19 +728,19 @@
% \begin{macrocode}
\setlength{\@tempdima}{.83334\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \expandafter\ifnum\scr at v@is at lt{3.12}\relax
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.12}\relax
+%<!v4> \setlength{\abovedisplayskip}{%
+%<!v4> \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+%<!v4> \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+%<!v4> \setlength{\belowdisplayshortskip}{%
+%<!v4> .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+%<!v4> \else
\scr at setlength{\abovedisplayskip}%
{.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
\scr at setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
\scr at setlength{\belowdisplayshortskip}%
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
- \fi
+%<!v4> \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
\edef\reserved at a{%
\noexpand\@setfontsize\noexpand\footnotesize
@@ -833,12 +835,15 @@
% depending sized.
% \begin{macrocode}
\normalsize
-%<!extend> \expandafter\ifnum\scr at v@is at ge{3.17}\@nameuse{par at updaterelative}\fi
+%<!extend&!v4> \expandafter\ifnum\scr at v@is at ge{3.17}
+%<!extend> \@nameuse{par at updaterelative}%
+%<!extend&!v4> \fi
% \end{macrocode}
% After the activation of \cs{normalsize} above, we can use \cs{f at size} and
% \cs{f at baselineskip}. We cannot use \cs{baselineskip}, because this would be
% influenced by \cs{baselinestretch}.
% \begin{macrocode}
+%<*!v4>
\expandafter\ifnum\scr at v@is at lt{3.12}\relax
\setlength{\footnotesep}{.7\@tempdimc}%
\setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
@@ -859,20 +864,21 @@
\setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
\setlength{\@dblfpbot}{\@fptop}%
\fi
+%</!v4>
% \end{macrocode}
% Calculation and definition of \cs{@listi} and \cs{@listI}:
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.12}\relax
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.12}\relax
+%<!v4> \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+%<!v4> .5\@tempdimc}%
+%<!v4> \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+%<!v4> \else
\setlength{\@tempdimb}{\f at baselineskip}%
\scr at setlength{\parsep}%
{.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
\scr at setlength{\topsep}%
{.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
- \fi
+%<!v4> \fi
\@tempswafalse
\begingroup
\def\@list at extra{\aftergroup\@tempswatrue}%
@@ -888,16 +894,16 @@
% \end{macrocode}
% Calculation and definition of \cs{@listi at small}:
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.12}\relax
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.12}\relax
+%<!v4> \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+%<!v4> .41667\@tempdimc}%
+%<!v4> \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+%<!v4> \else
\scr at setlength{\parsep}%
{.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
\scr at setlength{\topsep}%
{.3333\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
- \fi
+%<!v4> \fi
\@tempswafalse
\begingroup
\def\@list at extra{\aftergroup\@tempswatrue}%
@@ -912,16 +918,16 @@
% \end{macrocode}
% Calculation and definition of \cs{@listi at footnotesize}:
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.12}\relax
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.12}\relax
+%<!v4> \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+%<!v4> .16667\@tempdimc}%
+%<!v4> \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+%<!v4> \else
\scr at setlength{\parsep}%
{.125\@tempdimb}{.0625\@tempdimb}{.0625\@tempdimb}%
\scr at setlength{\topsep}%
{.25\@tempdimb}{.125\@tempdimb}{.125\@tempdimb}%
- \fi
+%<!v4> \fi
\@tempswafalse
\begingroup
\def\@list at extra{\aftergroup\@tempswatrue}%
@@ -936,15 +942,15 @@
% \end{macrocode}
% Calculation and definition of \cs{@listii}:
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.12}\relax
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.12}\relax
+%<!v4> \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+%<!v4> \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+%<!v4> \else
\scr at setlength{\parsep}%
{.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
\scr at setlength{\topsep}%
{.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
- \fi
+%<!v4> \fi
\@tempswafalse
\begingroup
\def\@list at extra{\aftergroup\@tempswatrue}%
@@ -960,12 +966,12 @@
% \end{macrocode}
% Calculation and definition of \cs{@listiii}:
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.12}\relax
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.12}\relax
+%<!v4> \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+%<!v4> \else
\scr at setlength{\topsep}%
{.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
- \fi
+%<!v4> \fi
\setlength{\partopsep}{\z@ \@plus\z@ \@minus\p@}%
\@tempswafalse
\begingroup
@@ -1028,13 +1034,13 @@
% \len{@dblfptop}, \len{@dblfpsep}, \len{@dblfpbot}. Setting of \len{topsep}
% and \len{parsep} is not needed because part of \cs{@listi}.
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.12}\relax
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
- \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
- \setlength\dblfloatsep\intextsep
- \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.12}\relax
+%<!v4> \setlength{\@tempdimb}{\@tempb\@tempdima}%
+%<!v4> \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+%<!v4> \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+%<!v4> \setlength\dblfloatsep\intextsep
+%<!v4> \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+%<!v4> \else
\setlength{\@tempdimb}{\f at baselineskip}%
\setlength{\footnotesep}{.555\@tempdimb}%
\scr at setlength{\skip\footins}%
@@ -1053,7 +1059,7 @@
\setlength{\@dblfpsep}{\@fpsep}%
\setlength{\@dblfpbot}{\@fptop}%
\scr at setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}%
- \fi
+%<!v4> \fi
}
\scr at ifundefinedorrelax{changefontsizes}{%
\let\changefontsizes\simple at changefontsizes
@@ -1389,8 +1395,9 @@
\endgroup
\immediate\write\@fontfile{%
\string\@ifundefined{@list at extra}{}{\@percentchar^^J%
- \string\expandafter\string\ifnum\string\scr at v@is at ge{3.17}%
- \string\par at updaterelative\string\fi^^J%
+%<!v4> \string\expandafter\string\ifnum\string\scr at v@is at ge{3.17}^^J%
+ \string\par at updaterelative^^J%
+%<!v4> \string\fi^^J%
\@ind\string\l at addto@macro{\string\@listi}{\string\@list at extra}%
\@percentchar^^J%
\@ind\string\let\string\@listI=\string\@listi^^J%
@@ -1440,8 +1447,8 @@
\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}%
}{%
% \end{macrocode}
% If this is not successful, try
@@ -1451,8 +1458,8 @@
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak
file `\@fontsizefilebase\@tempa.clo' to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb pt}%
}{%
% \end{macrocode}
% If this is still not successful try a font size file of the standard
@@ -1462,15 +1469,15 @@
\InputIfFileExists{bk\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `bk\@tempb.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
%</book>
\InputIfFileExists{size\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `size\@tempb.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
% \end{macrocode}
% If this is still not successful, use the fallback calculation.
@@ -1477,7 +1484,7 @@
% \begin{macrocode}
\edef\@tempa{%
\noexpand\changefontsizes{\@tempa}%
- \noexpand\KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ \noexpand\KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}%
}\@tempa
}%
%<book> }%
@@ -1487,7 +1494,7 @@
% \end{macrocode}
%
%
-% \subsection{Deprecated old font selection commands}
+% \section{Implementation of Deprecated Old Font Selection Commands}
%
% \begin{option}{enabledeprecatedfontcommands}
% \changes{v3.20}{2015/10/14}{added}
@@ -1680,9 +1687,101 @@
% \end{command}
%
%
-% \subsection{Font elements}
+% \section{Implementation of Special Handling of Sans-Serif Defaults}
%
+% \changes{v3.39}{2022/11/19}{moved from \file{scrkernel-miscellaneous.dtx}}
%
+% Some users do not like the sans-serif defaults of \KOMAScript. Though each
+% of these defaults could be changed easily using \cs{setkomafont} and
+% \cs{addtokomafont}, one user requested an option to be able to do the change
+% already when loading the classes resp. package \pkg*{scrextend}. He even
+% pointed out that the lack of such an option is one reason for him not to use
+% \KOMAScript. Although or just because such a statement of a renowned \LaTeX{}
+% expert could almost be interpreted as a clear recommendation against
+% \KOMAScript, a corresponding option was created immediately.
+%
+% \begin{option}{sfdefaults}
+% Boolean option to change behave of \cs{maybesffamily}.
+% \begin{command}{\textmaybesf,\maybesffamily}
+% \changes{v3.39}{2023/04/04}{new}
+% \begin{macro}{\@gr at gsffamily,\if at sfdefaults,
+% \@sfdefaultfalse,\@sfdefaultstrue}
+% \changes{v3.20}{2016/01/29}{added}
+% \changes{v3.20a}{2016/05/19}{also for \cls*{scrlttr2}}
+% \changes{v3.39}{2023/04/04}{\cs{@gr at gsffamily} renamed to \cs{maybesffamily}}
+% \changes{v3.39}{2023/04/04}{\cs{if at egregdoesnotlikesansseriftitles} replaced
+% by \cs{if at sfdefaults}}
+% Used to switch on or off all the sans-serif defaults.
+% \begin{macrocode}
+%<*(class|extend)&option>
+\KOMA at ifkey{sfdefaults}{@sfdefaults}
+\newcommand*{\maybesffamily}{\if at sfdefaults \sffamily \fi}
+\newcommand*{\textmaybesf}{%
+ \if at sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi
+}
+% \end{macrocode}
+% \end{macro}^^A \if at sfdefaults, …
+% \end{command}^^A \textmaybesf, \maybesffamily
+% \end{option}^^A sfdefaults
+%% \begin{option}{egegdoesnotlikesansseriftitles}
+% \changes{v3.20}{2016/01/29}{added}
+% \changes{v3.20a}{2016/05/19}{also for \cls*{scrlttr2}}
+% \changes{v3.39}{2022/11/19}{deprecated}
+% \changes{v3.39}{2023/04/04}{replaced by new option \opt{sfdefaults}}
+% \begin{description}
+% \item[Note:] Although the description found earlier at this place was never
+% meant to be offensive, it was taken as offensive. Therefore, I expressly
+% apologize for the earlier wording.
+% \end{description}
+% \begin{macrocode}
+\KOMA at key{egregdoesnotlikesansseriftitles}[true]{%
+%<class> \ClassWarningNoLine{\KOMAClassName}%
+%<extend> \PackageWarningNoLine{scrextend}%
+ {%
+ You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak
+ In 2016 this option has been implemented as a joke\MessageBreak
+ answer to egreg's comment:\MessageBreak
+ \space\space ``In my opinion there should be a document class\MessageBreak
+ \space\space option for it, instead of the
+ \string\setkomafont\MessageBreak
+ \space\space statement. And yes, I find imposing sans serif
+ for\MessageBreak
+ \space\space titles is not the best choice (one of the
+ reasons\MessageBreak
+ \space\space why I don't use Koma-script classes).''\MessageBreak
+ to question https://tex.stackexchange.com/q/289853\MessageBreak
+ at TeX.SX.\MessageBreak
+ The option has never been documented in the official\MessageBreak
+ user manuals and therefore should never have been\MessageBreak
+ used in real live documents. It was intended to be\MessageBreak
+ removed after some month.\MessageBreak
+ However, it has been used and also almost forgotten\MessageBreak
+ by the author.\MessageBreak
+ For this the author apologizes both to users but\MessageBreak
+ especially to egreg.\MessageBreak
+ Rightly, egreg has criticized the permanent retention\MessageBreak
+ of the option as unfunny to inappropriate and has\MessageBreak
+ asked that it be removed or replaced.\MessageBreak
+ It will be removed soon!\MessageBreak
+ You should use `sfdefaults=false` instead%
+ }%
+ \KOMA at set@ifkey{egregdoesnotlikesansseriftitles}%
+ {@sfdefaults}%
+ {#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if at sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi
+%<class> \KOMA at kav@xreplacevalue{\KOMAClassFileName}%
+%<extend> \KOMA at kav@xreplacevalue{scrextend.\scr at pkgextension}%
+ {sfdefaults}{\if at sfdefaults true\else false\fi}%
+ \fi
+}
+%</(class|extend)&option>
+% \end{macrocode}
+% \end{option}^^A egegdoesnotlikesansseriftitles
+%
+% \section{Implementation of Font Elements}
+%
+%
% \begin{command}{\IfExistskomafont}
% \changes{v3.15}{2014/11/21}{added}
% Command
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-footnotes.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-footnotes.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-footnotes.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3985 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-footnotes.dtx}%
@@ -85,6 +85,8 @@
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyStateProcessed}}
% \changes{v3.17}{2015/03/11}{internal value storage}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% Multiple footnotes mean, that there are more than one footnote at the same
% place in the text. Usually this would result in a sequence of numbers (or
% other footnote signes) not seperated anyhow. So you would not be able, e.g.,
@@ -115,7 +117,7 @@
\def\FN at mf@prepare{\scr at mf@prepare}%
\def\scr at footmisc@options{multiple}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{footnotes}{multiple}%
@@ -125,7 +127,7 @@
\let\FN at mf@prepare\relax
\let\scr at footmisc@options\@empty
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{footnotes}{nomultiple}%
@@ -136,20 +138,20 @@
}
\AtBeginDocument{%
\ifx\@footnotemark\scr at saved@footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{footnotes}{nomultiple}%
\else\ifx\@footnotemark\scr at footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{footnotes}{multiple}%
@@ -330,7 +332,7 @@
% \meta{indent}.
% \begin{macrocode}
\newcommand\deffootnote[4][]{%
- \expandafter\ifnum\scr at v@is at ge{3.22}\relax
+%<!v4> \expandafter\ifnum\scr at v@is at ge{3.22}\relax
\long\def\@makefntext##1{%
\ExecuteDoHook{footnote/text/begin}%
\raggedfootnote
@@ -345,6 +347,7 @@
\ftn at font\hbox to \z@{\hss\@@makefnmark}##1%
\ExecuteDoHook{footnote/text/end}%
}%
+%<*!v4>
\else
%<class> \ClassInfo{\KOMAClassName}{%
%<package> \PackageInfo{scrextend}{%
@@ -374,6 +377,7 @@
\ftn at font\hbox to \z@{\hss\@@makefnmark}##1%
}%
\fi
+%</!v4>
% \end{macrocode}
% \begin{macro}{\@@makefnmark}
% \changes{v2.4l}{1997/02/06}{added}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-index.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-16 08:17:09 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3993 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-index.dtx}%
@@ -94,6 +94,8 @@
% \changes{v2.98c}{2008/03/04}{redefining \cs{idx@@heading} instead of
% \cs{idx@@heading}}
% \changes{v3.18}{2015/06/15}{new value \opt{leveldown}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% The option allow several values for several features:
% \begin{labeling}{\opt{=standardlevel}:}
% \item[\opt{=default}:] use not numbered heading without ToC entry, but
@@ -151,14 +153,14 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{notoc}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
%<article> \expandafter\subsection
@@ -169,14 +171,14 @@
\fi*%
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{toc}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
%<article> \expandafter\subsection\expandafter*
@@ -187,14 +189,14 @@
\fi
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{numbered}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
%<article> \expandafter\subsection
@@ -205,21 +207,21 @@
\fi
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{leveldown}%
\idx at leveldowntrue
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{standardlevel}%
\idx at leveldownfalse
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{toc}{noindex}
-\KOMA at kav@add{.\KOMAClassFileName}{index}{notoc}
-\KOMA at kav@add{.\KOMAClassFileName}{index}{standardlevel}
+\KOMA at kav@add{\KOMAClassFileName}{toc}{noindex}
+\KOMA at kav@add{\KOMAClassFileName}{index}{notoc}
+\KOMA at kav@add{\KOMAClassFileName}{index}{standardlevel}
% \end{macrocode}
% \end{macro}^^A \ifidx at leveldown …
% \end{macro}^^A \idx@@heading
@@ -229,8 +231,9 @@
% \changes{v2.3h}{1995/01/21}{new}
% \changes{v2.98c}{2008/03/04}{obsolete}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{not with \KOMAScript~4}
% \begin{macrocode}
-\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
+%<!v4>\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
%</option>
% \end{macrocode}
% \end{option}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-16 08:18:05 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3994 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-language.dtx}
@@ -986,6 +986,8 @@
% \cs{PackageInfoNoLine}}
% \changes{v3.17}{2015/03/10}{using internal value storage}
% \changes{v3.36}{2022/02/25}{initial storage value fixed}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% The option allows to switch between the original textual date usually
% provided by \pkg{babel} (or another language package) and a numerical date.
% \begin{macro}{\@orgdatefalse,\@orgdatetrue,\if at orgdate}
@@ -1003,13 +1005,13 @@
\KOMA at key{numericaldate}[true]{%
\if at orgdate\@orgdatefalse\else\@orgdatetrue\fi
\KOMA at set@ifkey{numericaldate}{@orgdate}{#1}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
%<class> \KOMAClassFileName
%<package&letter> scrletter.\scr at pkgextension
}{numericaldate}{@orgdate}%
\if at orgdate\@orgdatefalse\else\@orgdatetrue\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package&letter> scrletter.\scr at pkgextension
}{numericaldate}{true}
@@ -1016,9 +1018,12 @@
% \end{macrocode}
% \begin{option}{scrdate,orgdate}
% \changes{v3.01a}{2008/11/21}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
+%<*!v4>
\KOMA at DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA at DeclareDeprecatedOption{orgdate}{numericaldate=false}
+%</!v4>
%</letter&option>
% \end{macrocode}
% \end{option}^^A scrdate,orgdate
@@ -1032,9 +1037,9 @@
%<*letter&body>
\newcommand*{\g at addnumerical@date}[2]{%
\@ifundefined{date#1}{%
-%<class> \ClassInfo{scrlttr2%
-%<package> \PackageInfo{scrletter%
- }{%
+%<class> \ClassInfo{scrlttr2}
+%<package> \PackageInfo{scrletter}
+ {%
no date found for language `#1'\MessageBreak
--> skipped%
}%
@@ -1535,9 +1540,9 @@
% \begin{macrocode}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname date\languagename\endcsname\relax
-%<class> \ClassWarningNoLine{scrlttr2%
-%<package> \PackageWarningNoLine{scrletter%
- }{%
+%<class> \ClassWarningNoLine{scrlttr2}
+%<package> \PackageWarningNoLine{scrletter}
+ {%
\string\language\space is \the\language, \string\languagename\space is
`\languagename'\MessageBreak
but \expandafter\string\csname
@@ -1548,9 +1553,9 @@
\let\languagename=\undefined
\fi
\ifx\languagename\undefined
-%<class> \ClassWarningNoLine{scrlttr2%
-%<package> \PackageWarningNoLine{scrletter%
- }{\string\languagename\space not
+%<class> \ClassWarningNoLine{scrlttr2}
+%<package> \PackageWarningNoLine{scrletter}
+ {\string\languagename\space not
defined, using \string\language.\MessageBreak
This may result in use of wrong language!\MessageBreak
You should use a compatible language
@@ -1704,9 +1709,9 @@
\else
\edef\@tempa{nohyphenation}%
\ifx\languagename\@tempa
-%<class> \ClassWarningNoLine{scrlttr2%
-%<package> \PackageWarningNoLine{scrletter%
- }{%
+%<class> \ClassWarningNoLine{scrlttr2}
+%<package> \PackageWarningNoLine{scrletter}
+ {%
You've selected language `\languagename'.\MessageBreak
Maybe your LaTeX format contains Babel extension\MessageBreak
but you have not selected a language using\MessageBreak
@@ -1716,9 +1721,9 @@
will be used%
}%
\else
-%<class> \ClassInfo{scrlttr2%
-%<package> \PackageInfo{scrletter%
- }{%
+%<class> \ClassInfo{scrlttr2}
+%<package> \PackageInfo{scrletter}
+ {%
trying to activate captions and date\MessageBreak
of language `\languagename'%
}%
@@ -1730,9 +1735,9 @@
% \begin{macrocode}
\csname date\languagename\endcsname
\csname captions\languagename\endcsname
-%<class> \ClassInfo{scrlttr2%
-%<package> \PackageInfo{scrletter%
- }{%
+%<class> \ClassInfo{scrlttr2}
+%<package> \PackageInfo{scrletter}
+ {%
used language is `\languagename'.\MessageBreak
Supported languages are: `english', `UKenglish',\MessageBreak
`ukenglish', `british', `american', `USenglish',\MessageBreak
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%<option>%%% (run: option)
%<head>%%% (run: head)
%<body>%%% (run: body)
@@ -26,9 +26,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-09 11:07:16 +0100 (Mi, 09. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3981 $
\endgroup
\ProvidesFile{scrkernel-letterclassoptions.dtx}
[\filedate\space \filerevision\space
@@ -177,14 +177,24 @@
\scr at sp@def\reserved at a{#1}%
\edef\reserved at a{%
\noexpand\edef\noexpand\scr at currentlco{\reserved at a}%
+% \end{macrocode}
+% \changes{v3.99}{2022/10/25}{local definition of \cs{scr at compatibility}}
+% For compatibility of old \file{lco} files with \KOMAScript~4 we locally
+% define \cs{scr at compatibility} to the highest possible number.
+% \begin{macrocode}
+%<*v4>
+ \ifdefined\scr at compatibility\else
+ \noexpand\edef\noexpand\scr at compatibility{\the\maxdimen}%
+ \fi
+%</v4>
\noexpand\InputIfFileExists{\reserved at a.lco}{%
-%<class> \noexpand\ClassInfo{scrlttr2%
-%<package> \noexpand\PackageInfo{scrletter%
- }{Letter-Class-Option `#1' loaded}%
+%<class> \noexpand\ClassInfo{scrlttr2}%
+%<package> \noexpand\PackageInfo{scrletter}%
+ {Letter-Class-Option `#1' loaded}%
}{%
-%<class> \noexpand\ClassError{scrlttr2%
-%<package> \noexpand\PackageError{scrletter%
- }{%
+%<class> \noexpand\ClassError{scrlttr2}%
+%<package> \noexpand\PackageError{scrletter}%
+ {%
Letter-Class-Option file `#1.lco' not found%
}{%
You've told me to load the Letter-Class-Option `#1'. So I have
@@ -191,6 +201,13 @@
to load\noexpand\MessageBreak
the file `#1.lco'. But the file isn't available.}%
}%
+%<*v4>
+ \ifdefined\scr at compatibility
+ \noexpand\def\noexpand\scr at compatibility{\scr at compatibility}%
+ \else
+ \unexpanded{\let\scr at compatibility\undefined}%
+ \fi
+%</v4>
\scr at ifundefinedorrelax{scr at currentlco}{%
\unexpanded{\let\scr at currentlco\relax}%
}{%
@@ -363,26 +380,27 @@
%<class>}
\newcommand*{\@@PapersizeWarning}{%
\if at tempswa\else%
-%<class> \ClassWarningNoLine{scrlttr2%
-%<package> \PackageWarningNoLine{scrletter%
- }{%
- Letter option file `\LOPNP at option.lco'\MessageBreak
- needs paper size `\LOPNP at size'.\MessageBreak
- Current paper size is not `\LOPNP at size'!\MessageBreak
- \scr at ifundefinedorrelax{KOMAClassName}{%
- You should load package `typearea' either\MessageBreak
- with option `paper=\LOPNP at size,paper=portrait' or
- additionally\MessageBreak
- }{%
- You should add `paper=\LOPNP at size,paper=portrait' at the\MessageBreak
- option list of `\string\documentclass' or\MessageBreak
+%<class> \ClassWarningNoLine{scrlttr2}%
+%<package> \PackageWarningNoLine{scrletter}%
+ {%
+ Letter option file `\LOPNP at option.lco'\MessageBreak
+ needs paper size `\LOPNP at size'.\MessageBreak
+ Current paper size is not `\LOPNP at size'!\MessageBreak
+ \scr at ifundefinedorrelax{KOMAClassName}{%
+ You should load package `typearea' either\MessageBreak
+ with option `paper=\LOPNP at size,paper=portrait' or
+ additionally\MessageBreak
+ }{%
+ You should add `paper=\LOPNP at size,paper=portrait' at the\MessageBreak
+ option list of `\string\documentclass' or\MessageBreak
+ }%
+ add `\string\KOMAoptions{paper=\LOPNP at size,paper=portrait}'\MessageBreak
+ before starting this letter!\MessageBreak
+ Maybe you know what you are doing,\MessageBreak
+ so I do not change this myself%
}%
- add `\string\KOMAoptions{paper=\LOPNP at size,paper=portrait}'\MessageBreak
- before starting this letter!\MessageBreak
- Maybe you know what you are doing,\MessageBreak
- so I do not change this myself}%
\fi
- }
+}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -687,17 +705,18 @@
%</5008>
%<KOMAold>\setplength{firstfootvpos}{\paperheight}
%<KOMAold>\addtoplength{firstfootvpos}{-2cm}
-%<!KOMAold&!NF>\ifnum \scr at compatibility >\@nameuse{scr at v@2.9t}\relax
-%<!KOMAold&!NF> \setplength{firstfootvpos}{\paperheight}
-%<!KOMAold&!NF> \addtoplength{firstfootvpos}{-16mm}
-%<!KOMAold&!NF>\else
-%<!KOMAold&!NF> \setplength{firstfootvpos}{1in}
-%<!KOMAold&!NF> \addtoplength{firstfootvpos}{\topmargin}
-%<!KOMAold&!NF> \addtoplength{firstfootvpos}{\headheight}
-%<!KOMAold&!NF> \addtoplength{firstfootvpos}{\headsep}
-%<!KOMAold&!NF> \addtoplength{firstfootvpos}{\textheight}
-%<!KOMAold&!NF> \addtoplength{firstfootvpos}{\footskip}
-%<!KOMAold&!NF>\fi
+%<!KOMAold&!NF>\setplength{firstfootvpos}{\paperheight}
+%<!KOMAold&!NF>\addtoplength{firstfootvpos}{-16mm}
+%<!KOMAold&!NF>\scr at ifundefinedorrelax{scr at v@is at le}{}{%
+%<!KOMAold&!NF> \expandafter\ifnum \scr at v@is at le{2.9t}\relax\else
+%<!KOMAold&!NF> \setplength{firstfootvpos}{1in}%
+%<!KOMAold&!NF> \addtoplength{firstfootvpos}{\topmargin}%
+%<!KOMAold&!NF> \addtoplength{firstfootvpos}{\headheight}%
+%<!KOMAold&!NF> \addtoplength{firstfootvpos}{\headsep}%
+%<!KOMAold&!NF> \addtoplength{firstfootvpos}{\textheight}%
+%<!KOMAold&!NF> \addtoplength{firstfootvpos}{\footskip}%
+%<!KOMAold&!NF> \fi
+%<!KOMAold&!NF>}%
%<NF>\setplength{firstfootvpos}{266.679mm}
% \end{macrocode}
% \end{pseudolength}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsandtabulars.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsandtabulars.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsandtabulars.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-listsandtabulars.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 4021 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-listsandtabulars.dtx}%
@@ -377,10 +377,10 @@
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m at ne
}%
- \expandafter\ifnum\scr at v@is at ge{3.22}%
+%<!v4> \expandafter\ifnum\scr at v@is at ge{3.22}%
\setlength{\topsep}{\@tempskipa}%
\setlength{\partopsep}{\@tempskipb}%
- \fi
+%<!v4> \fi
\item\is at thispageodd@setlabel\nobreak\ignorespaces
}
%<*class>
@@ -399,11 +399,12 @@
% \KOMAScript{} before the design of font elements.
% \begin{macro}{\descfont}
% \changes{v3.20}{2016/01/29}{\cs{sffamily} replaced by \cs{@gr at gsffamily}}
+% \changes{v3.39}{2023/04/04}{\cs{@gr at gsfamily} replaced by \cs{maybesffamily}}
% The font of the item labels of \env{description}. The command \cs{descfont}
% should not be used by users. Think of it as an internal macro. The user
% space name is because of compatibility to very old \KOMAScript{} versions.
% \begin{macrocode}
-\newcommand*\descfont{\@gr at gsffamily\bfseries}
+\newcommand*\descfont{\maybesffamily\bfseries}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\scr at fnt@descriptionlabel}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
%<body>%%% (run: body)
@@ -26,9 +26,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-17 18:26:06 +0200 (Fr, 17. Jun 2022) $
+ \filedate$Date: 2022-11-16 08:20:20 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3892 $
+ \filerevision$Revision: 3995 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-listsof.dtx}%
@@ -328,6 +328,8 @@
% \changes{v3.12a}{2014/01/17}{\cs{KOMAExecuteOptions} replaced by
% \cs{KOMAoptions}}
% \changes{v3.18}{2015/06/15}{value \opt{\quotechar=indexnumbered} added}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% The main features of the table of contents can be configured by this
% option.
% \begin{macrocode}
@@ -486,24 +488,24 @@
\or % bibliographynumbered
\KOMAoptions{bibliography=totocnumbered}%
\or % flat
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{flat}%
\@toclefttrue
\or % graduated
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{graduated}%
\@tocleftfalse
\or % indenttextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{indenttextentries}%
\expandafter\setuptoc\expandafter{\ext at toc}{numberline}%
\or % leftaligntextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{leftaligntextentries}%
\expandafter\unsettoc\expandafter{\ext at toc}{numberline}%
\or % chapterentrywithdots/sectionentrywithdots
%<book|report> \KOMAoptions{chapterentrydots=true}%
@@ -522,11 +524,12 @@
% \changes{v2.8q}{2001/11/14}{added}
% \changes{v2.98c}{2008/03/05}{obsolet}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-%<*option>
+%<*option&!v4>
\KOMA at DeclareDeprecatedOption{tocleft}{toc=flat}
\KOMA at DeclareDeprecatedOption{tocindent}{toc=graduated}
-%</option>
+%</option&!v4>
% \end{macrocode}
% \end{option}^^A tocleft,tocindent
%
@@ -703,6 +706,8 @@
% \cs{KOMAExecuteOptions}}
% \changes{v3.12a}{2014/01/17}{\cs{KOMAExecuteOptions} replaced by
% \cs{KOMAoptions}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% The main features of the lists of floats can be configured by this option.
% \begin{macrocode}
%<*option>
@@ -822,14 +827,14 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax % notoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{notoc}%
\renewcommand*{\float@@listhead}{%
%<article> \section*
%<report|book> \chapter*
@@ -843,14 +848,14 @@
\unsettoc{\@currext}{totoc}%
}%
\or% totoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{totoc}%
\renewcommand*{\float@@listhead}{%
%<article> \addsec
%<report|book> \addchap
@@ -864,14 +869,14 @@
\setuptoc{\@currext}{totoc}%
}%
\or% numbered
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{numbered}%
\renewcommand*{\float@@listhead}{%
%<article> \section
%<report|book> \chapter
@@ -885,18 +890,18 @@
\setuptoc{\@currext}{totoc}%
}%
\or% flat
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{flat}%
\@dynlisttrue
\or% graduated
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{graduated}%
\@dynlistfalse
\or% leveldown
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{leveldown}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
@@ -904,8 +909,8 @@
\setuptoc{\@currext}{leveldown}%
}%
\or% standardlevel
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leveldown}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{standardlevel}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{leveldown}%
}%
@@ -913,7 +918,7 @@
\unsettoc{\@currext}{leveldown}%
}%
\or% entryprefix
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{entryprefix}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{entryprefix}%
\@dynlisttrue
\doforeachtocfile[float]{%
\BeforeStartingTOC[\@currext]{%
@@ -934,9 +939,9 @@
}%
}%
\or% indenttextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{indenttextentries}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{numberline}%
}%
@@ -944,9 +949,9 @@
\setuptoc{\@currext}{numberline}%
}
\or% leftaligntextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{numberline}%
}%
@@ -966,10 +971,10 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{toc}{nolistof}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{notoc}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{graduated}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}
+\KOMA at kav@add{\KOMAClassFileName}{toc}{nolistof}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{notoc}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{graduated}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}
%</option>
% \end{macrocode}
% \end{option}^^A listof
@@ -982,10 +987,11 @@
% \cs{float at listhead}}
% \changes{v2.98c}{2008/03/05}{obsolet}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-%<*option>
+%<*option&!v4>
\KOMA at DeclareDeprecatedOption{liststotoc}{listof=totoc}
-%</option>
+%</option&!v4>
% \end{macrocode}
% \end{option}^^A liststotoc
%
@@ -994,10 +1000,11 @@
% \changes{v2.9p}{2003/07/07}{number also in the running head}
% \changes{v2.98c}{2008/03/05}{obsolet}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-%<*option>
+%<*option&!v4>
\KOMA at DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
-%</option>
+%</option&!v4>
% \end{macrocode}
% \end{option}^^A liststotocnumbered
%
@@ -1006,11 +1013,12 @@
% \changes{v2.8q}{2001/11/14}{added}
% \changes{v2.98c}{2008/03/05}{obsolet}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-%<*option>
+%<*option&!v4>
\KOMA at DeclareDeprecatedOption{listsleft}{listof=flat}
\KOMA at DeclareDeprecatedOption{listsindent}{listof=graduated}
-%</option>
+%</option&!v4>
% \end{macrocode}
% \end{option}^^A listsleft,listsindent
%
@@ -1020,6 +1028,8 @@
% \changes{v3.12a}{2014/01/17}{missing \cs{FamilyKeyStateProcessed} added}
% \changes{v3.17}{2015/03/12}{internal value storage}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@chaptertolistsfalse,\@chaptertoliststrue,\if at chaptertolists}
% \changes{v2.96a}{2006/12/03}{added}
% \changes{v3.12}{2013/09/24}{don't add lists to lists}
@@ -1033,10 +1043,10 @@
\newif\if at chaptertolists\@chaptertolistsfalse
\KOMA at key{chapteratlists}[entry]{%
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chapterentry}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chaptergap}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chaptergapsmall}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chaptergapline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chapterentry}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chaptergap}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chaptergapsmall}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chaptergapline}%
% \end{macrocode}
% \begin{description}
% \item[\opt{=entry}:] add the chapter heading also to the lists of
@@ -1046,8 +1056,8 @@
% \begin{macrocode}
\Ifstr{#1}{entry}{%
\@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}%
- \KOMA at kav@replacevalue{.\KOMAClassFileName}{chapteratlists}{entry}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chapterentry}%
+ \KOMA at kav@replacevalue{\KOMAClassFileName}{chapteratlists}{entry}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chapterentry}%
}{%
% \end{macrocode}
% \begin{description}
@@ -1055,19 +1065,19 @@
% \end{description}
% \begin{macrocode}
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
- \KOMA at kav@replacevalue{.\KOMAClassFileName}{chapteratlists}%
+ \KOMA at kav@replacevalue{\KOMAClassFileName}{chapteratlists}%
{\@chapterlistsgap}%
\def\reserved at a{\z@}%
\ifx\@chapterlistsgap\reserved at a
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergap}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergap}%
\else
\def\reserved at a{10\p@}%
\ifx\@chapterlistsgap\reserved at a
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergapsmall}%
\else
\def\reserved at a{\baselineskip}%
\ifx\@chapterlistsgap\reserved at a
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergapline}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergapline}%
\fi
\fi
\fi
@@ -1074,8 +1084,8 @@
}%
}
\BeforeTOCHead{\@chaptertolistsfalse}
-\KOMA at kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
+\KOMA at kav@add{\KOMAClassFileName}{chapteratlists}{10\p@}%
+\KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergapsmall}%
%</option&(book|report)>
% \end{macrocode}
% \end{macro}^^A \@chapterlistgap
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-miscellaneous.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%<init>%%% (run: init)
%<option>%%% (run: option)
%<execoption>%%% (run: execoption)
@@ -27,9 +27,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 4021 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-miscellaneous.dtx}%
@@ -153,6 +153,8 @@
% \changes{v3.17}{2015/03/12}{using internal value storage}
% \changes{v3.25}{2017/11/21}{respect option \opt{overfullrule}}
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyState}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{option}{final}
% \changes{v2.95}{2002/12/05}{obsolete}
% \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} replaced by
@@ -169,21 +171,21 @@
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{overfullrule}{@tempswa}%
@@ -191,9 +193,9 @@
\fi
\fi
}
-%<class>\KOMA at kav@add{.\KOMAClassFileName}{draft}{false}
+%<class>\KOMA at kav@add{\KOMAClassFileName}{draft}{false}
%<*package&extend>
-\KOMA at kav@xadd{.scrextend.\scr at pkgextension}{draft}{%
+\KOMA at kav@xadd{scrextend.\scr at pkgextension}{draft}{%
\ifdim\overfullrule>\z@ true\else false\fi
}
%</package&extend>
@@ -203,6 +205,8 @@
% \end{macrocode}
% \begin{option}{overfullrule}
% \changes{v3.25}{2017/11/21}{added}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% Because option \opt{draft} can result in unwanted effects I've added a
% new option to explicite only change the overfull rule setting. However for
% \textsf{scrextend} and the \KOMAScript{} classes the result is the same.
@@ -211,21 +215,21 @@
\KOMA at set@ifkey{overfullrule}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{overfullrule}{@tempswa}%
@@ -233,9 +237,9 @@
\fi
\fi
}
-%<class>\KOMA at kav@add{.\KOMAClassFileName}{overfullrule}{false}
+%<class>\KOMA at kav@add{\KOMAClassFileName}{overfullrule}{false}
%<*package&extend>
-\KOMA at kav@xadd{.scrextend.\scr at pkgextension}{overfullrule}{%
+\KOMA at kav@xadd{scrextend.\scr at pkgextension}{overfullrule}{%
\ifdim\overfullrule>\z@ true\else false\fi
}
%</package&extend>
@@ -291,12 +295,12 @@
\@addtoreset{equation}{chapter}
\renewcommand*{\theequation}{%
%<*book>
- \expandafter\ifnum\scr at v@is at gt{2.97d}%
+%<!v4> \expandafter\ifnum\scr at v@is at gt{2.97d}%
\if at mainmatter\thechapter.\fi
- \else
+%<!v4> \else
%</book>
- \thechapter.%
-%<book> \fi
+%<!v4> \thechapter.%
+%<book&!v4> \fi
\@arabic\c at equation
}
@@ -305,41 +309,7 @@
% \end{command}^^A \theequation
% \end{counter}^^A equation
%
-% \section{Implementation of Special Handling of Sans-Serif Defaults}
%
-% TeX.SX user \texttt{egreg} has stated in comment
-% \url{https://tex.stackexchange.com/questions/289853}, that he does not use
-% \KOMAScript{} because of the sans-serif defaults for headings. He like the
-% ugly, bold fat Antiqua more. Moreover, he is not satisfied in being able to
-% change the default using \cs{setkomafont}. So the \KOMAScript{} author has
-% defined an option to do the change of all sans-serif defaults at once. As a
-% joke the name of this options not only references \texttt{egreg} but is
-% cumbersome long.
-% \begin{description}
-% \item[ToDo:] Should we move this option to \file{scrkernel-fonts.dtx}?
-% \item[ToDo:] Should we add a more handy and serious option like
-% \opt{nosfdefaults}?
-% \end{description}
-%
-% \begin{option}{egegdoesnotlikesansseriftitles}
-% \changes{v3.20}{2016/01/29}{added}
-% \changes{v3.20a}{2016/05/19}{also for \cls*{scrlttr2}}
-% \begin{macro}{\@gr at gsffamily}
-% \changes{v3.20}{2016/01/29}{added}
-% \changes{v3.20a}{2016/05/19}{also for \cls*{scrlttr2}}
-% Used to switch on or off all the sans-serif defaults.
-% \begin{macrocode}
-%<*!(package&letter)&option>
-\KOMA at ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
-\newcommand*{\@gr at gsffamily}{%
- \if at egregdoesnotlikesansseriftitles\else\sffamily\fi
-}
-%</!(package&letter)&option>
-% \end{macrocode}
-% \end{macro}^^A \@gr at gsffamily
-% \end{option}^^A egregdoesnotlikesansseriftitles
-%
-%
% \section{Implementation of the Execution and Processing of Options}
%
% After the definition of all options, some defaults have to be executed and
@@ -424,6 +394,7 @@
% \begin{fontelement}{dictum}
% \changes{v2.8q}{2001/20/04}{added}
% \changes{v3.20}{2016/01/29}{\cs{sffamily} replaced by \cs{@gr at gsffamily}}
+% \changes{v3.39}{2023/04/04}{\cs{@gr at gsfamily} replaced by \cs{maybesffamily}}
% \begin{fontelement}{dictumtext,dictumauthor}
% \changes{v2.8q}{2001/20/04}{added}
% \begin{command}{\dictumauthorformat}
@@ -453,7 +424,7 @@
\newcommand*{\dictumauthorformat}[1]{(#1)}
\newcommand*{\raggeddictumtext}{\raggedright}
\newcommand*{\raggeddictumauthor}{\raggedleft}
-\newkomafont{dictum}{\normalfont\normalcolor\@gr at gsffamily\small}
+\newkomafont{dictum}{\normalfont\normalcolor\maybesffamily\small}
\newkomafont{dictumauthor}{\itshape}
\aliaskomafont{dictumtext}{dictum}
%</!letter&body>
@@ -649,6 +620,7 @@
% \changes{v2.8q}{2001/11/27}{missing brace added}
% \changes{v3.36}{2022/02/22}{moved from \file{scrkernel-floats.dtx} to
% \file{scrkernel-miscellaneaous.dtx}}
+% \changes{v3.39}{2022/12/21}{braces fixed}
% A very often wanted margin note feature is, to print all such notes in the
% left margin ragged-left and all such notes in the right margin
% ragged-right. So this is a simple shortcut for \cs{marginpar} with using
@@ -656,7 +628,7 @@
% \begin{macrocode}
%<*(class|extend)&body>
\newcommand\marginline[1]{%
- \marginpar[\raggedleft{#1}]{\raggedright #1}%
+ \marginpar[{\raggedleft #1}]{\raggedright #1}%
}
%</(class|extend)&body>
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-notepaper.dtx
-% Copyright (c) Markus Kohm, 2006-2022
+% Copyright (c) Markus Kohm, 2006-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z 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: 2022-06-20 12:37:02 +0200 (Mo, 20. Jun 2022) $
+ \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3895 $
+ \filerevision$Revision: 4021 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-notepaper.dtx}
@@ -106,6 +106,8 @@
% \changes{v2.8q}{2002/01/25}{added}
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyState}}
% \changes{v3.17}{2015/03/16}{using internal value storage}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@alignfrom}
% \changes{v2.8q}{2002/01/25}{added}
% \changes{v2.97e}{2007/11/13}{new values added}
@@ -136,7 +138,7 @@
{no}{10000},{false}{10000},{off}{10000}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{fromalign}{#1}%
@@ -143,7 +145,7 @@
\ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{fromalign}{left}
@@ -172,7 +174,7 @@
{false}{0},{no}{0},{off}{0},{aftername}{1},%
{below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}%
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{fromrule}{false}
@@ -297,7 +299,7 @@
{ppimage}{4},{ppImage}{4},%
{topaligned}{5},{alignedtop}{5}%
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{addrfield}{true}
@@ -338,7 +340,7 @@
{priority}{2},{Priority}{2},{PRIORITY}{2},%
{A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}%
}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{priority}{false}
@@ -350,6 +352,8 @@
% \changes{v2.8q}{2002/01/22}{added}
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyState}}
% \changes{v3.17}{3015/03/16}{using internal value storage}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@baddrfalse,\@baddrtrue,\if at baddr}
% \begin{macro}{\backaddr at format}
% \changes{v2.96}{2006/07/31}{added}
@@ -407,18 +411,18 @@
\fi
\if at baddr
\ifx\backaddr at format\underline
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{backaddress}{underlined}%
\else
\ifx\backaddr at format\@firstofone
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{backaddress}{plain}%
\else
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{backaddress}{true}%
@@ -425,7 +429,7 @@
\fi
\fi
\else
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{backaddress}{false}%
@@ -445,6 +449,8 @@
% \changes{v2.97c}{2007/03/30}{inverted meaning fixed}
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyState}}
% \changes{v3.17}{2015/03/16}{using internal value storage}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@biglocfalse,\@bigloctrue,\if at bigloc}
% We allow two different automatic settings for the location field right
% beside the addressee's address field:
@@ -467,7 +473,7 @@
\ifcase\@tempa
\endgroup
\@bigloctrue
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{locfield}{wide}%
@@ -474,7 +480,7 @@
\else
\endgroup
\@biglocfalse
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{locfield}{narrow}%
@@ -484,7 +490,7 @@
\FamilyKeyStateUnknownValue
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{locfield}{narrow}
@@ -491,10 +497,13 @@
% \end{macrocode}
% \begin{option}{wlocfield,slocfield}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
+%<*!v4>
\KOMA at DeclareDeprecatedOption{wlocfield}{locfield=wide}
\KOMA at DeclareDeprecatedOption{slocfield}{locfield=narrow}
-%</option>
+%</!v4>
+%</option>
% \end{macrocode}
% \end{option}^^A wlocfield,slocfield
% \end{macro}^^A \if at bigloc
@@ -511,6 +520,8 @@
% instead of \cs{KOMA at unkown@keyval}}
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyState}}
% \changes{v3.17}{2015/03/16}{using internal value storage}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@foldfalse,\@foldtrue,\if at fold}
% \begin{macro}{\@usefolds}
% \changes{v2.97e}{2007/11/08}{added}
@@ -627,21 +638,21 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{foldmarks}{\@usefolds}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{foldmarks}{\if at fold true\else false\fi}%
\fi
}
-\KOMA at kav@xadd{.%
+\KOMA at kav@xadd{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{foldmarks}{\@usefolds}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{foldmarks}{true}%
@@ -676,6 +687,8 @@
% \changes{v3.09}{2011/03/07}{values \opt{\quotechar=dateleft},
% \opt{\quotechar=dateright}, \opt{\quotechar=nodate} added}
% \changes{v3.27}{2019/05/03}{new value \opt{\quotechar=false} added}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@refwidefalse,\@refwidetrue,\if at refwide}
% \changes{v2.8n}{2001/09/08}{added}
% \begin{macro}{\@datepos}
@@ -722,17 +735,17 @@
\@refwidetrue
%<*package>
\@reflinetrue
- \KOMA at kav@remove{.scrletter.\scr at pkgextension}{refline}{false}%
+ \KOMA at kav@remove{scrletter.\scr at pkgextension}{refline}{false}%
%</package>
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{wide}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{narrow}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{wide}%
@@ -741,17 +754,17 @@
\@refwidefalse
%<*package>
\@reflinetrue
- \KOMA at kav@remove{.scrletter.\scr at pkgextension}{refline}{false}%
+ \KOMA at kav@remove{scrletter.\scr at pkgextension}{refline}{false}%
%</package>
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{wide}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{narrow}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{narrow}%
@@ -758,19 +771,19 @@
\or% dateleft
\endgroup
\def\@datepos{2}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{dateleft}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{dateright}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{nodate}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{dateleft}%
@@ -777,19 +790,19 @@
\or% dateright
\endgroup
\def\@datepos{1}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{dateleft}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{dateright}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{nodate}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{dateright}%
@@ -796,19 +809,19 @@
\or% nodate
\endgroup
\def\@datepos{0}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{dateleft}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{dateright}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{nodate}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{nodate}%
@@ -816,9 +829,9 @@
\or% false
\endgroup
\@reflinefalse
- \KOMA at kav@remove{.scrletter.\scr at pkgextension}{refline}{wide}%
- \KOMA at kav@remove{.scrletter.\scr at pkgextension}{reline}{narrow}%
- \KOMA at kav@add{.scrletter.\scr at pkgextension}{refline}{false}%
+ \KOMA at kav@remove{scrletter.\scr at pkgextension}{refline}{wide}%
+ \KOMA at kav@remove{scrletter.\scr at pkgextension}{reline}{narrow}%
+ \KOMA at kav@add{scrletter.\scr at pkgextension}{refline}{false}%
%</package>
\fi
\else
@@ -826,11 +839,11 @@
\FamilyKeyStateUnknownValue
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{dateright}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{refline}{narrow}%
@@ -920,34 +933,34 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{subject}{\if at subj titled\else untitled\fi}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{subject}{\if at subjafter after\else before\fi opening}%
\ifx\subject at format\underline
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{subject}{underlined}%
\fi
\ifx\raggedsubject\raggedright
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{subject}{left}%
\else
\ifx\raggedsubject\raggedleft
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{subject}{right}%
\else
\ifx\raggedsubject\centering
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{subject}{centered}%
@@ -956,11 +969,11 @@
\fi
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{subject}{untitled}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{subject}{beforeopening}%
@@ -1014,6 +1027,8 @@
% \begin{option}{pagenumber}
% \changes{v2.8q}{2002/01/31}{added}
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyState}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@pageat}
% \changes{v2.8q}{2002/01/31}{added}
% This is irrelevant for the notepaper but selects the position of the page
@@ -1080,7 +1095,7 @@
\def\@tempa{\endgroup\FamilyKeyStateUnknownValue}%
\fi
\@tempa
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{pagenumber}{%
@@ -1101,7 +1116,7 @@
\fi
}%
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{pagenumber}{botmiddle}
@@ -1150,11 +1165,13 @@
% \begin{macro}{\scr at firsthead@postsetvar}
% \changes{v3.08}{2010/10/28}{added}
% \changes{v3.17}{2015/03/16}{internal setting of {fromalign\quotechar=false}}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of
+% \cs{KOMAExecuteOptions} removed}
% After setting the variable \opt{fromalign} has to be set to manual
% alignment. But this must not be done for the initialization.
% \begin{macrocode}
\newcommand*{\scr at firsthead@postsetvar}{%
- \KOMAExecuteOptions[.%
+ \KOMAExecuteOptions[%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
]{fromalign=no}%
@@ -1354,10 +1371,12 @@
%
% \begin{command}{\firsthead}
% \changes{v3.08}{2010/10/28}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macro}{\@firsthead}
% \changes{v3.08}{2010/10/28}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-%<*class>
+%<*class&!v4>
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firsthead.\MessageBreak
@@ -1374,7 +1393,7 @@
}
\setkomavar{firsthead}%
}
-%</class>
+%</class&!v4>
%</body>
% \end{macrocode}
% \end{macro}
@@ -1418,11 +1437,12 @@
%
% \begin{fontelement}{backaddress}
% \changes{v2.95}{2006/03/23}{using \cs{newkomafont}}
-% \changes{v3.21}{2016/05/19}{provides option
+% \changes{v3.21}{2016/05/19}{support of option
% \opt{egregdoesnotlikesansseriftitles}}
+% \changes{v3.39}{2023/04/04}{using \cs{maybesffamily}}
% The font of the return address.
% \begin{macrocode}
-\newkomafont{backaddress}{\@gr at gsffamily}
+\newkomafont{backaddress}{\maybesffamily}
% \end{macrocode}
% \end{fontelement}
%
@@ -1437,8 +1457,7 @@
% \begin{fontelement}{priority}
% \changes{v3.03}{2009/03/04}{added}
% The font of the priority note of priority A or B. Here we don't use any lead
-% and sans-serif is a must, so \opt{egregdoesnotlikesansseriftitles} is ignored.
-% \texttt{egregdoesnotlikesansseriftitles} ignorieren.
+% and sans-serif is a must, so \opt{sfdefaults} is ignored.
% \begin{macrocode}
\newkomafont{priority}{\fontsize{10pt}{10pt}\sffamily\bfseries}
% \end{macrocode}
@@ -1459,7 +1478,7 @@
% \begin{fontelement}{PPlogo}
% \changes{v3.03}{2009/03/04}{added}
% The font of the ``\texttt{P.P.}'' logo, with \opt{addrfield=PP}. Once again
-% sans-serif is a must, so \opt{egregdoesnotlikesansseriftitles} is ignored.
+% sans-serif is a must, so option \opt{sfdefaults} is ignored.
% \begin{macrocode}
\newkomafont{PPlogo}{\sffamily\bfseries}
% \end{macrocode}
@@ -1468,7 +1487,7 @@
% \begin{fontelement}{PPdata}
% \changes{v3.03}{2009/03/04}{added}
% The font to be used inside the PP head. Once again sans-serif is a must, so
-% \opt{egregdoesnotlikesansseriftitles} is ignored.
+% option \opt{sfdefaults} is ignored.
% \begin{macrocode}
\newkomafont{PPdata}{\sffamily}
% \end{macrocode}
@@ -1503,9 +1522,10 @@
% \begin{fontelement}{refname}
% \changes{v2.97c}{2007/05/14}{added}
% \changes{v3.21}{2016/05/19}{support of \opt{egregdoesnotlikesansseriftitles}}
+% \changes{v3.39}{2023/04/04}{usage of \cs{maybesffamily}}
% The font for the field names of the reference line.
% \begin{macrocode}
-\newkomafont{refname}{\@gr at gsffamily\scriptsize}
+\newkomafont{refname}{\maybesffamily\scriptsize}
% \end{macrocode}
% \end{fontelement}
%
@@ -1512,15 +1532,16 @@
% \begin{fontelement}{refvalue}
% \changes{v2.97c}{2007/05/14}{added}
% \changes{v2.97d}{2007/10/09}{initial value changed}
+% \changes{v3.39}{2022/10/25}{using \cs{scr at v@is at eq}}
% The font of the field values of the reference line.
-% Support for \opt{egregdoesnotlikesansseriftitles} is not needed on
+% Support for option \opt{sfdefaults} is not needed on
% compatibility mode, because the option did not exist in version 2.97.
% \begin{macrocode}
-%<*class>
-\ifnum\scr at compatibility=\@nameuse{scr at v@2.97}\relax
+%<*class&!v4>
+\expandafter\ifnum\scr at v@is at eq{2.97}%
\newkomafont{refvalue}{\sffamily\scriptsize}
\else
-%</class>
+%</class&!v4>
\newkomafont{refvalue}{}
%<class>\fi
% \end{macrocode}
@@ -1537,10 +1558,11 @@
%
% \begin{fontelement}{lettertitle}
% \changes{v3.17}{2015/02/21}{replacement of \fnt{letter}}
-% \changes{v3.21}{2016/05/19}{support for \opt{egregdoesnotlikesansseriftitles}}
+% \changes{v3.21}{2016/05/19}{support of \opt{egregdoesnotlikesansseriftitles}}
+% \changes{v3.39}{2023/04/04}{usage of \cs{maybesffamily}}
% The font of the title of the letter.
% \begin{macrocode}
-\newkomafont{lettertitle}{\normalcolor\@gr at gsffamily\bfseries}
+\newkomafont{lettertitle}{\normalcolor\maybesffamily\bfseries}
% \end{macrocode}
% \begin{fontelement}{title}
% \changes{v2.95}{2006/03/23}{using \cs{newkomafont}}
@@ -1897,10 +1919,12 @@
% \end{macrocode}
% \begin{command}{\firstfoot}
% \changes{v3.08}{2010/10/28}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macro}{\@firstfoot}
% \changes{v3.08}{2010/10/28}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-%<*class>
+%<*class&!v4>
\newcommand*{\@firstfoot}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firstfoot.\MessageBreak
@@ -1917,7 +1941,7 @@
}
\setkomavar{firstfoot}%
}
-%</class>
+%</class&!v4>
%</body>
% \end{macrocode}
% \end{macro}^^A \@firstfoot
@@ -4028,10 +4052,12 @@
% \end{variable}
% \begin{command}{\nexthead}
% \changes{v3.08}{2010/10/28}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macro}{\@nexthead}
% \changes{v3.08}{2010/10/28}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-%<*class>
+%<*class&!v4>
\newcommand{\nexthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\nexthead.\MessageBreak
@@ -4048,7 +4074,7 @@
}%
\usekomavar{nexthead}%
}
-%</class>
+%</class&!v4>
%</body>
% \end{macrocode}
% \end{macro}^^A \@nexthead
@@ -4076,10 +4102,12 @@
% \end{variable}
% \begin{command}{\nextfoot}
% \changes{v3.08}{2010/10/28}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macro}{\@nextfoot}
% \changes{v3.08}{2010/10/28}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-%<*class>
+%<*class&!v4>
\newcommand{\nextfoot}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\nextfoot.\MessageBreak
@@ -4096,7 +4124,7 @@
}%
\usekomavar{nextfoot}%
}
-%</class>
+%</class&!v4>
%</body>
% \end{macrocode}
% \end{macro}^^A \@nextfoot
@@ -4727,6 +4755,8 @@
% \changes{v3.27}{2019/03/21}{new values \opt{\quotechar=fontawesome} and
% \opt{\quotechar=marvosym} added}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@scrsymbolsfalse,\@scrsymbolstrue,\if at scrsymbols}
% For some of the variable the print name can be a symbol instead of a name.
% \begin{macrocode}
@@ -4751,7 +4781,7 @@
\fi
\fi
\ifx \FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{symbolicnames}{#1}%
@@ -4821,7 +4851,7 @@
\fi
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<class> \KOMAClassFileName
%<package> scrletter.\scr at pkgextension
}{symbolicnames}{false}%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-16 08:24:11 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3997 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-pagestyles.dtx}%
@@ -91,6 +91,8 @@
% \changes{v3.18a}{2015/07/08}{arguments of \cs{PassOptionsToPackage} fixed
% again}
% \changes{v3.20}{2015/12/12}{don't pass option to \pkg*{typearea}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@hslfalse,\@hsltrue,\if at hsl}
% Optional separation line between page head and text area---in other words:
% below the page head.
@@ -97,14 +99,15 @@
% \begin{macrocode}
%<*option>
\KOMA at ifkey{headsepline}{@hsl}%
-\KOMA at kav@add{.\KOMAClassFileName}{headsepline}{false}
+\KOMA at kav@add{\KOMAClassFileName}{headsepline}{false}
% \end{macrocode}
% \begin{option}{headnosepline}
% \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} replaced by
% \cs{PackageInfoNoLine}}
-% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-\KOMA at DeclareDeprecatedOption{headnosepline}{headsepline=false}
+%<!v4>\KOMA at DeclareDeprecatedOption{headnosepline}{headsepline=false}
% \end{macrocode}
% \end{option}^^A headnosepline
% \end{macro}^^A \if at hsl
@@ -129,19 +132,22 @@
% \changes{v3.18a}{2015/07/08}{arguments of \cs{PassOptionsToPackage} fixed
% again}
% \changes{v3.20}{2015/12/12}{don't pass option to \pkg*{typearea}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@fslfalse,\@fsltrue,\if at fsl}
% Optional separation line between text area and page footer---in other words:
% above the page footer.
% \begin{macrocode}
\KOMA at ifkey{footsepline}{@fsl}%
-\KOMA at kav@add{.\KOMAClassFileName}{footsepline}{false}
+\KOMA at kav@add{\KOMAClassFileName}{footsepline}{false}
% \end{macrocode}
% \begin{option}{footnosepline}
% \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} replaced by
% \cs{PackageInfoNoLine}}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-\KOMA at DeclareDeprecatedOption{footnosepline}{footsepline=false}
+%<!v4>\KOMA at DeclareDeprecatedOption{footnosepline}{footsepline=false}
%</option>
% \end{macrocode}
% \end{option}^^A footnosepline
@@ -580,6 +586,9 @@
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyState}}
% \changes{v3.17}{2015/03/10}{using value storage}
% \changes{v3.37}{2022/05/10}{guard for \pkg*{scrextend} fixed}
+% \changes{v3.39}{2022/10/25}{using \cs{scr at v@is at gt}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{command}{\cleardoublestandardpage}
% \changes{v2.8a}{2001/06/18}{added}
% \changes{v2.96a}{2007/01/02}{default value added}
@@ -640,7 +649,7 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<package&extend> scrextend.\scr at pkgextension
%<class> \KOMAClassFileName
}{cleardoublepage}{current}%
@@ -652,7 +661,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
%<package&extend> scrextend.\scr at pkgextension
%<class> \KOMAClassFileName
}{cleardoublepage}{#1}%
@@ -675,7 +684,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}%
{cleardoublepage}{#1}%
}%
}{}%
@@ -704,17 +713,19 @@
\newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}}
\newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}
\renewcommand*{\cleardoublepage}{%
- \expandafter\ifnum \@nameuse{scr at v@2.98c}<\scr at compatibility\relax
+%<!v4> \expandafter\ifnum \scr at v@is at gt{2.98c}%
\cleardoubleemptypage
- \else
- \cleardoublestandardpage
- \fi
+%<!v4> \else
+%<!v4> \cleardoublestandardpage
+%<!v4> \fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
%<package&extend> scrextend.\scr at pkgextension
%<class> \KOMAClassFileName
}{cleardoublepage}{%
- \expandafter\ifnum \scr at v@is at gt{2.98c}empty\else current\fi
+%<!v4> \expandafter\ifnum \scr at v@is at gt{2.98c}
+ empty%
+%<!v4> \else current\fi
}
% \end{macrocode}
% We expand the value at the end of the class or package.
@@ -726,11 +737,11 @@
%<package&extend> scrextend.\scr at pkgextension
%<class> \KOMAClassFileName
}{cleardoublepage}%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
%<package&extend> scrextend.\scr at pkgextension
%<class> \KOMAClassFileName
}{cleardoublepage}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
%<package&extend> scrextend.\scr at pkgextension
%<class> \KOMAClassFileName
}{cleardoublepage}{\@tempa}%
@@ -759,12 +770,13 @@
% \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} replaced by
% \cs{PackageInfoNoLine}}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-%<*class>
+%<*class&!v4>
\KOMA at DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA at DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA at DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%</class>
+%</class&!v4>
%</(class|extend)&option>
% \end{macrocode}
% \end{option}^^A cleardoublestandard,cleardoubleplain,cleardoubleempty
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-paragraphs.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-16 08:25:23 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3998 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-paragraphs.dtx}%
@@ -89,6 +89,8 @@
% \changes{v3.17}{2015/03/10}{support for internal option value storage}
% \changes{v3.19}{2015/07/29}{\cs{par at update} should not reset itself to
% \cs{default at par@update} in the document preamble}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\f at parindent}
% \changes{v2.95}{2004/11/05}{added}
% \begin{macro}{\f at parskip,\f at parfillskip}
@@ -161,16 +163,16 @@
\if at atdocument\let\par at update\default at par@update\fi
\par at updaterelative
}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{false}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{never}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full-}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full+}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full*}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half-}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half+}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half*}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{false}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{never}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full-}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full+}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full*}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half-}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half+}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half*}%
}
\newcommand*{\f at parindent}{\the\parindent}
\newcommand*{\f at parskip}{\the\parskip}
@@ -276,6 +278,8 @@
% \changes{v3.17}{2015/03/10}{using value storage}
% \changes{v3.25}{2017/09/27}{typo fix in \cs{FamilyKeyStateUnknownValue}}
% \changes{v3.26b}{2019/02/01}{\cs{baselineskip} replaced by 1\cs{baselineskip}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{option}{parindent,parskip-,parskip+,parskip*,
% halfparskip,halfparskip-,halfparskip+,halfparskip*}
% \changes{v2.8i}{2001/07/22}{added}
@@ -283,6 +287,7 @@
% \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} replaced by
% \cs{PackageInfoNoLine}}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% Originally we have had nine options for all the paragraph indent and skip
% settings. Using \pkg*{scrbase} we have only one option with additional
% settings for relative and absolute values and paragraph indent without glue
@@ -310,66 +315,66 @@
\ifcase\number\@tempa% 0
\endgroup
\setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{never}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{never}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
\setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{false}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{false}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 2
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full-}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full-}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half-}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half-}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 4
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 6
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full+}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full+}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half+}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half+}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 8
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full*}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full*}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half*}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half*}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 10
\endgroup
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{relative}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{relative}%
\ifx\par at updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -383,9 +388,9 @@
}%
\or%11
\endgroup
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{relative}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}%
\ifx\par at updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -405,6 +410,7 @@
\FamilyKeyStateUnknownValue
\fi
}
+%<*!v4>
\KOMA at DeclareDeprecatedOption{parskip-}{parskip=full-}
\KOMA at DeclareDeprecatedOption{parskip+}{parskip=full+}
\KOMA at DeclareDeprecatedOption{parskip*}{parskip=full*}
@@ -413,8 +419,9 @@
\KOMA at DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA at DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA at DeclareDeprecatedOption{parindent}{parskip=false}
-\KOMA at kav@add{.\KOMAClassFileName}{parskip}{false}
-\KOMA at kav@add{.\KOMAClassFileName}{parskip}{absolute}
+%</!v4>
+\KOMA at kav@add{\KOMAClassFileName}{parskip}{false}
+\KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}
%</option>
% \end{macrocode}
% \end{option}^^A parindent … halfparskip*
@@ -659,8 +666,12 @@
%</class>
%<*class|clo>
%<*body|10pt|11pt|12pt>
-%<10pt|11pt|12pt>\@ifundefined{@list at extra}{}{%
-%<10pt|11pt|12pt> \expandafter\ifnum\scr at v@is at ge{3.17}\par at updaterelative\fi
+%<*10pt|11pt|12pt>
+\@ifundefined{@list at extra}{}{%
+ \scr at ifundefinedorrelax{scr at v@is at ge}{\par at updaterelative}{%
+ \expandafter\ifnum\scr at v@is at ge{3.17}\par at updaterelative\fi
+ }%
+%</10pt|11pt|12pt>
\l at addto@macro{\@listi}{\@list at extra}%
\let\@listI=\@listi
\l at addto@macro{\@listii}{\@list at extra}%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pseudolengths.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pseudolengths.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pseudolengths.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-pseudolengths.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-09 11:07:16 +0100 (Mi, 09. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3981 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-pseudolengths.dtx}%
@@ -139,9 +139,9 @@
\@ifundefined{ltr at len@#1}{%
\expandafter\let\csname ltr at len@#1\endcsname=\z@%
}{%
-%<class> \ClassError{scrlttr2%
-%<package> \PackageError{scrletter%
- }{%
+%<class> \ClassError{scrlttr2}%
+%<package> \PackageError{scrletter}%
+ {%
pseudo-length \expandafter\string\csname ltr at len@#1\endcsname
already defined%
}{%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-sections.dtx
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
% The runs of run-time file generation:
%<preidentify>%%% (run: preidentify)
% - everything that is needed before selfidentification of resulting files
@@ -40,9 +40,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-10-04 11:20:19 +0200 (Di, 04. Okt 2022) $
+ \filedate$Date: 2023-04-04 13:38:26 +0200 (Di, 04. Apr 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3954 $
+ \filerevision$Revision: 4022 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-sections.dtx}%
@@ -112,6 +112,8 @@
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyState}}
% \changes{v3.17}{2015/03/09}{using internal value storage}
% \changes{v3.18}{2015/05/22}{initialization using \opt{headings}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@openrighttrue,\@openrightfalse,\if at openright}
% The option supports three values:
% \begin{center}
@@ -141,20 +143,20 @@
{left}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{open}{#1}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{openany}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{openright}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{openleft}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{open}{#1}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{openany}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{openright}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{openleft}%
\ifcase \@tempa\relax
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{openany}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{openany}%
\@openrightfalse
\renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
\or
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{openright}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{openright}%
\@openrighttrue
\renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
\or
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{openleft}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{openleft}%
\@openrighttrue
\renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
\fi
@@ -193,6 +195,8 @@
% \changes{v2.98c}{2008/03/07}{added}
% \changes{v3.12}{2013/03/05}{using \cs{FamilyKeyState}}
% \changes{v3.17}{2015/03/09}{using internal value storage}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\scr at dotchangeatdocument}
% \changes{v2.98c}{2008/03/07}{added}
% The \opt{numbers} option provides several settings for the dot at the end of
@@ -233,7 +237,7 @@
{noenddot}{2},{nodotatend}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{numbers}{#1}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{numbers}{#1}%
\ifcase \@tempa\relax
\if at atdocument\scr at dotchangeatdocument{#1}\else
\let\scr at altsecnumhook\@empty
@@ -262,12 +266,13 @@
% to \cs{@altsecnumformattrue}}
% \changes{v2.98c}{2008/03/07}{obsolete}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% Two deprecated options.
% \begin{macrocode}
-%<*option>
+%<*option&!v4>
\KOMA at DeclareDeprecatedOption{pointednumbers}{numbers=enddot}
\KOMA at DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
-%</option>
+%</option&!v4>
% \end{macrocode}
% \end{option}^^A pointednumbers,pointlessnumbers
%
@@ -1021,12 +1026,12 @@
% Even for not numbered sections, the reset list für the section counter has
% to be executed.
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.31}\relax\else
+%<!v4> \expandafter\ifnum\scr at v@is at ge{3.31}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
\endgroup
- \fi
+%<!v4> \fi
% \end{macrocode}
% \changes{v3.31}{2020/06/02}{\cs{hy at insteadofrefstepcounter} added}
% At this point we have to make sure, that the \pkg{hyperref} code for not
@@ -1310,12 +1315,12 @@
% Even for not numbered sections, the reset list für the corresponding section
% counter has to be executed.
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.31}\relax\else
+%<!v4> \expandafter\ifnum\scr at v@is at ge{3.31}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@\scr at s@ct@@nn at m@\endcsname
\endgroup
- \fi
+%<!v4> \fi
}%
% \end{macrocode}
% \changes{v3.26}{2018/09/18}{support for \cs{scr at sect@runin}}
@@ -1833,9 +1838,9 @@
{\csname scr@#1 at afterskip\endcsname}%
{%
\ifdim\glueexpr\csname scr@#1 at afterskip\endcsname >\z@
- \expandafter\ifnum\scr at v@is at gt{2.96}\relax
+%<!v4> \expandafter\ifnum\scr at v@is at gt{2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}%
- \fi
+%<!v4> \fi
\fi
\raggedsection\normalfont\sectfont\nobreak
\usekomafont{#1}%
@@ -3244,6 +3249,8 @@
%
% \begin{option}{bookmarkpackage}
% \changes{v3.26}{2018/06/27}{added}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% Package \pkg{hyperref} has problems with bookmark level gaps. So if
% either the users omits a heading level or defines a heading with a level
% that distinguish more than one from the previous or following level, there
@@ -3257,7 +3264,7 @@
%<*option>
\KOMA at ifkey{bookmarkpackage}{@scr at autoloadbookmarkpackage}
\@scr at autoloadbookmarkpackagetrue
-\KOMA at kav@add{.\KOMAClassFileName}{bookmarkpackage}{true}
+\KOMA at kav@add{\KOMAClassFileName}{bookmarkpackage}{true}
\AfterAtEndOfPackage{hyperref}{%
\AtBeginDocument{%
\@ifpackageloaded{bookmark}{}{%
@@ -3590,11 +3597,6 @@
% version of \cs{@dottedtocline}. However this has been removed in
% \KOMAScript~v3.36.
%
-% \begin{description}
-% \item[ToDo:] This should be moved to \file{scrkernel-listsof.dtx} or should
-% be removed.
-% \end{description}
-%
% \begin{macro}{\bprot at dottedtocline}
% \changes{v2.96a}{2006/11/30}{added}
% \changes{v3.27}{2019/02/25}{deprecated}
@@ -4006,12 +4008,12 @@
% For not numbered headings we still have to process the reset list of the
% counter and write a process information to the \file{log} and the terminal.
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.18}\relax\else
+%<!v4> \expandafter\ifnum\scr at v@is at ge{3.18}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
\endgroup
- \fi
+%<!v4> \fi
\typeout{#1 without number}%
% \end{macrocode}
% \changes{v3.08}{2010/11/01}{using \cs{addparttocentry}}
@@ -4517,6 +4519,8 @@
% \changes{v2.8}{2001/06/15}{added}
% \changes{v2.95c}{2006/08/21}{changed to \pkg{keyval} option}
% \changes{v3.18}{2015/05/22}{option correlates with style not level}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@chapterprefixtrue,\@chapterprefixfalse,\if at chapterprefix}
% Initially \KOMAScript{} does not use the enormous chapter headings with
% prefix line ``Chapter \meta{number}'' but a more subtle one. However, either
@@ -4530,27 +4534,28 @@
\KOMA at key{chapterprefix}[true]{%
\KOMA at set@ifkey{chapterprefix}{@chapterprefix}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.\KOMAClassFileName}%
+ \KOMA at kav@replacebool{\KOMAClassFileName}%
{chapterprefix}{@chapterprefix}%
- \KOMA at kav@remove{.\KOMAClassFileName}%
+ \KOMA at kav@remove{\KOMAClassFileName}%
{headings}{twolinechapter}%
- \KOMA at kav@remove{.\KOMAClassFileName}%
+ \KOMA at kav@remove{\KOMAClassFileName}%
{headings}{onelinechapter}%
- \KOMA at kav@xadd{.\KOMAClassFileName}%
+ \KOMA at kav@xadd{\KOMAClassFileName}%
{headings}{%
\if at chapterprefix twolinechapter\else onelinechapter\fi
}%
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{headings}{onelinechapter}%
+\KOMA at kav@add{\KOMAClassFileName}{headings}{onelinechapter}%
% \end{macrocode}
% \begin{option}{nochapterprefix}
% \changes{v2.8}{2001/06/15}{added}
% \changes{v2.95c}{2006/08/21}{obsolete}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% Deprecated option for compatibility with \KOMAScript~2.9u only.
% \begin{macrocode}
-\KOMA at DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
+%<!v4>\KOMA at DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
%</option>
% \end{macrocode}
% \end{option}^^A nochapterprefix
@@ -4566,6 +4571,8 @@
% \changes{v3.34}{2021/04/30}{usage of \LaTeX{} hook, if available}
% \changes{v3.34}{2021/04/30}{new value \opt{\quotechar=default} with \LaTeX{}
% hooks}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% If the appendix chapters should be with or without prefix line independent
% from the chapters of the main part, option \opt{appendixprefix} can be
% used. This does not set up a new boolean but just activates or deactivates
@@ -4577,9 +4584,9 @@
\IfLTXAtLeastTF{2020/10/01}{%
\KOMA at key{appendixprefix}[true]{%
\Ifstr{#1}{default}{%
- \KOMA at kav@removekey{.\KOMAClassFileName}{appendixprefix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{appendixprefix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{onelineappendix}%
\IfHookEmptyTF{\KOMAClassName/appendix}{}{%
\RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]%
}%
@@ -4587,18 +4594,18 @@
}{%
\KOMA at set@ifkey{appendixprefix}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{appendixprefix}{#1}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{onelineappendix}%
\IfHookEmptyTF{\KOMAClassName/appendix}{}{%
\RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]%
}%
\if at tempswa
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{twolineappendix}%
\AddToHook{\KOMAClassName/appendix}[appendixprefix]%
{\@chapterprefixtrue}%
\else
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{onelineappendix}%
\AddToHook{\KOMAClassName/appendix}[appendixprefix]%
{\@chapterprefixfalse}%
\fi
@@ -4609,11 +4616,11 @@
\KOMA at key{appendixprefix}[true]{%
\KOMA at set@ifkey{appendixprefix}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{appendixprefix}{#1}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{onelineappendix}%
\if at tempswa
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{twolineappendix}%
\@ifundefined{appendixmore}{%
\def\appendixmore{\@chapterprefixtrue}%
}{%
@@ -4620,7 +4627,7 @@
\l at addto@macro\appendixmore{\@chapterprefixtrue}%
}%
\else
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{onelineappendix}%
\@ifundefined{appendixmore}{%
\def\appendixmore{\@chapterprefixfalse}%
}{%
@@ -4635,8 +4642,9 @@
% \changes{v2.8}{2001/06/15}{added}
% \changes{v2.95c}{2006/08/21}{obsolete}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
-\KOMA at DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false}
+%<!v4>\KOMA at DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false}
%</option>
% \end{macrocode}
% \end{option}^^A noappendixprefix
@@ -4857,12 +4865,12 @@
% For not numbered headings we still have to process the reset list of the
% counter and write a process information to the \file{log} and the terminal.
% \begin{macrocode}
- \expandafter\ifnum\scr at v@is at lt{3.15}\relax\else
+%<!v4> \expandafter\ifnum\scr at v@is at ge{3.15}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
\endgroup
- \fi
+%<!v4> \fi
\typeout{#1 without number}%
\ifx\@currenttocentry\@empty\else
% \end{macrocode}
@@ -4945,7 +4953,7 @@
% \changes{v3.36}{2022/03/16}{added}
% The test and warning used inside \cs{scr@@startchapter}.
% \begin{macrocode}
-\expandafter\ifnum\scr at v@is at ge{3.36}%
+%<!v4>\expandafter\ifnum\scr at v@is at ge{3.36}%
\newcommand*{\scr at t@st at nd@w at rn@m at k@ch at pt@rh@@d}[1]{%
\Ifstr{#1}{chapter}{%
\begingroup
@@ -4966,9 +4974,9 @@
\endgroup
}{}%
}
-\else
- \let\scr at t@st at nd@w at rn@m at k@ch at pt@rh@@d\@gobble
-\fi
+%<!v4>\else
+%<!v4> \let\scr at t@st at nd@w at rn@m at k@ch at pt@rh@@d\@gobble
+%<!v4>\fi
% \end{macrocode}
% \end{macro}^^A \scr at t@st at nd@w at rn@m at k@ch at pt@rh@@d
% \end{macro}^^A \scr@@startchapter
@@ -5033,7 +5041,7 @@
% \changes{v3.36}{2022/03/16}{added}
% The test and warning used inside \cs{scr@@startschapter}.
% \begin{macrocode}
-\expandafter\ifnum\scr at v@is at ge{3.36}%
+%<!v4>\expandafter\ifnum\scr at v@is at ge{3.36}%
\newcommand*{\scr at t@st at nd@w at rn@m at ks@ch at pt@rh@@d}[1]{%
\Ifstr{#1}{chapter}{%
\begingroup
@@ -5054,9 +5062,9 @@
\endgroup
}{}%
}
-\else
- \let\scr at t@st at nd@w at rn@m at ks@ch at pt@rh@@d\@gobble
-\fi
+%<!v4>\else
+%<!v4> \let\scr at t@st at nd@w at rn@m at ks@ch at pt@rh@@d\@gobble
+%<!v4>\fi
% \end{macrocode}
% \end{macro}^^A \scr at t@st at nd@w at rn@m at ks@ch at pt@rh@@d
% \end{macro}^^A \scr@@startschapter
@@ -5131,7 +5139,9 @@
\csname scr@#1 at afterindent\endcsname
{\@afterindenttrue}{\@afterindentfalse}{%
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else
- \expandafter\ifnum\scr at v@is at ge{3.22}\@afterindenttrue\fi
+%<!v4> \expandafter\ifnum\scr at v@is at ge{3.22}
+ \@afterindenttrue
+%<!v4> \fi
\fi
}%
\chapterheadstartvskip
@@ -5251,7 +5261,9 @@
\csname scr@#1 at afterindent\endcsname
{\@afterindenttrue}{\@afterindentfalse}{%
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else
- \expandafter\ifnum\scr at v@is at ge{3.22}\@afterindenttrue\fi
+%<!v4> \expandafter\ifnum\scr at v@is at ge{3.22}
+ \@afterindenttrue
+%<!v4> \fi
\fi
}%
\chapterheadstartvskip
@@ -5967,9 +5979,9 @@
% \begin{macrocode}
\newkomafont{minisec}{}
\newcommand\minisec[1]{%
- \expandafter\ifnum\scr at v@is at lt{3.13a}\relax
- \@afterindentfalse \vskip 1.5ex
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.13a}\relax
+%<!v4> \@afterindentfalse \vskip 1.5ex
+%<!v4> \else
\if at noskipsec \leavevmode \fi
\par
\@afterindentfalse
@@ -5978,10 +5990,11 @@
\else
\addpenalty\@secpenalty\addvspace{1.5ex}%
\fi
- \fi
+%<!v4> \fi
{\parindent \z@
- \expandafter\ifnum\scr at v@is at gt{2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
+%<!v4> \expandafter\ifnum\scr at v@is at gt{2.96}\relax
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+%<!v4> \fi
\raggedsection\normalfont\sectfont\nobreak
\usekomafont{minisec}{\nobreak\interlinepenalty \@M #1\par\nobreak}%
}\nobreak
@@ -6068,12 +6081,12 @@
\newcounter{section}[chapter]
\renewcommand*\thesection{%
%<*book>
- \expandafter\ifnum\scr at v@is at gt{2.97d}%
+%<!v4> \expandafter\ifnum\scr at v@is at gt{2.97d}%
\if at mainmatter\thechapter.\fi
- \else
+%<!v4> \else
%</book>
\thechapter.%
-%<book> \fi
+%<book&!v4> \fi
\@arabic\c at section
}
%</book|report>
@@ -6130,15 +6143,15 @@
% \begin{macrocode}
\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip}
\renewcommand*{\@seccntformat}[1]{%
- \expandafter\ifnum\scr at v@is at lt{3.17}\relax
- \protect\othersectionlevelsformat{#1}{%
- \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
- \else
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.17}\relax
+%<!v4> \protect\othersectionlevelsformat{#1}{%
+%<!v4> \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+%<!v4> \else
\scr at ifundefinedorrelax{#1format}{%
\protect\othersectionlevelsformat{#1}{%
\expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
}{\expandafter\protect\csname #1format\endcsname}%
- \fi
+%<!v4> \fi
}
% \end{macrocode}
% \end{command}^^A \othersectonlevelsformat
@@ -6374,11 +6387,11 @@
%<article> tocnumwidth=5em%
%<book|report> tocnumwidth=6em%
]{subparagraph}
-\expandafter\ifnum\scr at v@is at lt{3.15}\relax
- \let\scr at subparagraph@sectionindent\parindent
-\else
+%<!v4>\expandafter\ifnum\scr at v@is at lt{3.15}\relax
+%<!v4> \let\scr at subparagraph@sectionindent\parindent
+%<!v4>\else
\def\scr at subparagraph@sectionindent{\scr at parindent}%
-\fi
+%<!v4>\fi
%</body>
% \end{macrocode}
% \end{command}^^A \subparagraph
@@ -6396,15 +6409,15 @@
% levels already have been done. But there are also some elements that do not
% correspond with a single section level.
%
-% \begin{fontelement}{disposition}
+% \begin{fontelement}{disposition,sectioning}
% \changes{v2.95b}{2006/07/30}{added}
-% \begin{fontelement}{sectioning}
-% \changes{v2.95b}{2006/07/30}{added}
+% \changes{v3.39}{2023/04/04}{also with \pkg*{scrextend} as documented}
% \begin{macro}{\sectfont}
% \changes{v2.8c}{2001/06/29}{\cs{normalcolor} added}
% \changes{v3.12}{2013/11/11}{earlier definition to support option
% \opt{headings\quotechar=standardclasses}}
% \changes{v3.20}{2016/01/29}{\cs{sffamily} replaced by \cs{@gr at gsffamily}}
+% \changes{v3.39}{2023/04/04}{\cs{@gr at gsfamily} replaced by \cs{maybesffamily}}
% This element is not only used by all section levels before the dedicated
% element of the single level is used. It is also used by other elements like
% the \fnt{chaptertocentry}. The command \cs{sectfont} instead of the
@@ -6414,18 +6427,18 @@
%</class&!letter>
%<*(class&!letter)|(package&extend)>
%<*prepare>
-\newcommand*{\sectfont}{\normalcolor\@gr at gsffamily\bfseries}
+\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries}
%</prepare>
%</(class&!letter)|(package&extend)>
-%<*class&!letter>
+%<*book|report|article|extend>
%<*body>
\newcommand*{\scr at fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
%</body>
+%</book|report|article|extend>
% \end{macrocode}
% \end{macro}^^A \sectfont
-% \end{fontelement}^^A sectioning
-% \end{fontelement}^^A disposition
+% \end{fontelement}^^A disposition, sectioning
%
%
% \begin{option}{headings}
@@ -6444,9 +6457,12 @@
% \cs{scr at chapter@afterskip}}
% \changes{v3.17}{2015/03/09}{using internal value storage}
% \changes{v3.18}{2015/05/20}{values of \cs{scr at chapter@beforeskip} negative}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% Option \opt{headings} is the main switch for the headings of all outlines.
% It provides the following values:
% \begin{macrocode}
+%<*class&!letter>
%<*option>
\KOMA at key{headings}{%
\KOMA at set@ncmdkey{headings}{@tempa}{%
@@ -6566,11 +6582,11 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax% big
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{big}%
% \end{macrocode}
% First of all we handle the three size values.
% \begin{description}
@@ -6590,8 +6606,9 @@
\renewcommand*{\scr at chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa
- \else\vskip\@tempskipa\fi
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa\else
+ \vskip\@tempskipa
+%<!v4> \fi
}%
\renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
%</book|report>
@@ -6605,11 +6622,11 @@
\setkomafont{paragraph}{\normalsize}%
\setkomafont{subparagraph}{\normalsize}%
\or % normal
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{normal}%
%<*book|report>
\renewcommand*{\scr at chapter@beforeskip}{-3\baselineskip-\parskip}%
\renewcommand*{\scr at chapter@afterskip}{%
@@ -6618,8 +6635,9 @@
\renewcommand*{\scr at chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa
- \else\vskip\@tempskipa\fi
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa\else
+ \vskip\@tempskipa
+%<!v4> \fi
}%
\renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
%</book|report>
@@ -6639,11 +6657,11 @@
\setkomafont{paragraph}{\normalsize}%
\setkomafont{subparagraph}{\normalsize}%
\or % small
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{small}%
%<*book|report>
\renewcommand*{\scr at chapter@beforeskip}{-2.8\baselineskip-\parskip}%
\renewcommand*{\scr at chapter@afterskip}{%
@@ -6652,8 +6670,9 @@
\renewcommand*{\scr at chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa
- \else\vskip\@tempskipa\fi
+%<!v4> \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa\else
+ \vskip\@tempskipa
+%<!v4> \fi
}%
\renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
%</book|report>
@@ -6711,22 +6730,22 @@
% We have also options to handle the extended optional argument.
% \begin{macrocode}
\or % optiontotocandhead
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontotocandhead}%
\scr at activate@xsection{3}%
\or % optiontotoc
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontotoc}%
\scr at activate@xsection{2}%
\or % optiontohead
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontohead}%
\scr at activate@xsection{1}%
% \end{macrocode}
% Last but not least the option to activate the standard class emulation of
@@ -6733,11 +6752,11 @@
% headings.
% \begin{macrocode}
\or % standardclasses
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{standardclasses}%
%<*book|report>
\renewcommand*{\scr at chapter@beforeskip}{-50\p@}%
\renewcommand*{\scr at chapter@afterskip}{40\p@}%
@@ -6764,8 +6783,8 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{headings}{big}
-%<book|report>\KOMA at kav@add{.\KOMAClassFileName}{headings}{onelinechapter}
+\KOMA at kav@add{\KOMAClassFileName}{headings}{big}
+%<book|report>\KOMA at kav@add{\KOMAClassFileName}{headings}{onelinechapter}
% \end{macrocode}
% \end{option}^^A headings
%
@@ -6774,15 +6793,18 @@
% \changes{v2.4g}{1996/11/04}{option name fixed}
% \changes{v2.98c}{2008/03/10}{obsolete}
% \changes{v3.01a}{2008/11/20}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macro}{\@bigheadings,\@normalheadings,\@smallheadings}
% \changes{v2.98c}{2008/03/10}{removed}
% \end{macro}^^A \@bigheadings … \@smallheadings
% We also have some deprecated options.
% \begin{macrocode}
+%<*!v4>
\KOMA at DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA at DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA at DeclareDeprecatedOption{smallheadings}{headings=small}
-%</option>
+%</!v4>
+%</option>
% \end{macrocode}
% \end{option}^^A smallheading,normalheadings,bigheadings
%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-title.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-title.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-title.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-16 08:32:52 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 4000 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-title.dtx}%
@@ -83,6 +83,8 @@
% \changes{v3.12}{2013/11/21}{value \opt{\quotechar=firstiscover} added}
% \changes{v3.17}{2015/03/10}{using internal value storage}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macro}{\@titlepagetrue,\@titlepagefalse,\if at titlepage}
% \begin{macro}{\@titlepageiscoverpagetrue,\@titlepageisvoerpagefalse,
% \if at titlepageiscoverpage}
@@ -130,7 +132,7 @@
\@titlepagetrue
\@titlepageiscoverpagetrue
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{titlepage}{firstiscover}%
@@ -139,11 +141,11 @@
%<!(package&extend)> \KOMA at set@ifkey{titlepage}{@titlepage}{#1}%
%<package&extend> \KOMA at set@ifkey{titlepage}{@titlepage}{##1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{titlepage}{firstiscover}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{titlepage}{@titlepage}%
@@ -151,7 +153,7 @@
\fi
}%
}
-\KOMA at kav@xadd{.%
+\KOMA at kav@xadd{%
%<class> \KOMAClassFileName
%<package&extend> scrextend.\scr at pkgextension
}{titlepage}{\if at titlepage true\else false\fi}
@@ -375,18 +377,18 @@
%<package&extend>\let\maketitle\relax\let\@maketitle\relax
\newcommand*\maketitle[1][1]{%
% \end{macrocode}
+% \changes{v3.39}{2022/10/25}{using \cs{scr at v@is at ge}}
% To support several \cs{maketitle} in the same document, we have to take care
% to use the correct \cs{and} every time. So we define it here (instead of
% outside).
% \begin{macrocode}
- \expandafter\ifnum \csname scr at v@3.12\endcsname>\scr at compatibility\relax
- \else
+%<!v4> \expandafter\ifnum \scr at v@is at ge{3.12}%
\def\and{%
\end{tabular}%
\hskip 1em \@plus.17fil%
\begin{tabular}[t]{c}%
}%
- \fi
+%<!v4> \fi
% \end{macrocode}
% Depending on in-page titles or title pages, we have to use different
% code. First the title pages.
@@ -488,16 +490,16 @@
\vfill\null
\if at twoside
% \end{macrocode}
+% \changes{v3.39}{2022/10/25}{using \cs{scr at v@is at ge}}
% From \KOMAScript~3.12 we show the retro page only if needed. It is needed in
% double-sided mode, if the upper and lower elements are not empty.
% \begin{macrocode}
\@tempswatrue
- \expandafter\ifnum \@nameuse{scr at v@3.12}>\scr at compatibility\relax
- \else
+%<!v4> \expandafter\ifnum \scr at v@is at ge{3.12}%
\ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
\@tempswafalse
\fi\fi
- \fi
+%<!v4> \fi
\if at tempswa
\next at tpage
\begin{minipage}[t]{\textwidth}
@@ -515,8 +517,9 @@
% \begin{macrocode}
\else
\ifx\@uppertitleback\@empty\else
-%<package> \PackageWarning{scrextend}{%
-%<class> \ClassWarning{\KOMAClassName}{%
+%<package> \PackageWarning{scrextend}%
+%<class> \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\uppertitleback\space ignored
by \string\maketitle\MessageBreak
in `twoside=false' mode%
@@ -523,8 +526,9 @@
}%
\fi
\ifx\@lowertitleback\@empty\else
-%<package> \PackageWarning{scrextend}{%
-%<class> \ClassWarning{\KOMAClassName}{%
+%<package> \PackageWarning{scrextend}%
+%<class> \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\lowertitleback\space ignored
by \string\maketitle\MessageBreak
in `twoside=false' mode%
@@ -559,15 +563,17 @@
%<extend> ##1%
%<!extend> #1%
\relax\ifnum\@tempcnta=1\else
-%<class> \ClassWarning{\KOMAClassName}{%
-%<package> \PackageWarning{scrextend}{%
+%<class> \ClassWarning{\KOMAClassName}%
+%<package> \PackageWarning{scrextend}%
+ {%
Optional argument of \string\maketitle\space ignored\MessageBreak
in `titlepage=false' mode%
}%
\fi
\ifx\@uppertitleback\@empty\else
-%<package> \PackageWarning{scrextend}{%
-%<class> \ClassWarning{\KOMAClassName}{%
+%<class> \ClassWarning{\KOMAClassName}%
+%<package> \PackageWarning{scrextend}%
+ {%
non empty \string\uppertitleback\space ignored
by \string\maketitle\MessageBreak
in `titlepage=false' mode%
@@ -574,8 +580,9 @@
}%
\fi
\ifx\@lowertitleback\@empty\else
-%<package> \PackageWarning{scrextend}{%
-%<class> \ClassWarning{\KOMAClassName}{%
+%<class> \ClassWarning{\KOMAClassName}%
+%<package> \PackageWarning{scrextend}%
+ {%
non empty \string\lowertitleback\space ignored
by \string\maketitle\MessageBreak
in `titlepage=false' mode%
@@ -637,7 +644,8 @@
\endgroup
\fi
\setcounter{footnote}{0}%
- \expandafter\ifnum \csname scr at v@3.12\endcsname>\scr at compatibility\relax
+%<*!v4>
+ \expandafter\ifnum \scr at v@is at lt{3.12}%
\let\thanks\relax
\let\maketitle\relax
\let\@maketitle\relax
@@ -665,6 +673,7 @@
\global\let\dedication\relax
\global\let\date\relax
\fi
+%</!v4>
\global\let\and\relax
}%
% \end{macrocode}
@@ -775,6 +784,8 @@
% \end{command}
%
% \begin{environment}{titlepage}
+% \changes{v3.39}{2022/10/25}{\LaTeX{} 2.09 compatibility mode with
+% \pkg{scrextend} only}
% The environment to be used for title pages. Title pages are always
% one-columned and use page style \pstyle{empty}. We have to take care to
% reset this at the end of the title page.
@@ -794,9 +805,7 @@
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \if at compatibility
- \setcounter{page}{0}%
- \fi
+%<package&extend> \if at compatibility \setcounter{page}{0}\fi
}{%
\if at restonecol\twocolumn \else \newpage \fi
}%
@@ -919,9 +928,12 @@
% \changes{v2.95c}{2006/08/21}{obsolete}
% \changes{v3.01a}{2008/11/21}{standard not obsolete}
% \changes{v3.27}{2019/03/13}{deprecated}
+% \changes{v3.99}{2022/11/16}{removed from \KOMAScript~4}
% \begin{macrocode}
+%<*!v4>
\KOMA at DeclareDeprecatedOption{abstracton}{abstract=true}
\KOMA at DeclareDeprecatedOption{abstractoff}{abstract=false}
+%</!v4>
%</option>
% \end{macrocode}
% \end{option}^^A abstracton,abstractoff
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z 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: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-10-24 10:08:05 +0200 (Mo, 24. Okt 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3972 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-tocstyle.dtx}%
@@ -1094,6 +1094,7 @@
%
% \begin{command}{\DeclareTOCStyleEntry}
% \changes{v3.20}{2015/11/13}{added}
+% \changes{v3.39}{2022/10/24}{error message about missing options improved}
% 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:
@@ -1141,7 +1142,8 @@
\aftergroup\@tempswatrue
\def\do##1##2##3##4{%
\scr at ifundefinedorrelax{##1#3##2}{%
- \PackageError{tocbasic}{toc style `#2' needs ##4}{%
+ \PackageError{tocbasic}{toc style `#2' needs ##4\MessageBreak
+ of `#3'}{%
Usually the ##4 is defined using option `##3'.\MessageBreak
In some cases it may be set defining command
`\expandafter\string\csname ##1#3##2\endcsname'.\MessageBreak
@@ -1536,6 +1538,7 @@
% \end{macrocode}
% or, if this cannot be used, by using a standard value analogues to the
% values of the standard classes and the \KOMAScript{} classes.
+% \changes{v3.39}{2022/10/24}{default level for \texttt{lstlisting} added}
% \begin{macrocode}
\@ifundefined{#1tocdepth}{%
\Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{%
@@ -1547,12 +1550,14 @@
\Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
\Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
\Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
+ \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{%
% \end{macrocode}
% As last chance, we can use the same number already used for a headings level
% with the same name.
% \begin{macrocode}
- \expandafter\let\csname #1tocdepth\expandafter\endcsname
- \csname #1numdepth\endcsname
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
}%
}%
}%
@@ -1564,6 +1569,16 @@
}%
}{}%
% \end{macrocode}
+% \changes{v3.39}{2022/10/24}{try also using \cs{toclevel@\meta{level name}} as
+% default level}
+% Last but not least, if \cs{tocdepth@\meta{level name}} has been defined, we
+% can use this one.
+% \begin{macrocode}
+ \@ifundefined{#1tocdepth}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname toclevel@#1\endcsname
+ }{}%
+% \end{macrocode}
% The indent can also be defined automatically by a parent level.
% \begin{macrocode}
%<*tocline|toctext>
@@ -1639,6 +1654,7 @@
% If all the automatic setting methods were not successful, we try standard
% values used from the standard classes or older versions of the \KOMAScript{}
% classes.
+% \changes{v3.39}{2022/10/24}{default indent for \texttt{lstlisting} added}
% \begin{macrocode}
\@ifundefined{scr at tso@#1 at indent}{%
%<*dottedtocline|undottedtocline|largetocline>
@@ -1646,48 +1662,50 @@
%</dottedtocline|undottedtocline|largetocline>
\Ifstr{#1}{figure}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
\Ifstr{#1}{table}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \Ifstr{#1}{lstlisting}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
% \end{macrocode}
% The follow code needs information about the existence of the chapter
% level. So the chapter level should already be defined, before the first
% usage!
% \begin{macrocode}
- \scr at ifundefinedorrelax{l at chapter}{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{3.8em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{7em}%
+ \scr at ifundefinedorrelax{l at chapter}{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{3.8em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{7em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
% \end{macrocode}
% If nothing helps, the user has to define the values.
% \begin{macrocode}
+ }%
}%
}%
}%
}%
- }%
- }{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{7.0em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{7.0em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{12em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{12em}%
+ }{%
% \end{macrocode}
% Once more: if nothing helps, the user has to define the values.
% \begin{macrocode}
+ }%
}%
}%
}%
@@ -1709,6 +1727,7 @@
}{}%
% \end{macrocode}
% Almost the same for the number width:
+% \changes{v3.39}{2022/10/24}{default number width for \texttt{lstlisting} added}
% \begin{macrocode}
%<*dottedtocline|undottedtocline|tocline>
%<*tocline>
@@ -1734,45 +1753,47 @@
%</dottedtocline|undottedtocline>
\Ifstr{#1}{figure}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
\Ifstr{#1}{table}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
+ \Ifstr{#1}{lstlisting}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
% \end{macrocode}
% Depending on existence of the chapter level:
% \begin{macrocode}
- \scr at ifundefinedorrelax{chapter}{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at numwidth}{3.2em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at numwidth}{4.1em}%
+ \scr at ifundefinedorrelax{chapter}{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at numwidth}{3.2em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at numwidth}{5m}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{4.1em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{5m}%
+ }{%
% \end{macrocode}
% Need option to be set.
% \begin{macrocode}
+ }%
}%
}%
}%
}%
- }%
- }{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{3.2em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at numwidth}{3.1em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at numwidth}{5em}%
+ }{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{3.2em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at numwidth}{3.1em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at numwidth}{6em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{5em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{6em}%
+ }{%
% \end{macrocode}
% Need option to be set.
% \begin{macrocode}
+ }%
}%
}%
}%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -29,9 +29,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-09 14:11:14 +0200 (Do, 09. Jun 2022) $
+ \filedate$Date: 2023-02-10 11:25:25 +0100 (Fr, 10. Feb 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3889 $
+ \filerevision$Revision: 4014 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-typearea.dtx}[%
@@ -111,6 +111,52 @@
% commands implemented here in the \KOMAScript{} manual, either the German
% \file{scrguide} or the English \file{scrguien}.
%
+% \subsection{Options not yet in the Manual}
+% Some options commands are not documented in the \KOMAScript{} manuals, e.g.,
+% because they are not stable enough to be used by average users or more or
+% less for internal usage only. Some are only not documented in the
+% \KOMAScript{} manual, because nobody has done it yet.
+%
+% \DescribeOption{typeareawarnlimit=\meta{integer}}
+% \marginpar{\raggedleft\tiny Added: 2023-02-10}%
+% \SpecialOptionIndex{typeareawarnlimit}%
+% If the text area of the typing area is more than \meta{integer}\% larger
+% than the estimated good line width \pkg{typearea} would warn:
+%\begin{verbatim}
+% Package typearea Warning: Bad type area settings!
+% (typearea) The detected line width is about ...%
+% (typearea) larger than the heuristically estimated maximum
+% (typearea) limit of typographical good line width.
+% (typearea) You should e.g. decrease DIV, increase fontsize
+% (typearea) or change papersize.
+%\end{verbatim}
+% The default of \meta{integer} is 15. This was also the static value used for
+% \KOMAScript{} before version 3.39. A negative \meta{integer} deactivates the
+% warning.
+%
+% \DescribeOption{typeareainfolimit=\meta{integer}}
+% \marginpar{\raggedleft\tiny Added: 2023-02-10}%
+% \SpecialOptionIndex{typeareainfolimit}%
+% If the text area of the typing area is more than \meta{integer}\% smaller
+% than the estimated good line width \pkg{typearea} would write an information:
+%\begin{verbatim}
+% Package typearea Info: Maybe no optimal type area settings!
+% (typearea) The detected line width is about ...%
+% (typearea) smaller than the heuristically estimated maximum
+% (typearea) limit of typographical good line width.
+% (typearea) You could e.g. increase DIV, decrease fontsize
+% (typearea) or change the papersize.
+%\end{verbatim}
+% The default of \meta{integer} is 15. This was also the static value used for
+% \KOMAScript before version 3.39. A negative \meta{integer} deactivates the
+% warning.
+%
+% \DescribeOption{typeareawarninfolimit=\meta{integer}}
+% \marginpar{\raggedleft\tiny Added: 2023-02-10}%
+% \SpecialOptionIndex{typeareawarninfolimit}%
+% This is the same like
+% \opt{typeareawarnlimit=\meta{integer},typeareainfolimit=\meta{integer}}.
+%
% \MaybeStop{\PrintIndex}
%
% \section{Implementation of Package \pkg*{typearea} and Additional Class
@@ -289,9 +335,7 @@
}
%<*typearea>
\ProvideUnknownPaperSizeError{warning}{%
- \PackageWarning{%
- typearea%
- }{%
+ \PackageWarning{typearea}{%
\string\paperwidth\space and \string\paperheight\space stay
unchanged, because\MessageBreak
of unknown paper size #1%
@@ -298,9 +342,7 @@
}%
}
\ProvideUnknownPaperSizeError{info}{%
- \PackageInfo{%
- typearea
- }{%
+ \PackageInfo{typearea}{%
\string\paperwidth\space and \string\paperheight\space stay
unchanged, because\MessageBreak
of unknown paper size #1%
@@ -344,6 +386,8 @@
% \changes{v3.12}{2013/03/05}{status signaling using \cs{FamilyKeyState}}
% \changes{v3.22}{2016/07/29}{paper orientation depends on format name}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% Normally, the paper size should be set using this option. It provides the
% ISO series A, B, C, D, value pairs
% \opt{(\meta{width},\meta{height})} and the orientations
@@ -353,44 +397,44 @@
\KOMA at key{paper}{%
\Ifstr{#1}{seascape}{%
\@seascapetrue
- \expandafter\ifnum\scr at ta@v at is@ge{3.22}\relax
+%<!v4> \expandafter\ifnum\scr at ta@v at is@ge{3.22}\relax
\@landscapetrue
\scr at setpaperorientation
- \else
- \if at landscape\else\scr at switchpapersizes\@landscapetrue\fi
- \fi
+%<!v4> \else
+%<!v4> \if at landscape\else\scr at switchpapersizes\@landscapetrue\fi
+%<!v4> \fi
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{landscape}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{portrait}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{seascape}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{seascape}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{landscape}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{portrait}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{seascape}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{seascape}%
}{%
\Ifstr{#1}{landscape}{%
\@seascapefalse
- \expandafter\ifnum\scr at ta@v at is@ge{3.22}\relax
+%<!v4> \expandafter\ifnum\scr at ta@v at is@ge{3.22}\relax
\@landscapetrue
\scr at setpaperorientation
- \else
- \if at landscape\else\scr at switchpapersizes\@landscapetrue\fi
- \fi
+%<!v4> \else
+%<!v4> \if at landscape\else\scr at switchpapersizes\@landscapetrue\fi
+%<!v4> \fi
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{landscape}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{portrait}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{seascape}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{landscape}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{landscape}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{portrait}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{seascape}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{landscape}%
}{%
\Ifstr{#1}{portrait}{%
- \expandafter\ifnum\scr at ta@v at is@ge{3.22}\relax
+%<!v4> \expandafter\ifnum\scr at ta@v at is@ge{3.22}\relax
\@landscapefalse
\scr at setpaperorientation
- \else
- \if at landscape\scr at switchpapersizes\@landscapefalse\fi
- \fi
+%<!v4> \else
+%<!v4> \if at landscape\scr at switchpapersizes\@landscapefalse\fi
+%<!v4> \fi
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{landscape}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{portrait}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{seascape}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{portrait}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{landscape}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{portrait}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{seascape}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{portrait}%
}{%
\Ifstr{#1}{letter}{%
\if at landscape
@@ -401,9 +445,9 @@
\setlength\paperwidth {8.5in}%
\fi
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{paper}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{letter}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{paper}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{letter}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\if at seascape seascape\else
\if at landscape landscape\else portrait\fi\fi
}%
@@ -417,9 +461,9 @@
\setlength\paperwidth {8.5in}%
\fi
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{paper}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{legal}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{paper}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{legal}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\if at seascape seascape\else
\if at landscape landscape\else portrait\fi\fi
}%
@@ -433,9 +477,9 @@
\setlength\paperwidth {7.25in}%
\fi
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{paper}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{executive}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{paper}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{executive}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\if at seascape seascape\else
\if at landscape landscape\else portrait\fi\fi
}%
@@ -443,9 +487,9 @@
\iso at paper{#1}%
\if at tempswa
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{paper}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{#1}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{paper}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{#1}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\if at seascape seascape\else
\if at landscape landscape\else portrait\fi\fi
}%
@@ -453,7 +497,8 @@
\expandafter\maybe at pair#1::\@nil
\if at tempswa
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{paper}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{paper}%
+%<*!v4>
\expandafter\ifnum \scr at ta@v at is@lt{3.01b}\relax
\PackageWarningNoLine{typearea}{%
You may have to exchange height and width!\MessageBreak
@@ -465,21 +510,24 @@
\setlength\paperwidth{\@tempb}%
\setlength\paperheight{\@tempa}%
\else
+%</!v4>
\setlength\paperwidth{\@tempa}%
\setlength\paperheight{\@tempb}%
+%<*!v4>
\fi
\expandafter\ifnum \scr at ta@v at is@lt{3.22}\relax
\if at landscape
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{\@tempa:\@tempb}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{\@tempa:\@tempb}%
\else
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{\@tempb:\@tempa}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{\@tempb:\@tempa}%
\fi
\else
+%</!v4>
\scr at setpaperorientation
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\the\paperwidth:\the\paperheight}%
- \fi
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+%<!v4> \fi
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\if at seascape seascape\else
\if at landscape landscape\else portrait\fi\fi
}%
@@ -564,6 +612,8 @@
% \changes{v3.12}{2013/03/05}{status signaling using \cs{FamilyKeyState}}
% \changes{v3.17a}{2015/05/03}{logic redesigned}
% \changes{v3.20}{2015/07/10}{\file{luatex} as a synonym of \file{pdftex}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% This option is the main element for telling pdf\TeX, \file{dvips} or V\TeX{}
% which paper size to use. It is also used by some deprecated options. Here
% are the values and their meanings:
@@ -621,12 +671,14 @@
\else
\edef\@pagesizelast{false}%
\fi
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}%
+ \KOMA at kav@xreplacevalue{typearea.\scr at pkgextension}%
{pagesize}{\@pagesizelast}%
\fi
}
% \end{macrocode}
% \begin{macro}{\@pagesizelast}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of
+% \cs{KOMAExecuteOptions} removed}
% This internal macro stores the current value of option \opt{pagesize} and
% is needed to use the correct signalling if option \opt{paper} is used
% inside the document and the initial setup in |\begin{document}|.
@@ -633,7 +685,7 @@
% \begin{macrocode}
\newcommand\@pagesizelast{auto}
\AtBeginDocument{%
- \KOMAExecuteOptions[.typearea.\scr at pkgextension]{pagesize=\@pagesizelast}%
+ \KOMAExecuteOptions[typearea.\scr at pkgextension]{pagesize=\@pagesizelast}%
% \end{macrocode}
% \end{macro}^^A \@pagesizelast
%
@@ -668,7 +720,7 @@
% \end{description}
% First of all the definition from |\begin{document}|:
% \begin{macrocode}
- \expandafter\ifnum\scr at ta@v at is@gt{3.02b}\relax
+%<!v4> \expandafter\ifnum\scr at ta@v at is@gt{3.02b}\relax
\renewcommand*{\set at dvipspagesize}{%
% \end{macrocode}
% \changes{v3.12}{2012/11/23}{use paper size update only for DVI and PS}
@@ -748,9 +800,9 @@
\endgroup
\fi
}%
- \else
- \let\set at dvipspagesize=\setnot at dvipspagesize
- \fi
+%<!v4> \else
+%<!v4> \let\set at dvipspagesize=\setnot at dvipspagesize
+%<!v4> \fi
\renewcommand*{\set at dvipdfmxpagesize}{%
\scr at ifdvioutput{%
\special{papersize=\the\paperwidth,\the\paperheight}%
@@ -802,11 +854,11 @@
\special{papersize=\the\paperwidth,\the\paperheight}%
\if at seascape\special{! TeXDict begin /landplus90{true}store end }\fi
}%
- \expandafter\ifnum\scr at ta@v at is@gt{3.02b}\relax
+%<!v4> \expandafter\ifnum\scr at ta@v at is@gt{3.02b}\relax
\let\set at dvipspagesize=\@empty
- \else
- \let\set at dvipspagesize=\setnot at dvipspagesize
- \fi
+%<!v4> \else
+%<!v4> \let\set at dvipspagesize=\setnot at dvipspagesize
+%<!v4> \fi
\else
\endgroup
\fi
@@ -955,6 +1007,8 @@
% \opt{twocolumn} and \opt{twoside} fixed}
% \changes{v3.27}{2019/03/05}{no special treatment for letters}
% \changes{v3.27}{2019/03/05}{missing \cs{sloppy} in twocolumn mode added}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% From v3.17 until 3.19a the classes used a local switch
% \cs{if at tempswa}. As a result of this option \opt{twocolumn} was not
% able to recognize double sided layout. Because of this it was essential to
@@ -969,17 +1023,17 @@
}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
%<*class>
- \expandafter\ifnum\scr at v@is at ge{3.17}%
+%<!v4> \expandafter\ifnum\scr at v@is at ge{3.17}%
\if at twoside\flushbottom
\else
\if at twocolumn\sloppy\flushbottom\else\raggedbottom\fi
\fi
- \fi
+%<!v4> \fi
%</class>
- \KOMA at kav@xreplacevalue{.%
-%<class> \KOMAClassFileName
-%<package> typearea.\scr at pkgextension
- }{twoside}{#1}%
+ \KOMA at kav@xreplacevalue
+%<class> {\KOMAClassFileName}%
+%<package> {typearea.\scr at pkgextension}%
+ {twoside}{#1}%
%<*package>
\if at twoside
\if at semitwoside
@@ -999,7 +1053,7 @@
%<!book>\KOMAExecuteOptions{twoside=false}
%</class>
%<*package>
-\KOMA at kav@xadd{.typearea.\scr at pkgextension}{twoside}{%
+\KOMA at kav@xadd{typearea.\scr at pkgextension}{twoside}{%
\if at twoside true\else false\fi
}
%</package>
@@ -1023,6 +1077,8 @@
% \changes{v3.12}{2013/03/05}{status signaling using \cs{FamilyKeyState}}
% \changes{v3.13a}{2014/04/09}{the class also uses status signaling with
% \cs{FamilyKeyStateProcessed}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \changes{v3.20}{2016/02/16}{\cs{sloppy}, \cs{raggedbottom} and
% \cs{flushbottom} delayed}
% \changes{v3.27}{2019/03/05}{no extra treatment for letters}
@@ -1036,28 +1092,31 @@
%</package>
\KOMA at set@ifkey{twocolumn}{@twocolumn}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.%
-%<class> \KOMAClassFileName
-%<package> typearea.\scr at pkgextension
- }{twocolumn}{@twocolumn}%
+ \KOMA at kav@replacebool
+%<class> {\KOMAClassFileName}%
+%<package> {typearea.\scr at pkgextension}%
+ {twocolumn}{@twocolumn}%
%<package> \csname recalctypearea\endcsname
%<*class>
\if at atdocument\expandafter\@firstofone
\else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
{\expandafter\AtEndOfClass}\fi
- {\expandafter\ifnum\scr at v@is at ge{3.17}%
- \if at twocolumn\twocolumn\sloppy\flushbottom
- \else
- \onecolumn
- \if at twoside\flushbottom\else
- \raggedbottom
+ {%
+%<!v4> \expandafter\ifnum\scr at v@is at ge{3.17}%
+ \if at twocolumn\twocolumn\sloppy\flushbottom
+ \else
+ \onecolumn
+ \if at twoside\flushbottom\else
+ \raggedbottom
+ \fi
\fi
- \fi
- \fi}%
+%<!v4> \fi
+ }%
%</class>
\fi
}
%<*class>
+%<*!v4>
\AtEndOfClass{%
\expandafter\ifnum\scr at v@is at lt{3.17}%
%<*!letter>
@@ -1067,10 +1126,11 @@
%<letter> \raggedbottom
\fi
}
+%</!v4>
\KOMAExecuteOptions{twocolumn=false}
%</class>
%<*package>
-\KOMA at kav@xadd{.typearea.\scr at pkgextension}{twocolumn}{%
+\KOMA at kav@xadd{typearea.\scr at pkgextension}{twocolumn}{%
\if at twocolumn true\else false\fi
}
%</package>
@@ -1093,8 +1153,12 @@
% \begin{option}{headlines}
% \changes{v2.95}{2002/12/06}{new implementation using \pkg{keyval}}
% \changes{v3.12}{2013/03/05}{status signaling using \cs{FamilyKeyState}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{option}{footlines}
% \changes{v3.12}{2013/03/26}{added}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% These are two of the recommended options to set the height of the page head
% and footer. Here we set the height by the number of base lines. The number
% is a factor to \cs{baselineskip} and therefore a real number.
@@ -1106,8 +1170,8 @@
\endgroup
\def\ta at hh{#1\baselineskip}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{headlines}{#1}%
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{headheight}{#1\baselineskip}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{headlines}{#1}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{headheight}{#1\baselineskip}%
}
\KOMA at key{footlines}{%
\begingroup
@@ -1115,8 +1179,8 @@
\endgroup
\def\ta at fh{#1\baselineskip}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{footlines}{#1}%
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{footheight}{#1\baselineskip}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{footlines}{#1}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{footheight}{#1\baselineskip}%
}
%</package&typearea&options>
% \end{macrocode}
@@ -1126,8 +1190,12 @@
% \begin{option}{headheight}
% \changes{v2.98c}{2008/04/06}{added}
% \changes{v3.12}{2013/03/05}{status signaling using \cs{FamilyKeyState}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{option}{footheight}
% \changes{v3.12}{2013/03/26}{added}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% Instead of setting the height of the page head or footer by the number of
% base lines, we can set it also using a length or length value. Note, via
% \cs{documenclass} or \cs{usepackage} only length values are supported
@@ -1140,8 +1208,8 @@
\endgroup
\def\ta at hh{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{headheight}{#1}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{headlines}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{headheight}{#1}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{headlines}%
}
\KOMA at key{footheight}{%
\begingroup
@@ -1149,8 +1217,8 @@
\endgroup
\def\ta at fh{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{footheight}{#1}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{footlines}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{footheight}{#1}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{footlines}%
}
%</package&typearea&options>
% \end{macrocode}
@@ -1165,6 +1233,7 @@
% \changes{v2.95}{2002/07/08}{new implementation using \pkg{keyval}}
% \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} replaced by \cs{PackageInfoNoLine}}
% \changes{v3.01a}{2008/11/21}{deprecated}
+% \changes{v3.99}{2022/11/16}{not with \KOMAScript~4}
% \begin{macro}{\if at hincl,\@hincltrue,\@hinclfalse}
% \changes{v2.95}{2002/07/08}{new implementation using \pkg{keyval}}
% \changes{v2.97c}{2007/04/19}{direct initialization via \cs{if at hsl},
@@ -1174,7 +1243,7 @@
%<*package&typearea&options>
\newif\if at hincl\@ifundefined{if at hsl}{}{\let\if at hincl\if at hsl}
\KOMA at ifkey{headinclude}{@hincl}
-\KOMA at DeclareDeprecatedOption[typearea]{headexclude}{headinclude=false}
+%<!v4>\KOMA at DeclareDeprecatedOption[typearea]{headexclude}{headinclude=false}
%</package&typearea&options>
% \end{macrocode}
% \end{macro}
@@ -1183,6 +1252,8 @@
%
% \begin{option}{headsepline}
% \changes{v3.20}{2015/12/12}{\pkg*{typearea} itself reacts on \opt{headsepline}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% Until \KOMAScript{} v3.20 \pkg*{typearea} was not able to handle
% sequences of options \opt{headsepline} and \opt{headinclude} to get
% always a correct result. Until v3.18a \opt{headinclude} was prioritized
@@ -1204,7 +1275,7 @@
\KOMA at key{headsepline}[true]{%
\KOMA at set@ifkey{headinclude}{@hincl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.typearea.\scr at pkgextension}{headinclude}{@hincl}%
+ \KOMA at kav@replacebool{typearea.\scr at pkgextension}{headinclude}{@hincl}%
\fi
}
%</package&typearea&options>
@@ -1217,18 +1288,19 @@
% \changes{v2.95}{2002/07/08}{new implementation using \pkg{keyval}}
% \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} replaced by \cs{PackageInfoNoLine}}
% \changes{v3.01a}{2008/11/21}{deprecated}
+% \changes{v3.99}{2022/11/16}{not with \KOMAScript~4}
% This options determines whether or not the page footer is part of the typing
% area.
% \begin{macro}{\if at fincl,\@fincltrue,\@finclfalse}
% \changes{v2.95}{2002/07/08}{new implementation using \pkg{keyval}}
% \changes{v2.97c}{2007/04/19}{direct initialization via \cs{if at fsl},
-% if already defined}
+% if already defined}
% We use a boolean switch to store the decision.
% \begin{macrocode}
%<*package&typearea&options>
\newif\if at fincl\@ifundefined{if at fsl}{}{\let\if at fincl\if at fsl}
\KOMA at ifkey{footinclude}{@fincl}
-\KOMA at DeclareDeprecatedOption[typearea]{footexclude}{footinclude=false}
+%<!v4>\KOMA at DeclareDeprecatedOption[typearea]{footexclude}{footinclude=false}
%</package&typearea&options>
% \end{macrocode}
% \end{macro}
@@ -1238,6 +1310,8 @@
% \begin{option}{footsepline}
% \changes{v3.23}{2017/03/03}{has to set \cs{if at fincl} instead of \cs{if at hincl}}
% \changes{v3.20}{2015/12/12}{\pkg*{typearea} itself reacts on \opt{footsepline}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% Until \KOMAScript{} v3.20 \pkg*{typearea} was not able to handle
% sequences of options \opt{footsepline} and \opt{footinclude} to get
% always a correct result. Until v3.18a \opt{footinclude} was prioritized
@@ -1259,7 +1333,7 @@
\KOMA at key{footsepline}[true]{%
\KOMA at set@ifkey{footinclude}{@fincl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.typearea.\scr at pkgextension}{footinclude}{@fincl}%
+ \KOMA at kav@replacebool{typearea.\scr at pkgextension}{footinclude}{@fincl}%
\fi
}
%</package&typearea&options>
@@ -1274,6 +1348,7 @@
% \changes{v2.95}{2002/07/08}{new implementation using \pkg{keyval}}
% \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} replaced by \cs{PackageInfoNoLine}}
% \changes{v3.01a}{2008/11/21}{deprecated}
+% \changes{v3.99}{2022/11/16}{not with \KOMAScript~4}
% Some documents have a lot of large margin notes. Optical these margin notes
% are more part of the typing area than the margin. This options determines
% whether or not margin notes should be part of the typing area.
@@ -1284,7 +1359,7 @@
% \begin{macrocode}
%<*package&typearea&options>
\KOMA at ifkey{mpinclude}{@mincl}
-\KOMA at DeclareDeprecatedOption[typearea]{mpexclude}{mpinclude=false}
+%<!v4>\KOMA at DeclareDeprecatedOption[typearea]{mpexclude}{mpinclude=false}
%</package&typearea&options>
% \end{macrocode}
% \end{macro}
@@ -1382,7 +1457,7 @@
%<*package&typearea&body>
\newcommand*{\ta at divfor}[1]{%
\ta at div=\z@
- \expandafter\ifnum\scr at ta@v at is@ge{3.25}\relax
+%<!v4> \expandafter\ifnum\scr at ta@v at is@ge{3.25}\relax
\ifnum \z@=\ifdim \paperwidth<207mm \z@\else\ifdim \paperwidth>213mm \z@
\else\ifdim \paperheight<294mm \z@\else
\ifdim \paperheight>300mm \z@\else \@ne\fi\fi\fi\fi
@@ -1393,7 +1468,7 @@
}%
\ta at div=\tw@
\fi
- \fi
+%<!v4> \fi
\if at mincl
\PackageInfo{typearea}{%
With option `mpinclude' there are no predefined\MessageBreak
@@ -1552,6 +1627,8 @@
% \changes{v2.95}{2002/12/04}{new implementation using \pkg{keyval}}
% \changes{v3.12}{2013/03/05}{status signaling using \cs{FamilyKeyState}}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% The value is written into the length \cs{ta at bcor}. Several symbolic values
% are supported that have to be converted into a length. Note, while loading
% the package symbolic values are nonsense.
@@ -1562,7 +1639,7 @@
\setlength{\ta at bcor}{#1}%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{BCOR}{#1}%
+ \KOMA at kav@xreplacevalue{typearea.\scr at pkgextension}{BCOR}{#1}%
}
% \end{macrocode}
% After loading the package we have to do a little bit more, because we need
@@ -1574,7 +1651,7 @@
\KOMA at key{BCOR}{%
\typearea[{#1}]{last}
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{BCOR}{#1}%
+ \KOMA at kav@xreplacevalue{typearea.\scr at pkgextension}{BCOR}{#1}%
}%
}
%</package&typearea&options>
@@ -1585,6 +1662,8 @@
% \changes{v2.2a}{1995/01/25}{new option}
% \changes{v2.95}{2002/12/04}{new implementation using \pkg{keyval}}
% \changes{v3.12}{2013/03/05}{status signaling using \cs{FamilyKeyState}}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% The value is written into the counter \cs{ta at div}. Several symbolic values
% are supported and have to be converted into a counter. Note, while loading
% the package symbolic values are nonsense.
@@ -1625,7 +1704,7 @@
\FamilyKeyStateUnknownValue
\else
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{DIV}{\@tempa}%
+ \KOMA at kav@xreplacevalue{typearea.\scr at pkgextension}{DIV}{\@tempa}%
\fi
}
% \end{macrocode}
@@ -1638,7 +1717,7 @@
\KOMA at key{DIV}{%
\typearea[current]{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{DIV}{#1}%
+ \KOMA at kav@xreplacevalue{typearea.\scr at pkgextension}{DIV}{#1}%
}%
}
%</package&typearea&options>
@@ -1645,6 +1724,46 @@
% \end{macrocode}
% \end{option}
%
+% \begin{option}{typeareawarninfolimit,typeareawarnlimit,typeareainfolimit}
+% \changes{v3.39}{2023/02/10}{added}
+% \begin{macro}{\ta at warnlimit,\ta at infolimit}
+% \changes{v3.39}{2023/02/10}{added}
+% This option can be used to set the warning limits for inappropriate
+% typesetting settings. There are two limits, one for too small text area and
+% one for too large text area. They values are integer percentages. By default
+% both of them are 15. Negative values deactivate the warning messages.
+% \begin{macrocode}
+%<*package&typearea&options>
+\newcommand*{\ta at warnlimit}{\numexpr 15\relax}
+\newcommand*{\ta at infolimit}{\numexpr 15\relax}
+\KOMA at key{typeareawarnlimit}{%
+ \FamilySetCounterMacro{KOMA}{typeareawarnlimit}{\ta at warnlimit}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{typeareawarninfolimit}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{typeareawarnlimit}{#1}%
+ \fi
+}
+\KOMA at key{typeareainfolimit}{%
+ \FamilySetCounterMacro{KOMA}{typeareainfolimit}{\ta at infolimit}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{typeareawarninfolimit}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{typeareainfolimit}{#1}%
+ \fi
+}
+\KOMA at key{typeareawarninfolimit}{%
+ \FamilySetCounterMacro{KOMA}{typeareawarninfolimit}{\ta at warnlimit}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \let\ta at infolimit\ta at warnlimit
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{typeareawarninfolimit}{#1}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{typeareawarnlimit}{#1}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{typeareainfolimit}{#1}%
+ \fi
+}
+%</package&typearea&options>
+% \end{macrocode}
+% \end{macro}
+% \end{option}
+%
% \begin{command}{\typearea}
% This is the real reason for the package: calculation of typing area and
% margins providing an optional binding correction and depending on a
@@ -1708,11 +1827,11 @@
% binding correction with \opt{twoside=semi} is always added to the left
% margin.
% \begin{macrocode}
- \expandafter\ifnum\scr at ta@v at is@lt{3.12}\relax
- \evensidemargin=\oddsidemargin
- \else
+%<!v4> \expandafter\ifnum\scr at ta@v at is@lt{3.12}\relax
+%<!v4> \evensidemargin=\oddsidemargin
+%<!v4> \else
\advance\evensidemargin by1.5\ta at hblk
- \fi
+%<!v4> \fi
\else
\advance\oddsidemargin by\ta at hblk
\advance\oddsidemargin by\ta at bcor
@@ -1945,9 +2064,9 @@
% \opt{parskip} settings. Before |\begin{document}| the change will be done
% automatically at |\begin{document}| and therefore adding it here is correct.
% \begin{macrocode}
- \expandafter\ifnum\scr at ta@v at is@ge{3.17}%
+%<!v4> \expandafter\ifnum\scr at ta@v at is@ge{3.17}%
\csname par at updaterelative\endcsname
- \fi
+%<!v4> \fi
\fi
% \end{macrocode}
% \changes{v3.17}{2015/02/07}{new code for option \opt{usegeometry}}
@@ -2328,6 +2447,8 @@
% \changes{v3.26}{2018/07/16}{warning about long lines changed}
% \changes{v3.26}{2018/07/16}{warning about small lines changed and
% replaced by an info}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% Last but not least we write some layout values into the \file{log} file. For
% some of the information we need additional calculations, e.g., of a good
% line width.
@@ -2351,23 +2472,26 @@
\else
\advance\@tempcnta by-4
\fi
- \ifnum\@tempcnta <-15
- \@tempcnta=-\@tempcnta
- \PackageWarningNoLine{typearea}{%
- Bad type area settings!\MessageBreak
- The detected line width is about
- \the\@tempcnta\@percentchar\MessageBreak
- larger than the heuristically estimated maximum\MessageBreak
- limit of typographical good line width.\MessageBreak
- You should e.g.
- \ifnum\ta at div >6 decrease DIV, \fi
- \ifdim\f at size\p@<\@xiipt\p@ increase fontsize\else
- (increase fontsize)\fi\MessageBreak
- or change papersize%
- }%
- \@tempcnta=-\@tempcnta
- \else
- \ifnum\@tempcnta>15
+ \ifnum \ta at warnlimit<\z@\else
+ \ifnum\@tempcnta <-\numexpr \ta at warnlimit\relax
+ \@tempcnta=-\@tempcnta
+ \PackageWarningNoLine{typearea}{%
+ Bad type area settings!\MessageBreak
+ The detected line width is about
+ \the\@tempcnta\@percentchar\MessageBreak
+ larger than the heuristically estimated maximum\MessageBreak
+ limit of typographical good line width.\MessageBreak
+ You should e.g.
+ \ifnum\ta at div >6 decrease DIV, \fi
+ \ifdim\f at size\p@<\@xiipt\p@ increase fontsize\else
+ (increase fontsize)\fi\MessageBreak
+ or change papersize%
+ }%
+ \@tempcnta=-\@tempcnta
+ \fi
+ \fi
+ \ifnum \ta at infolimit<\z@\else
+ \ifnum\@tempcnta>\numexpr \ta at infolimit\relax
\PackageInfoNoLine{typearea}{%
Maybe no optimal type area settings!\MessageBreak
The detected line width is about
@@ -2378,7 +2502,8 @@
\ifdim\f at size\p@>\@xpt\p@, decrease fontsize\fi\MessageBreak
or change the papersize%
}%
- \fi\fi
+ \fi
+ \fi
\ifnum\ta at div <6
\PackageWarningNoLine{typearea}{%
Very low DIV value!\MessageBreak
@@ -2389,10 +2514,10 @@
}
\fi
\ta at layoutinfo{\number\ta at div}{\the\@tempcnta}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{DIV}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{DIV}{\@lastdiv}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{BCOR}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{BCOR}{\the\ta at bcor}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{DIV}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{DIV}{\@lastdiv}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{BCOR}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{BCOR}{\the\ta at bcor}%
\@typearea at end
\activateareas
\ifdim \dimexpr 1in+\topmargin
@@ -2631,14 +2756,16 @@
% \changes{v2.96}{2006/09/12}{set \cs{topskip}}
% \changes{v3.00}{2008/10/08}{use \cs{ta at layoutinfo} to write layout
% information into the \file{log} file}
+% \changes{v3.39}{2022/11/11}{initial dot removed from member argument of
+% option storage commands}
% \begin{macrocode}
\setlength{\textwidth}{#2}%
\setlength{\textheight}{#3}%
\def\@lastdiv{areaset}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{DIV}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{DIV}{areaset}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{BCOR}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{BCOR}{\the\ta at bcor}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{DIV}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{DIV}{areaset}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{BCOR}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{BCOR}{\the\ta at bcor}%
\ta at hblk=\paperwidth
\advance\ta at hblk by-\ta at bcor
\advance\ta at hblk by-\textwidth
@@ -2669,11 +2796,11 @@
% to the inner margin. If compatibility to version less than 3.12 has been
% selected the binding correction will be added to the left margin.
% \begin{macrocode}
- \expandafter\ifnum\scr at ta@v at is@lt{3.12}\relax
- \evensidemargin=\oddsidemargin
- \else
+%<!v4> \expandafter\ifnum\scr at ta@v at is@lt{3.12}\relax
+%<!v4> \evensidemargin=\oddsidemargin
+%<!v4> \else
\advance\evensidemargin by1.5\ta at hblk
- \fi
+%<!v4> \fi
\else
\advance\oddsidemargin by\ta at hblk
\advance\oddsidemargin by\ta at bcor
@@ -2825,12 +2952,13 @@
% \changes{v2.95}{2002/12/04}{implemented using option \opt{DIV}}
% \changes{v2.97d}{2007/10/03}{\cs{PackageInfo} replaced by \cs{PackageInfoNoLine}}
% \changes{v3.01a}{2008/11/21}{deprecated}
+% \changes{v3.99}{2022/11/16}{not with \KOMAScript~4}
% The former form of \opt{DIV=}\opt{calc} and \opt{DIV=}\opt{classic}.
% \begin{macrocode}
-%<*package&typearea&options>
+%<*package&typearea&options&!v4>
\KOMA at DeclareDeprecatedOption[typearea]{DIVcalc}{DIV=calc}
\KOMA at DeclareDeprecatedOption[typearea]{DIVclassic}{DIV=classic}
-%</package&typearea&options>
+%</package&typearea&options&!v4>
% \end{macrocode}
% \end{option}^^A DIVcalc,DIVclassic
%
@@ -2877,11 +3005,11 @@
% \changes{v2.97e}{2007/10/23}{landscape or portrait}
% \changes{v3.22}{2016/07/29}{adapting paper orientation}
% \begin{macrocode}
- \expandafter\ifnum\scr at ta@v at is@ge{3.22}\relax
+%<!v4> \expandafter\ifnum\scr at ta@v at is@ge{3.22}\relax
\scr at setpaperorientation
- \else
- \if at landscape\scr at switchpapersizes\fi
- \fi
+%<!v4> \else
+%<!v4> \if at landscape\scr at switchpapersizes\fi
+%<!v4> \fi
}
% \end{macrocode}
% \pkg*{typearea} uses its own error message.
@@ -2995,6 +3123,7 @@
% \changes{v3.30}{2020/03/24}{avoid error message for unknown \opt{BCOR}
% value to \cs{documentclass}}
% \changes{v3.31}{2020/04/27}{improved valid value recognization}
+% \changes{v3.99}{2022/11/16}{deprecated option not with \KOMAScript~4}
% \begin{macrocode}
%<*class>
\Ifstrstart{#2}{=}{%
@@ -3005,10 +3134,12 @@
}%
%</class>
%<*package>
- \Ifdimen{#2}{%
- \KOMA at UseDeprecatedOption{%
- \PackageWarningNoLine{typearea}}{BCOR#2}{BCOR=#2}%
- }{\scr at pti@nerr at r}%
+%<!v4> \Ifdimen{#2}{%
+%<!v4> \KOMA at UseDeprecatedOption{%
+%<!v4> \PackageWarningNoLine{typearea}}{BCOR#2}{BCOR=#2}%
+%<!v4> }{%
+ \scr at pti@nerr at r
+%<!v4> }%
%</package>
% \end{macrocode}
% In all other cases it is not this option. So we report an error. Instead of
@@ -3029,6 +3160,7 @@
% \changes{v3.30}{2020/03/24}{avoid error message for unknown \opt{DIV}
% value to \cs{documentclass}}
% \changes{v3.31}{2020/04/27}{improved valid value recognization}
+% \changes{v3.99}{2022/11/16}{deprecated option not with \KOMAScript~4}
% Here we use more or less the same functionality as with \cs{@BCOR} and \cs{@@BCOR}.
% \begin{macrocode}
\newcommand*{\@DIV}{\expandafter\@@DIV\CurrentOption DIVDIV\@@DIV}
@@ -3045,10 +3177,12 @@
}%
%</class>
%<*package>
- \Ifnumber{#2}{%
- \KOMA at UseDeprecatedOption{%
- \PackageWarningNoLine{typearea}}{DIV#2}{DIV=#2}%
- }{\scr at pti@nerr at r}%
+%<!v4> \Ifnumber{#2}{%
+%<!v4> \KOMA at UseDeprecatedOption{%
+%<!v4> \PackageWarningNoLine{typearea}}{DIV#2}{DIV=#2}%
+%<!v4> }{%
+ \scr at pti@nerr at r
+%<!v4> }%
%</package>
\else\scr at pti@nerr at r\fi
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-variables.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-variables.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-variables.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-variables.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z 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${\def\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-11-09 11:07:16 +0100 (Mi, 09. Nov 2022) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3981 $
\xdef\fileinfo{\filedate\space\filerevision\space}
\edef\reserved at a{%
\noexpand\endgroup
@@ -124,9 +124,9 @@
\expandafter\let\csname scr@#2 at var\endcsname=\@empty
\if at tempswa\addtoreffields{#2}\fi
}{%
-%<class> \ClassError{scrlttr2%
-%<package> \PackageError{scrletter%
- }{%
+%<class> \ClassError{scrlttr2}
+%<package> \PackageError{scrletter}
+ {%
This should never happen%
}{%
The contents of the KOMA-Script variable `#2'\MessageBreak
@@ -136,9 +136,9 @@
}%
}%
}{%
-%<class> \ClassError{scrlttr2%
-%<package> \PackageError{scrletter%
- }{%
+%<class> \ClassError{scrlttr2}
+%<package> \PackageError{scrletter}
+ {%
Variable `#2' already defined%
}{%
I'll ignore this command, if you'll continue.%
@@ -216,9 +216,9 @@
% (\texttt{\#2}), used by \cs{setkomavar} or \cs{usekomavar}.
% \begin{macrocode}
\newcommand*{\@komavar at err}[2]{%
-%<class> \ClassError{scrlttr2%
-%<package> \PackageError{scrletter%
- }{%
+%<class> \ClassError{scrlttr2}
+%<package> \PackageError{scrletter}
+ {%
KOMA-Script variable not defined%
}{%
You've tried to #1 the not defined KOMA-Script variable
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-version.dtx 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z 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
@@ -33,6 +33,7 @@
% \changes{v3.36}{2022/02/11}{switch over from \cls*{scrdoc} to
% \cls*{koma-script-source-doc}}
% \changes{v3.36}{2022/02/11}{whole implementation documentation in English}
+% \changes{v3.99}{2022/10/25}{prepared to generate experimental \KOMAScript~4}
%
% \GetFileInfo{scrkernel-version.dtx}
% \title{The Version of the \href{https://komascript.de}{\KOMAScript} Kernel
@@ -138,7 +139,10 @@
% Note: Following line will be patched by \file{makebetaorrelase.sh} and
% therefore the syntax or general structure of the line must not be changed!
% \begin{macrocode}
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+%<*!v4>
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
+%</!v4>
+%<v4> \@nameuse{@CheckKOMAScriptVersion}{2023/04/17 v3.39 KOMA-Script}%
\endgroup
% \end{macrocode}
% \end{macro}
@@ -196,16 +200,16 @@
% several classes without using always class specific code.
% \begin{macrocode}
%<*class>
-\newcommand*{\KOMAClassName}{%
-%<article|(letter&long)> scrartcl%
-%<report> scrreprt%
-%<book> scrbook%
-%<letter&!long> scrlttr2%
-}
+%<*!v4>
+%<article|(letter&long)>\newcommand*{\KOMAClassName}{scrartcl}
+%<report>\newcommand*{\KOMAClassName}{scrreprt}
+%<book>\newcommand*{\KOMAClassName}{scrbook}
+%<letter&!long>\newcommand*{\KOMAClassName}{scrlttr2}
%<*!long>
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
%</!long>
+%</!v4>
\newcommand*{\ClassName}{%
%<article|(letter&long)> article%
%<report> report%
@@ -214,11 +218,17 @@
}
%<*long>
\newcommand*{\KOMALongClassName}{}
+%<*!v4>
%<!letter>\edef\KOMALongClassName{scr\ClassName}
%<letter>\def\KOMALongClassName{scrletter}
+%</!v4>
\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
\edef\KOMALongClassFileName{\KOMALongClassFileName}
%</long>
+%<*v4>
+\edef\KOMAClassName{scr\ClassName4}
+\edef\KOMAClassFileName{\KOMAClassName.\@clsextension}
+%</v4>
% \end{macrocode}
% \end{command}
% \end{command}
@@ -235,7 +245,8 @@
%<letter>\providecommand*{\@ptsize}{12}
\expandafter\let\expandafter\KOMAClassName\expandafter\relax
\expandafter\LoadClassWithOptions\expandafter{\KOMAClassName}
-%<letter>\RequirePackage{scrletter}
+%<letter&!v4>\RequirePackage{scrletter}
+%<letter&v4>\RequirePackage{scrletter4}
%</long>
%</class>
% \end{macrocode}
@@ -242,7 +253,8 @@
%
% \begin{macrocode}
%<*package&letter>
-\ProvidesPackage{scrletter}[%
+%<!v4>\ProvidesPackage{scrletter}[%
+%<v4>\ProvidesPackage{scrletter4}[%
%!KOMAScriptVersion
letter package extending any KOMA-Script class%
]
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrlayer-scrpage.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -27,9 +27,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-09 14:11:14 +0200 (Do, 09. Jun 2022) $
+ \filedate$Date: 2023-02-02 12:11:34 +0100 (Do, 02. Feb 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3889 $
+ \filerevision$Revision: 4013 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrlayer-scrpage.dtx}%
@@ -180,11 +180,15 @@
% \begin{option}{headwidth}
% \changes{v0.9.1757}{2014/04/09}{new: two offsets available}
% \changes{v3.17}{2015/02/25}{new: store the values}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{option}{footwidth}
% \changes{v0.9.1757}{2014/04/09}{new: two offsets available}
% \changes{v3.15}{2014/12/28}{fix: missing colon in call of
% \cs{sls at split@at at iicolons}}
% \changes{v3.17}{2015/02/25}{new: store the values}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{description}
% \item[\texttt{=\meta{special dimensional expression}:\meta{special
% dimensional expression}}:] see \cs{sls at settowidthof} for information about
@@ -208,7 +212,7 @@
\noexpand\endgroup
\noexpand\sls at set@hf at width{head}{\reserved at b}{\reserved at c}{\reserved at a}%
\noexpand\FamilyKeyStateProcessed
- \noexpand\KOMA at kav@replacevalue{.scrlayer-scrpage.sty}{headwidth}{%
+ \noexpand\KOMA at kav@replacevalue{scrlayer-scrpage.sty}{headwidth}{%
\reserved at a:\reserved at b:\reserved at c
}%
}%
@@ -222,7 +226,7 @@
\noexpand\endgroup
\noexpand\sls at set@hf at width{foot}{\reserved at b}{\reserved at c}{\reserved at a}%
\noexpand\FamilyKeyStateProcessed
- \noexpand\KOMA at kav@replacevalue{.scrlayer-scrpage.sty}{footwidth}{%
+ \noexpand\KOMA at kav@replacevalue{scrlayer-scrpage.sty}{footwidth}{%
\reserved at a:\reserved at b:\reserved at c
}%
}%
@@ -294,8 +298,15 @@
\addtolength{\@tempdima}{-\csname sls@#1width\endcsname}%
\Ifstr{#2}{}{%
\ifdim \csname sls@#1width\endcsname
- = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax
- \setlength{\@tempdimb}{\z@}
+ = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax
+% \end{macrocode}
+% \changes{3.39}{2023/02/02}{offset depends on \cs{reversemarginpar}}
+% \begin{macrocode}
+ \if at reversemargin
+ \setlength{\@tempdimb}{-\dimexpr \marginparwidth+\marginparsep\relax}%
+ \else
+ \setlength{\@tempdimb}{\z@}%
+ \fi
\else
\if at twoside
\setlength{\@tempdimb}{.3333333333\@tempdima}%
@@ -329,6 +340,8 @@
% \end{macro}^^A \sls at set@hf at width
% \begin{macro}{\sls at headwidth,\sls at oddheadshift,\sls at evenheadshift,
% \sls at footwidth,\sls at oddfootshift,\sls at evenfootshift}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% To store width and offset of page head an footer, we use macros. Those are
% also used by the options and therefore need to be initialised before option
% usage.
@@ -335,19 +348,19 @@
% \begin{macrocode}
\scr at ifundefinedorrelax{@headwidth}{%
\newcommand*{\sls at headwidth}{\textwidth}%
- \KOMA at kav@add{.scrlayer-scrpage.sty}{headwidth}{\textwidth:0pt:0pt}%
+ \KOMA at kav@add{scrlayer-scrpage.sty}{headwidth}{\textwidth:0pt:0pt}%
}{%
\newcommand*{\sls at headwidth}{\@headwidth}%
- \KOMA at kav@xadd{.scrlayer-scrpage.sty}{headwidth}{\@headwidth:0pt:0pt}%
+ \KOMA at kav@xadd{scrlayer-scrpage.sty}{headwidth}{\@headwidth:0pt:0pt}%
}%
\newcommand*{\sls at oddheadshift}{0pt}
\newcommand*{\sls at evenheadshift}{0pt}
\scr at ifundefinedorrelax{@footwidth}{%
\newcommand*{\sls at footwidth}{\textwidth}%
- \KOMA at kav@add{.scrlayer-scrpage.sty}{footwidth}{\textwidth:0pt:0pt}
+ \KOMA at kav@add{scrlayer-scrpage.sty}{footwidth}{\textwidth:0pt:0pt}
}{%
\newcommand*{\sls at footwidth}{\@footwidth}%
- \KOMA at kav@xadd{.scrlayer-scrpage.sty}{footwidth}{\@footwidth:0pt:0pt}
+ \KOMA at kav@xadd{scrlayer-scrpage.sty}{footwidth}{\@footwidth:0pt:0pt}
}%
\newcommand*{\sls at oddfootshift}{0pt}
\newcommand*{\sls at evenfootshift}{0pt}
@@ -505,6 +518,8 @@
% \end{macrocode}
% \begin{macro}{\sls at set@values}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{description}
% \item[\oarg{option name}:] either empty or the name of the option that sets
% the line,
@@ -567,7 +582,7 @@
\reserved at b
\FamilyKeyStateProcessed
\Ifstr{#1}{}{}{%
- \KOMA at kav@xreplacevalue{.scrlayer-scrpage.sty}{#1}{%
+ \KOMA at kav@xreplacevalue{scrlayer-scrpage.sty}{#1}{%
\csname sls@#2#3 at linethickness\endcsname
:\csname sls@#2#3 at linelength\endcsname
}%
@@ -606,6 +621,8 @@
% \sls at headbelow@linelength,\sls at headbelow@linethickness,
% \sls at footabove@linelength,\sls at footabove@linethickness,
% \sls at footbelow@linelength,\sls at footbelow@linethickness}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% To store length and thickness of the lines at the page head an footer, we
% use macros. Those are also used by the options and therefore need to be
% initialised before option usage.
@@ -612,25 +629,25 @@
% \begin{macrocode}
\newcommand*{\sls at headabove@linelength}{\sls at headwidth}%
\newcommand*{\sls at headabove@linethickness}{0pt}%
-\KOMA at kav@xadd{.scrlayer-scrpage.sty}{headtopline}{%
+\KOMA at kav@xadd{scrlayer-scrpage.sty}{headtopline}{%
\expandafter\noexpand\sls at headabove@linethickness:%
\expandafter\noexpand\sls at headabove@linelength
}
\newcommand*{\sls at headbelow@linelength}{\sls at headwidth}%
\newcommand*{\sls at headbelow@linethickness}{0pt}%
-\KOMA at kav@xadd{.scrlayer-scrpage.sty}{headsepline}{%
+\KOMA at kav@xadd{scrlayer-scrpage.sty}{headsepline}{%
\expandafter\noexpand\sls at headbelow@linethickness:%
\expandafter\noexpand\sls at headbelow@linelength
}
\newcommand*{\sls at footabove@linelength}{\sls at footwidth}%
\newcommand*{\sls at footabove@linethickness}{0pt}%
-\KOMA at kav@xadd{.scrlayer-scrpage.sty}{footsepline}{%
+\KOMA at kav@xadd{scrlayer-scrpage.sty}{footsepline}{%
\expandafter\noexpand\sls at footabove@linethickness:%
\expandafter\noexpand\sls at footabove@linelength
}
\newcommand*{\sls at footbelow@linelength}{\sls at footwidth}%
\newcommand*{\sls at footbelow@linethickness}{0pt}%
-\KOMA at kav@xadd{.scrlayer-scrpage.sty}{footbotline}{%
+\KOMA at kav@xadd{scrlayer-scrpage.sty}{footbotline}{%
\expandafter\noexpand\sls at footbelow@linethickness:%
\expandafter\noexpand\sls at footbelow@linelength
}
@@ -666,6 +683,8 @@
%
% \begin{option}{ilines,clines,olines}
% \changes{v3.17}{2015/02/25}{storing values}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\sls at hfline@adjust}
% Maybe it would be more useful to be able to adjust each line on its own or
% at most to define an offset. But \pkg{scrpage2} supports only these
@@ -674,15 +693,15 @@
% \begin{macrocode}
%<*options>
\newcommand*{\sls at hfline@adjust}{0}%
-\KOMA at kav@add{.scrlayer-scrpage.sty}{ilines}{}
+\KOMA at kav@add{scrlayer-scrpage.sty}{ilines}{}
\KOMA at key{ilines}[]{%
\ifx\relax#1\relax
\renewcommand*{\sls at hfline@adjust}{0}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{ilines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{clines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{olines}%
- \KOMA at kav@add{.scrlayer-scrpage.sty}{ilines}{}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{ilines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{clines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{olines}%
+ \KOMA at kav@add{scrlayer-scrpage.sty}{ilines}{}%
\else
\def\FamilyKeyStateProcessed{unexpected value}%
\fi
@@ -691,10 +710,10 @@
\ifx\relax#1\relax
\renewcommand*{\sls at hfline@adjust}{1}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{ilines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{clines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{olines}%
- \KOMA at kav@add{.scrlayer-scrpage.sty}{clines}{}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{ilines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{clines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{olines}%
+ \KOMA at kav@add{scrlayer-scrpage.sty}{clines}{}%
\else
\def\FamilyKeyStateProcessed{unexpected value}%
\fi
@@ -703,15 +722,15 @@
\ifx\relax#1\relax
\renewcommand*{\sls at hfline@adjust}{2}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{ilines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{clines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{olines}%
- \KOMA at kav@add{.scrlayer-scrpage.sty}{olines}{}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{ilines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{clines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{olines}%
+ \KOMA at kav@add{scrlayer-scrpage.sty}{olines}{}%
\else
\def\FamilyKeyStateProcessed{unexpected value}%
\fi
}
-\KOMA at kav@add{.scrlayer-scrpage.sty}{ilines}{}
+\KOMA at kav@add{scrlayer-scrpage.sty}{ilines}{}
%</options>
% \end{macrocode}
% \end{macro}^^A \sls at hfline@adjust
@@ -745,6 +764,8 @@
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel at ifnextchar}}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of
+% \cs{KOMAExecuteOptions} removed}
% \begin{macro}{\sls@@@@setline}
% \changes{v3.18}{2015/06/17}{explicit reuse of the current length}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
@@ -770,17 +791,17 @@
\Ifstr{#2}{current}{}{%
\setlength{\@tempdima}{#2}%
\Ifstr{#1}{headabove}{%
- \KOMAExecuteOptions[.scrlayer-scrpage.sty]%
+ \KOMAExecuteOptions[scrlayer-scrpage.sty]%
{headtopline=\@tempdima:\csname sls@#1 at linelength\endcsname}%
}{\Ifstr{#1}{headbelow}{%
- \KOMAExecuteOptions[.scrlayer-scrpage.sty]%
+ \KOMAExecuteOptions[scrlayer-scrpage.sty]%
{headsepline=\@tempdima:\csname sls@#1 at linelength\endcsname}%
}{%
\Ifstr{#1}{footabove}{%
- \KOMAExecuteOptions[.scrlayer-scrpage.sty]%
+ \KOMAExecuteOptions[scrlayer-scrpage.sty]%
{footsepline=\@tempdima:\csname sls@#1 at linelength\endcsname}%
}{%
- \KOMAExecuteOptions[.scrlayer-scrpage.sty]%
+ \KOMAExecuteOptions[scrlayer-scrpage.sty]%
{footbotline=\@tempdima:\csname sls@#1 at linelength\endcsname}%
}%
}%
@@ -996,6 +1017,8 @@
% \end{macrocode}
% \end{macro}^^A \sls at auto@pagestyleset
% \changes{v3.17}{2015/02/25}{storing the values}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macrocode}
%<*options>
\KOMA at key{pagestyleset}{%
@@ -1005,7 +1028,7 @@
\let\sls at auto@pagestyleset\relax
\@nameuse{sls at ps@style@#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.scrlayer-scrpage.sty}{pagestyleset}{#1}%
+ \KOMA at kav@replacevalue{scrlayer-scrpage.sty}{pagestyleset}{#1}%
}%
}
% \end{macrocode}
@@ -1072,14 +1095,17 @@
% \end{option}^^A pagestyleset
%
% \begin{option}{komastyle,standardstyle}
+% \changes{v3.39}{2022/11/16}{only with \KOMAScript~3}
% These options are deprecated, but defined for compatibility with
% \pkg{scrpage2}:
% \begin{macrocode}
%<*options>
-\KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{komastyle}{%
- pagestyleset=KOMA-Script}
-\KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{standardstyle}{%
- pagestyleset=standard}
+\@ifundefined{KOMA at DeclareDeprecatedOption}{}{%
+ \KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{komastyle}{%
+ pagestyleset=KOMA-Script}%
+ \KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{standardstyle}{%
+ pagestyleset=standard}%
+}
%</options>
% \end{macrocode}
% \end{option}^^A komastyle,standardstyle
@@ -1092,13 +1118,16 @@
% option \opt{markcase}.
%
% \begin{option}{markuppercase,markusedcase,nouppercase}
+% \changes{v3.39}{2022/11/16}{only with \KOMAScript~3}
% For compatibility with \pkg{scrpage2}.
% \begin{macrocode}
%<*options>
-\KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{markuppercase}{markcase=upper}
-\KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{markusedcase}{markcase=used}
-\KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{nouppercase}{%
- markcase=ignoreuppercase%
+\@ifundefined{KOMA at DeclareDeprecatedOption}{}{%
+ \KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{markuppercase}{markcase=upper}
+ \KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{markusedcase}{markcase=used}
+ \KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{nouppercase}{%
+ markcase=ignoreuppercase%
+ }
}
%</options>
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -28,9 +28,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-07-19 11:16:17 +0200 (Di, 19. Jul 2022) $
+ \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3945 $
+ \filerevision$Revision: 3985 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrlayer.dtx}%
@@ -307,6 +307,8 @@
% done already by \pkg*{scrlayer}. But not the deprecated options.
%
% \begin{option}{markcase}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{description}
% \item[\texttt{=\meta{setting}}] one of: \texttt{upper}, \texttt{lower},
% \texttt{used}, or \texttt{ignoreuppercase}.
@@ -348,8 +350,8 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{markcase}%
- \KOMA at kav@xadd{.scrlayer.sty}{markcase}{#1}%
+ \KOMA at kav@removekey{scrlayer.sty}{markcase}%
+ \KOMA at kav@xadd{scrlayer.sty}{markcase}{#1}%
\fi
%<interface&scrpage>}%
}
@@ -367,13 +369,13 @@
%<*package&options>
\@ifundefined{MakeMarkcase}{\let\MakeMarkcase\@firstofone}{}
\ifx\MakeMarkcase\@firstofone
- \KOMA at kav@replacevalue{.scrlayer.sty}{markcase}{used}%
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{used}%
\else\ifx\MakeMarkcase\MakeUppercase
- \KOMA at kav@replacevalue{.scrlayer.sty}{markcase}{upper}%
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{upper}%
\else\ifx\MakeMarkcase\MakeLowercase
- \KOMA at kav@replacevalue{.scrlayer.sty}{markcase}{lower}%
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{lower}%
\else\ifx\MakeMarkcase\scr at ignoreuppercase
- \KOMA at kav@replacevalue{.scrlayer.sty}{markcase}{ignoreuppercase}%
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{ignoreuppercase}%
\fi\fi\fi\fi
% \end{macrocode}
% \begin{macro}{\scrlayer at ignoreuppercase}
@@ -595,6 +597,8 @@
% \end{command}^^A \markdouble
%
% \begin{option}{autooneside}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\ifscrlayer at autooneside}
% Decide whether or not use the optional argument of \cs{automark} in
% single-side layout.
@@ -603,12 +607,12 @@
%<*package>
\KOMA at ifkey{autooneside}{scrlayer at autooneside}\scrlayer at autoonesidetrue
\scrlayer@@add at inherited@option{autooneside}
-\KOMA at kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer at autooneside}
+\KOMA at kav@replacebool{scrlayer.sty}{autooneside}{scrlayer at autooneside}
%</package>
%<*interface>
\KOMA at key{autooneside}[true]{%
\KOMA at set@ifkey{autooneside}{scrlayer at autooneside}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer at autooneside}%
+ \KOMA at kav@replacebool{scrlayer.sty}{autooneside}{scrlayer at autooneside}%
}
%</interface>
%</options>
@@ -634,7 +638,9 @@
% handles \opt{autooneside}?
% \end{description}
% \changes{v3.22}{2016/12/07}{prepared for classes without \cs{section} or
-% \cs{subsection}}
+% \cs{subsection}}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macrocode}
%<*options>
\KOMA at key{automark}[]{%
@@ -659,9 +665,9 @@
\fi
}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{automark}%
- \KOMA at kav@removekey{.scrlayer.sty}{manualmark}%
- \KOMA at kav@add{.scrlayer.sty}{automark}{}%
+ \KOMA at kav@removekey{scrlayer.sty}{automark}%
+ \KOMA at kav@removekey{scrlayer.sty}{manualmark}%
+ \KOMA at kav@add{scrlayer.sty}{automark}{}%
}
%<package>\scrlayer@@add at inherited@option{automark}
%</options>
@@ -675,9 +681,9 @@
\scrlayer at testunexpectedarg{manualmark}{#1}%
\scrlayer at AtEndOfPackage{\manualmark}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{automark}%
- \KOMA at kav@removekey{.scrlayer.sty}{manualmark}%
- \KOMA at kav@add{.scrlayer.sty}{manualmark}{}%
+ \KOMA at kav@removekey{scrlayer.sty}{automark}%
+ \KOMA at kav@removekey{scrlayer.sty}{manualmark}%
+ \KOMA at kav@add{scrlayer.sty}{manualmark}{}%
}
%<package>\scrlayer@@add at inherited@option{manualmark}
%</options>
@@ -2307,11 +2313,11 @@
\KOMA at key{onpsselect}{%
\l at addto@macro{\@ps at initialhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsselect}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsselect}{#1}%
}
%<package>\scrlayer@@add at inherited@option{onpsselect}
%<package>\newcommand*{\@ps at initialhook}{}
-%<package>\KOMA at kav@add{.scrlayer.sty}{onpsselect}{}
+%<package>\KOMA at kav@add{scrlayer.sty}{onpsselect}{}
%</options>
%<*interface&body>
\expandafter\let
@@ -2344,11 +2350,11 @@
\KOMA at key{onpsinit}{%
\l at addto@macro{\@ps at hook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsinit}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsinit}{#1}%
}
%<package>\scrlayer@@add at inherited@option{onpsinit}
%<package>\newcommand*{\@ps at hook}{}
-%<package>\KOMA at kav@add{.scrlayer.sty}{onpsinit}{}
+%<package>\KOMA at kav@add{scrlayer.sty}{onpsinit}{}
%</options>
%<*interface&body>
\expandafter\let
@@ -2372,6 +2378,8 @@
% \begin{option}{ononeside}
% \changes{v3.28}{2019/11/28}{marker for \cs{ModifyLayerPageStyleOptions}}
% \begin{option}{onpsoneside}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\@ps at onesidehook}
% \begin{description}
% \item[\opt{=\meta{code}}:] executes \meta{code} after
@@ -2385,11 +2393,11 @@
\KOMA at key{onpsoneside}{%
\l at addto@macro{\@ps at onesidehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsoneside}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsoneside}{#1}%
}
%<package>\scrlayer@@add at inherited@option{onpsoneside}
%<package>\newcommand*{\@ps at onesidehook}{}
-%<package>\KOMA at kav@add{.scrlayer.sty}{onpsoneside}{}
+%<package>\KOMA at kav@add{scrlayer.sty}{onpsoneside}{}
%</options>
%<*interface&body>
\expandafter\let
@@ -2413,6 +2421,8 @@
% \begin{option}{ontwoside}
% \changes{v3.28}{2019/11/28}{marker for \cs{ModifyLayerPageStyleOptions}}
% \begin{option}{onpstwoside}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\@ps at twosidehook}
% \begin{description}
% \item[\opt{=\meta{code}}:] executes \meta{code} after
@@ -2426,11 +2436,11 @@
\KOMA at key{onpstwoside}{%
\l at addto@macro{\@ps at twosidehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpstwoside}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpstwoside}{#1}%
}
%<package>\scrlayer@@add at inherited@option{onpstwoside}
%<package>\newcommand*{\@ps at twosidehook}{}
-%<package>\KOMA at kav@add{.scrlayer.sty}{onpstwoside}{}
+%<package>\KOMA at kav@add{scrlayer.sty}{onpstwoside}{}
%</options>
%<*interface&body>
\expandafter\let
@@ -2454,6 +2464,8 @@
% \begin{option}{onoddpage}
% \changes{v3.28}{2019/11/28}{marker for \cs{ModifyLayerPageStyleOptions}}
% \begin{option}{onpsoddpage}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\@ps at oddpagehook}
% \begin{description}
% \item[\texttt{=\meta{code}}:] executes \meta{code} after
@@ -2467,11 +2479,11 @@
\KOMA at key{onpsoddpage}{%
\l at addto@macro{\@ps at oddpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsoddpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsoddpage}{#1}%
}
%<package>\scrlayer@@add at inherited@option{onpsoddpage}
%<package>\newcommand*{\@ps at oddpagehook}{}
-%<package>\KOMA at kav@add{.scrlayer.sty}{onpsoddpage}{}
+%<package>\KOMA at kav@add{scrlayer.sty}{onpsoddpage}{}
%</options>
%<*interface&body>
\expandafter\let
@@ -2495,6 +2507,8 @@
% \begin{option}{onevenpage}
% \changes{v3.28}{2019/11/28}{marker for \cs{ModifyLayerPageStyleOptions}}
% \begin{option}{onpsevenpage}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\@ps at evenpagehook}
% \begin{description}
% \item[\texttt{=\meta{code}}:] executes \meta{code} after
@@ -2508,11 +2522,11 @@
\KOMA at key{onpsevenpage}{%
\l at addto@macro{\@ps at evenpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsevenpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsevenpage}{#1}%
}
%<package>\scrlayer@@add at inherited@option{onpsevenpage}
%<package>\newcommand*{\@ps at evenpagehook}{}
-%<package>\KOMA at kav@add{.scrlayer.sty}{onpsevenpage}{}
+%<package>\KOMA at kav@add{scrlayer.sty}{onpsevenpage}{}
%</options>
%<*interface&body>
\expandafter\let
@@ -2536,6 +2550,8 @@
% \begin{option}{onfloatpage}
% \changes{v3.28}{2019/11/28}{marker for \cs{ModifyLayerPageStyleOptions}}
% \begin{option}{onpsfloatpage}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\@ps at floatpagehook}
% \begin{description}
% \item[\opt{=\meta{code}}:] executes \meta{code} after
@@ -2547,11 +2563,11 @@
\KOMA at key{onpsfloatpage}{%
\l at addto@macro{\@ps at floatpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsfloatpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsfloatpage}{#1}%
}
%<package>\scrlayer@@add at inherited@option{onpsfloatpage}
%<package>\newcommand*{\@ps at floatpagehook}{}
-%<package>\KOMA at kav@add{.scrlayer.sty}{onpsfloatpage}{}
+%<package>\KOMA at kav@add{scrlayer.sty}{onpsfloatpage}{}
%</options>
%<*interface&body>
\expandafter\let
@@ -2575,6 +2591,8 @@
% \begin{option}{onnonfloatpage}
% \changes{v3.28}{2019/11/28}{marker for \cs{ModifyLayerPageStyleOptions}}
% \begin{option}{onpsnonfloatpage}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\@ps at nonfloatpagehook}
% \begin{description}
% \item[\opt{=\meta{code}}:] executes \meta{code} after
@@ -2586,11 +2604,11 @@
\KOMA at key{onpsnonfloatpage}{%
\l at addto@macro{\@ps at nonfloatpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsnonfloatpage}{#1}%
}
%<package>\scrlayer@@add at inherited@option{onpsnonfloatpage}
%<package>\newcommand*{\@ps at nonfloatpagehook}{}
-%<package>\KOMA at kav@add{.scrlayer.sty}{onpsnonfloatpage}{}
+%<package>\KOMA at kav@add{scrlayer.sty}{onpsnonfloatpage}{}
%</options>
%<*interface&body>
\expandafter\let
@@ -2614,6 +2632,8 @@
% \begin{option}{onbackground}
% \changes{v3.28}{2019/11/28}{marker for \cs{ModifyLayerPageStyleOptions}}
% \begin{option}{onpsbackground}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\@ps at backgroundhook}
% \begin{description}
% \item[\texttt{=\meta{code}}:] executes \meta{code} after
@@ -2627,11 +2647,11 @@
\KOMA at key{onpsbackground}{%
\l at addto@macro{\@ps at backgroundhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsbackground}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsbackground}{#1}%
}
%<package>\scrlayer@@add at inherited@option{onpsbackground}
%<package>\newcommand*{\@ps at backgroundhook}{}
-%<package>\KOMA at kav@add{.scrlayer.sty}{onpsbackground}{}
+%<package>\KOMA at kav@add{scrlayer.sty}{onpsbackground}{}
%</options>
%<*interface&body>
\expandafter\let
@@ -2655,6 +2675,8 @@
% \begin{option}{onforeground}
% \changes{v3.28}{2019/11/28}{marker for \cs{ModifyLayerPageStyleOptions}}
% \begin{option}{onpsforeground}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\@ps at foregroundhook}
% \begin{description}
% \item[\texttt{=\meta{code}}:] executes \meta{code} after
@@ -2668,11 +2690,11 @@
\KOMA at key{onpsforeground}{%
\l at addto@macro{\@ps at foregroundhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsforeground}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsforeground}{#1}%
}
%<package>\scrlayer@@add at inherited@option{onpsforeground}
%<package>\newcommand*{\@ps at foregroundhook}{}
-%<package>\KOMA at kav@add{.scrlayer.sty}{onpsforeground}{}
+%<package>\KOMA at kav@add{scrlayer.sty}{onpsforeground}{}
%</options>
%<*interface&body>
\expandafter\let
@@ -2934,6 +2956,8 @@
%</package&body>
% \end{macrocode}
% \begin{option}{deactivatepagestylelayers}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\ifscrlayer at deactivate@layers}
% \begin{description}
% \item[\marg{simple switch}:] whether or not
@@ -2954,7 +2978,7 @@
%<*interface>
\KOMA at key{deactivatepagestylelayers}[true]{%
\KOMA at set@ifkey{deactivatepagestylelayers}{scrlayer at deactivate@layers}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers}
+ \KOMA at kav@replacebool{scrlayer.sty}{deactivatepagestylelayers}
{scrlayer at deactivate@layers}%
}
%</interface>
@@ -3211,6 +3235,8 @@
% \end{command}^^A \layerpicturemode
%
% \begin{option}{draft}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\ifscrlayer at draft,\scrlayer at drafttrue,\scrlayer at draftfalse}
% \begin{description}
% \item[\marg{simple switch}:] whether or not to use the draft mode,
@@ -3227,7 +3253,7 @@
%<*interface>
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{scrlayer at draft}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{draft}{scrlayer at draft}%
+ \KOMA at kav@replacebool{scrlayer.sty}{draft}{scrlayer at draft}%
}
%</interface>
%</options>
@@ -4246,6 +4272,8 @@
%</package&body>
% \end{macrocode}
% \begin{option}{forceoverwrite}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\ifscrlayer at forceoverwrite}
% \begin{description}
% \item[\marg{simple switch}:] whether or not to overwrite already
@@ -4260,7 +4288,7 @@
%<*interface>
\KOMA at key{forceoverwrite}[true]{%
\KOMA at set@ifkey{forceoverwrite}{scrlayer at forceoverwrite}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer at forceoverwrite}%
+ \KOMA at kav@replacebool{scrlayer.sty}{forceoverwrite}{scrlayer at forceoverwrite}%
}
%</interface>
%</options>
@@ -4275,6 +4303,8 @@
% \end{option}^^A forceoverwrite
%
% \begin{option}{autoremoveinterfaces}
+% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
+% commands removed}
% \begin{macro}{\ifscrlayer at autoremoveinterfaces}
% \begin{description}
% \item[\marg{simple switch}:] whether or not older interfaces may be
@@ -4290,7 +4320,7 @@
\KOMA at key{autoremoveinterfaces}[true]{%
\scrlayer at report@deprecated{#1}{autoremoveinterface}%
\KOMA at set@ifkey{autoremoveinterfaces}{scrlayer at autoremoveinterfaces}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
+ \KOMA at kav@replacebool{scrlayer.sty}{autoremoveinterfaces}
{scrlayer at autoremoveinterfaces}%
}
%</interface>
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrmain.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrmain.ins 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrmain.ins 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,6 +1,6 @@
% ======================================================================
% scrmain.ins
-% Copyright (c) Markus Kohm, 2002-2022
+% Copyright (c) Markus Kohm, 2002-2023
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-% $Id: scrmain.ins 3959 2022-10-10 06:24:48Z kohm $
+% $Id: scrmain.ins 4019 2023-03-31 14:23:35Z kohm $
% ---------- KOMA-Script default docstrip declarations -----------------
@@ -440,7 +440,6 @@
\batchinput{scraddr.dtx}% scraddr.sty
\batchinput{tocbasic.dtx}% tocbasic.sty
\batchinput{scrlayer.dtx}% scrlayer.sty, scrlayer-scrpage.sty ...
-\batchinput{scrwfile.dtx}% scrwfile.sty
\batchinput{scrjura.dtx}% scrjura.sty
% ---------- end of docstrip process -----------------------------------
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrtime.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrtime.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrtime.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -18,15 +18,15 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $
%<package&identify>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
%<*driver>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-09 14:11:14 +0200 (Do, 09. Jun 2022) $
+ \filedate$Date: 2022-11-16 07:52:39 +0100 (Mi, 16. Nov 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3889 $
+ \filerevision$Revision: 3986 $
\endgroup
\ProvidesFile{scrtime.dtx}[\filedate\space\filerevision\space
%</driver>
@@ -133,11 +133,12 @@
% \end{macrocode}
%
% \begin{option}{12h}
-% \changes{v1.1b}{1995/02/15}{Option \opt{12h} added.}
-% \changes{v1.2}{2010/03/10}{Option uses \pkg*{scrkbase}.}
+% \changes{v1.1b}{1995/02/15}{option \opt{12h} added}
+% \changes{v1.2}{2010/03/10}{option uses \pkg*{scrkbase}}
% \begin{option}{24h}
-% \changes{v1.1b}{1995/02/15}{Option \opt{24h} added.}
-% \changes{v1.2}{2010/03/10}{Option is deprecated.}
+% \changes{v1.1b}{1995/02/15}{option \opt{24h} added}
+% \changes{v1.2}{2010/03/10}{option is deprecated}
+% \changes{v3.39}{2022/11/16}{declare deprecated option only with \KOMAScript~3}
% \begin{macro}{\if at Hxii,\@Hxiitrue,\@Hxiifalse}
% \changes{v1.1b}{1995/02/15}{new switch}
% There are two the two Options |24h| and |12h|. We need a switch to
@@ -149,7 +150,9 @@
% So the options are simple.
% \begin{macrocode}
\KOMA at ifkey{12h}{@Hxii}
-\KOMA at DeclareDeprecatedOption[scrtime]{24h}{12h=false}
+\@ifundefined{KOMA at DeclareDeprecatedOption}{}{%
+ \KOMA at DeclareDeprecatedOption[scrtime]{24h}{12h=false}%
+}
% \end{macrocode}
% \end{option}
% \end{option}
@@ -504,7 +507,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at ngerman}
-% \changes{v1.1i}{1999/10/09}{new language ``ngerman''.}
+% \changes{v1.1i}{1999/10/09}{new language ``ngerman''}
% \begin{macrocode}
\newdaylanguage{ngerman}{Montag}{Dienstag}{Mittwoch}
{Donnerstag}{Freitag}{Samstag}{Sonntag}
@@ -511,7 +514,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at naustrian}
-% \changes{v3.08b}{2011/02/22}{new language ``naustrian''.}
+% \changes{v3.08b}{2011/02/22}{new language ``naustrian''}
% \begin{macrocode}
\newdaylanguage{naustrian}{Montag}{Dienstag}{Mittwoch}
{Donnerstag}{Freitag}{Samstag}{Sonntag}
@@ -518,7 +521,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at austrian}
-% \changes{v3.08b}{2011/02/22}{new language ``austrian''.}
+% \changes{v3.08b}{2011/02/22}{new language ``austrian''}
% \begin{macrocode}
\newdaylanguage{austrian}{Montag}{Dienstag}{Mittwoch}
{Donnerstag}{Freitag}{Samstag}{Sonntag}
@@ -525,7 +528,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at swissgerman}
-% \changes{v3.13}{2014/01/23}{new language ``swissgerman''.}
+% \changes{v3.13}{2014/01/23}{new language ``swissgerman''}
% \begin{macrocode}
\newdaylanguage{swissgerman}{Montag}{Dienstag}{Mittwoch}
{Donnerstag}{Freitag}{Samstag}{Sonntag}
@@ -532,7 +535,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at nswissgerman}
-% \changes{v3.13}{2014/01/23}{new language ``nswissgerman''.}
+% \changes{v3.13}{2014/01/23}{new language ``nswissgerman''}
% \begin{macrocode}
\newdaylanguage{nswissgerman}{Montag}{Dienstag}{Mittwoch}
{Donnerstag}{Freitag}{Samstag}{Sonntag}
@@ -540,7 +543,7 @@
% \end{macro}
%
% \begin{macro}{\dayname at american}
-% \changes{v3.13}{2014/01/23}{new language ``american''.}
+% \changes{v3.13}{2014/01/23}{new language ``american''}
% \begin{macrocode}
\newdaylanguage{american}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
@@ -547,7 +550,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at australian}
-% \changes{v3.13}{2014/01/23}{new language ``australian''.}
+% \changes{v3.13}{2014/01/23}{new language ``australian''}
% \begin{macrocode}
\newdaylanguage{australian}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
@@ -554,7 +557,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at british}
-% \changes{v3.13}{2014/01/23}{new language ``british''.}
+% \changes{v3.13}{2014/01/23}{new language ``british''}
% \begin{macrocode}
\newdaylanguage{british}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
@@ -561,7 +564,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at canadian}
-% \changes{v3.13}{2014/01/23}{new language ``canadian''.}
+% \changes{v3.13}{2014/01/23}{new language ``canadian''}
% \begin{macrocode}
\newdaylanguage{canadian}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
@@ -568,7 +571,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at english}
-% \changes{v1.1g}{1997/06/21}{correct name is ``tuesday''.}
+% \changes{v1.1g}{1997/06/21}{correct name is ``tuesday''}
% \begin{macrocode}
\newdaylanguage{english}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
@@ -575,7 +578,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at newzealand}
-% \changes{v3.13}{2014/01/23}{new language ``newzealand''.}
+% \changes{v3.13}{2014/01/23}{new language ``newzealand''}
% \begin{macrocode}
\newdaylanguage{newzealand}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
@@ -582,7 +585,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at UKenglish}
-% \changes{v3.13}{2014/01/23}{new language ``UKenglish''.}
+% \changes{v3.13}{2014/01/23}{new language ``UKenglish''}
% \begin{macrocode}
\newdaylanguage{UKenglish}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
@@ -589,7 +592,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at ukenglish}
-% \changes{v3.24}{2017/05/29}{new language ``ukenglish''.}
+% \changes{v3.24}{2017/05/29}{new language ``ukenglish''}
% \begin{macrocode}
\newdaylanguage{ukenglish}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
@@ -596,7 +599,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at USenglish}
-% \changes{v1.1g}{1997/06/21}{correct name is ``tuesday''.}
+% \changes{v1.1g}{1997/06/21}{correct name is ``tuesday''}
% \begin{macrocode}
\newdaylanguage{USenglish}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
@@ -603,7 +606,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at usenglish}
-% \changes{v3.24}{2017/05/29}{new language ``usenglish''.}
+% \changes{v3.24}{2017/05/29}{new language ``usenglish''}
% \begin{macrocode}
\newdaylanguage{usenglish}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
@@ -611,7 +614,7 @@
% \end{macro}
%
% \begin{macro}{\dayname at acadian}
-% \changes{v3.13}{2014/01/23}{new language ``acadian''.}
+% \changes{v3.13}{2014/01/23}{new language ``acadian''}
% \begin{macrocode}
\newdaylanguage{acadian}{Lundi}{Mardi}{Mercredi}
{Jeudi}{Vendredi}{Samedi}{Dimanche}
@@ -618,7 +621,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at canadien}
-% \changes{v3.13}{2014/01/23}{new language ``canadien''.}
+% \changes{v3.13}{2014/01/23}{new language ``canadien''}
% \begin{macrocode}
\newdaylanguage{canadien}{Lundi}{Mardi}{Mercredi}
{Jeudi}{Vendredi}{Samedi}{Dimanche}
@@ -625,7 +628,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\dayname at francais}
-% \changes{v3.13}{2014/01/23}{new language ``francais''.}
+% \changes{v3.13}{2014/01/23}{new language ``francais''}
% \begin{macrocode}
\newdaylanguage{francais}{Lundi}{Mardi}{Mercredi}
{Jeudi}{Vendredi}{Samedi}{Dimanche}
@@ -726,8 +729,8 @@
%
% If there are no language-definitions, we simply want the US-english names
% of the days.
-% \changes{v1.1g}{1997/06/21}{correct name is ``tuesday''.}
-% \changes{v3.15}{2014/12/11}{default language definition fixed.}
+% \changes{v1.1g}{1997/06/21}{correct name is ``tuesday''}
+% \changes{v3.15}{2014/12/11}{default language definition fixed}
% \begin{macrocode}
\let\@dayname\dayname at english
% \end{macrocode}
Deleted: trunk/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,516 +0,0 @@
-% \iffalse meta-comment
-% ======================================================================
-% scrwfile.dtx
-% Copyright (c) Markus Kohm, 2010-2022
-%
-% This file is part of the LaTeX2e KOMA-Script bundle.
-%
-% This work may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, version 1.3c of the license.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 and of this work.
-%
-% This work has the LPPL maintenance status "author-maintained".
-%
-% The Current Maintainer and author of this work is Markus Kohm.
-%
-% This work consists of all files listed in MANIFEST.md.
-% ======================================================================
-%%% From File: $Id: scrwfile.dtx 3955 2022-10-06 08:13:32Z kohm $
-%<*dtx>
-\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{scrwfile.dtx}
-%</dtx>
-%<(package&identify)|driver>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
-%<package&identify>\ProvidesPackage{scrwfile}
-%<driver>\ProvidesFile{scrwfile.drv}
-%<*dtx|(package&identify)|driver>
- [2022/10/06 v0.1.11 KOMA-Script package (write and clone files)]
-%</dtx|(package&identify)|driver>
-%<*dtx>
-\ifx\documentclass\undefined
- \input scrdocstrip.tex
- \@@input scrkernel-version.dtx
- \@@input scrstrip.inc
- \KOMAdefVariable{COPYRIGHTFROM}{2010}
-
- \generate{\usepreamble\defaultpreamble
- \file{scrwfile.sty}{%
- \from{scrwfile.dtx}{package,scrwfile,identify,option,body}%
- \from{scrlogo.dtx}{logo}%
- }%
- }
-
- \@@input scrstrop.inc
-\else
- \let\endbatchfile\relax
-\fi
-\endbatchfile
-%</dtx>
-%<*driver>
-\documentclass[USenglish]{koma-script-source-doc}
-\usepackage{babel}
-\usepackage{hvlogos}
-\setcounter{StandardModuleDepth}{2}
-\begin{document}
-\DocInput{scrwfile.dtx}
-\end{document}
-%</driver>
-% \fi
-%
-% \changes{v0.1}{2010/10/01}{start of new package}
-% \changes{v0.1.7}{2014/10/13}{manual moved to \KOMAScript{} manual}
-% \changes{v0.1.9}{2021/05/30}{version number scheme changed}
-% \changes{v0.1.10}{2022/02/05}{switch over from \cls*{scrdoc} to
-% \cls*{koma-script-source-doc}}
-%
-% \GetFileInfo{scrwfile.dtx}
-% \title{Saving Write Handles with the Experimental
-% \href{https://komascript.de}{\KOMAScript} Package \pkg*{scrwfile}}
-% \author{\href{mailto:komascript at gmx.info}{Markus Kohm}}
-% \date{Version \fileversion{} of \filedate}
-% \maketitle
-% \begin{abstract}
-% The \TeX{} engines \TeX, \pdfTeX, and \XeTeX{} (but not \LuaTeX) do
-% provide only 16 handles for simultaneously write open files. Some of them
-% are already used by \LaTeX{}. Moreover, for every file using
-% \cs{@starttoc} \LaTeX{} keeps a write file open from usage of
-% \cs{@starttoc}, e.g., inside \cs{tableofcontents}, \cs{listoffigures}
-% etc., until the end of the document. Additional write files are used for
-% the index, glossary etc. So sometimes it happens, that there are not
-% enough handles to open another one. \pkg*{scrwfile} was made to change the
-% \LaTeX{} internal handling of all the helper files bases on \cs{@starttoc}
-% to not keep them open simultaneously, but use only one file handle for all
-% of them. So you should never run out of write file handles.
-% \end{abstract}
-%
-% \section{User Manual}
-%
-% You can find the user manual of \pkg*{scrwfile} in the \KOMAScript{} manual,
-% either the German \file{scrguide} or the English \file{scrguien}. But please
-% note:
-% \begin{quote}\bfseries
-% This is an experimental package. Usage of this package is on your own
-% risk. There is no support, if you are using this package, not only for
-% this package but also for the class you are using or other packages, that
-% use \cs{@starttoc} or \cs{@writefile} like \pkg{caption}, \pkg{float},
-% \pkg*{tocbasic}, \pkg{listings} and many more.
-% \end{quote}
-%
-% \MaybeStop{\PrintIndex}
-%
-%
-% \section{Implementation of \pkg*{scrwfile}}
-%
-% \begin{macrocode}
-%<*package>
-% \end{macrocode}
-%
-% \begin{macrocode}
-%<*identify>
-\PackageWarningNoLine{scrwfile}{%
- THIS IS AN EXPERIMENTAL PACKAGE!\MessageBreak
- USAGE OF THIS PACKAGE IS ON YOUR OWN RISK!\MessageBreak
- EVERYTHING MAY HAPPEN!\MessageBreak
- EVERYTHING MAY CHANGE IN FUTURE!\MessageBreak
- THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!\MessageBreak
- Maybe, it would be better not to load this package%
-}
-%</identify>
-% \end{macrocode}
-%\iffalse
-%\fi
-%
-% \subsection{Options}
-% \iffalse
-%<*option>
-% \fi
-% Currently we don't need options.
-% \iffalse
-%</option>
-% \fi
-%
-% \subsection{Body}
-% \begin{macrocode}
-%<*body>
-% \end{macrocode}
-%
-% \subsubsection{Needed Packages}
-%
-% Package \pkg*{scrbase} is needed, because of using several \KOMAScript{}
-% basic commands.
-% \begin{macrocode}
-\RequirePackage{scrbase}[2010/09/17]
-% \end{macrocode}
-%
-% Package \pkg*{scrlfile} is needed because of the \file{aux}-file
-% handling and \cs{protected at immediate@write}.
-% \begin{macrocode}
-\RequirePackage{scrlfile}[2010/09/30]
-% \end{macrocode}
-%
-% \changes{v0.1.10}{2022/02/04}{\pkg{iftex} is required}
-% Package \pkg{iftex} is used to detect Lua\LaTeX.
-% \begin{macrocode}
-\RequirePackage{iftex}
-% \end{macrocode}
-%
-% \subsubsection{Is is needed?}
-%
-% \changes{v0.1.9}{2021/05/30}{with Lua\LaTeX{} using is not recommended}
-% \changes{v0.1.10}{2022/02/04}{using \cs{ifluatex}}
-% \changes{v0.1.10}{2022/02/04}{\cs{PackageInfoNoLine} replaced by
-% \cs{PackageWarningNoLine}}
-% If the user uses Lua\LaTeX{} usage of \pkg*{scrwfile} should not be
-% needed.
-% \begin{macrocode}
-\ifluatex
- \PackageWarningNoLine{scrwfile}{LuaLaTeX detected.\MessageBreak
- With LuaLaTeX you should never get an error message:\MessageBreak
- \space\space`No room for a new \string\write'.\MessageBreak
- So scrwfile could make much more harm than benefit\MessageBreak
- and using it is not recommended}%
-\fi
-% \end{macrocode}
-%
-% \subsubsection{\LaTeX{} Kernel Patchs}
-%
-% For some features we need to patch \LaTeX{} kernel macros. Those features
-% and macros are:
-% \begin{description}
-% \item[Single handle feature] means, that \LaTeX{} will no longer need a file
-% handle for every help file, but only one for all files. We will patch
-% \cs{@starttoc} and \cs{@writefile} to do so.
-% \item[Clone file feature] means, that every write to one file may be done to
-% another file, too. We will patch \cs{@writefile} to do so.
-% \end{description}
-% Every patch should be minimum invasive, so that files, that are not under
-% \pkg*{scrwfile}'s control are changed as little as possible.
-%
-% \begin{macro}{\scrwfile at if@only}
-% First of all we check, if the file should be handled by \pkg*{scrwfile}.
-% \begin{macrocode}
-\newcommand*{\scrwfile at if@only}[1]{%
- \begingroup
- \scr at ifundefinedorrelax{scrwfile at only}{\@tempswatrue}{%
- \@tempswafalse
- \edef\reserved at b{#1}%
- \@for\reserved at a:=\scrwfile at only\do
- {\ifx\reserved at a\reserved at b\@tempswatrue\fi}%
- }%
- \if at tempswa
- \scr at ifundefinedorrelax{scrwfile at never}{}{%
- \edef\reserved at b{#1}%
- \@for\reserved at a:=\scrwfile at never\do
- {\ifx\reserved at a\reserved at b\@tempswafalse\fi}%
- }%
- \fi
- \expandafter\endgroup
- \if at tempswa
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
-}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\scrwfile at starttoc,\scrwfile@@starttoc}
-% This is the internal redefinition of \cs{@starttoc}. First of all test, if it
-% should be used, then use it or not.
-% \begin{macrocode}
-\newcommand*{\scrwfile at starttoc}[1]{%
- \scrwfile at if@only{#1}{\scrwfile@@starttoc}{\scrwfile at saved@starttoc}{#1}%
-}
-\newcommand*{\scrwfile@@starttoc}[1]{%
-%<trace> \PackageInfo{scrwfile}{%
-%<trace> Using my own \string\@starttoc\space for `#1'}%
- \begingroup
- \if at filesw
- \xdef\scrwfile at writefilelist{\scrwfile at writefilelist,#1}%
- \fi
- \@fileswfalse
- \scrwfile at saved@starttoc{#1}%
- \endgroup
-}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\scrwfile at writefile,\scrwfile@@writefile,\scrwfile at wrtout,
-% \scrwfile at writefilelist}
-% This is the internal redefinition of \cs{@writefile}. First of all test, if
-% it should be used, then use it or not.
-% \begin{macrocode}
-\newcommand*{\scrwfile at writefile}[1]{%
- \scrwfile at if@only{#1}{\scrwfile@@writefile}{\scrwfile at saved@writefile}{#1}%
-}
-\newcommand{\scrwfile@@writefile}[2]{%
-%<trace> \PackageInfo{scrwfile}{%
-%<trace> Using my own \string\@writefile\space for `#1'}%
- \ifnum\scrwfile at wrtout>0
- \begingroup
- \@temptokena{#2}%
- \immediate\write\scrwfile at wrtout{%
- \string\@writefile{#1}{\the\@temptokena}%
- }%
-% \end{macrocode}
-% This was the entry for the real file. But we also may have clone files:
-% \begin{macrocode}
- \scrwfile at process@clones{#1}%
- \endgroup
- \fi
-}
-\chardef\scrwfile at wrtout\z@
-\newcommand*{\scrwfile at writefilelist}{}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@writefile,\scrwfile at saved@writefile}
-% We have to add the single handle feature and the clone file feature to
-% \cs{@writefile} and therefore save the original
-% definition. \cs{scrwfile at saved@writefile} is used, whenever a file is not
-% under \pkg*{scrwfile}'s control.
-% \begin{macrocode}
-\newcommand*{\scrwfile at saved@writefile}{}
-\BeforeClosingMainAux{%
- \ifx\scrwfile at writefilelist\@empty\else
- \let\scrwfile at saved@writefile\@writefile
- \let\scrwfile at wrtout\@partaux
- \immediate\openout\scrwfile at wrtout \jobname.wrt
- \let\@writefile\scrwfile at writefile
- \fi
-}
-\AfterReadingMainAux{%
- \ifx\scrwfile at writefilelist\@empty\else
- \immediate\closeout\scrwfile at wrtout
- \chardef\scrwfile at wrtout\z@
- \begingroup
- \let\@writefile\scrwfile at saved@writefile
- \@for\@currext:=\scrwfile at writefilelist\do{%
- \begingroup
- \ifx\@currext\@empty\else
- \scr at ifundefinedorrelax{tf@\@currext}{%
-%<trace> \typeout{Process extension: `\@currext'}
- \immediate\openout\@partaux \jobname.\@currext
- \expandafter\let\csname tf@\@currext\endcsname\@partaux
- \@input@{\jobname.wrt}%
- \immediate\closeout\@partaux
- }{}%
- \fi
- \endgroup
- }%
- \endgroup
- \fi
-}
-% \end{macrocode}
-% \changes{v0.1.8}{2021/05/30}{added order rule for
-% \pkg*{scrlayer-notecolumn}}
-% Note: Here we use a \LaTeX{} version test, because a do-nothing-definition
-% like the one of \pkg{latexrelease} wouldn't be correct, if the command is
-% not supported by the current \LaTeX{} kernel version setting.
-% \begin{macrocode}
-\IfLTXAtLeastTF{2020/10/01}{%
- \DeclareHookRule{enddocument/afteraux}%
- {scrwfile}{before}{scrlayer-notecolumn}%
-}{%
- \@ifpackageloaded{scrlayer-notecolumn}{%
- \PackageWarningNoLine{scrwfile}{%
- Dangerous package order detected!\MessageBreak
- As a general rule, you should load scrwfile as soon\MessageBreak
- as possible, maybe even before `\string\documentclass'\MessageBreak
- (using `\string\RequirePackage' instead of
- `\string\usepackage').\MessageBreak
- Following packages should be loaded after scrwfile:\MessageBreak
- \space - scrlayer-notecolumn}%
- }{}%
-}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@starttoc,\scrwfile at saved@starttoc}
-% We have to add the single handle feature to \cs{@starttoc} and therefore
-% save the original definition.
-% \changes{v0.1.5}{2013/07/24}{take care for outdated \pkg{hyperref}}
-% \changes{v0.1.11}{2022/10/06}{ready for \pkg{hyperref} without
-% \cs{Hy at AtBeginDocumentHook}}
-% \cs{scrwfile at saved@starttoc} is be used, whenever the file is not under
-% \pkg*{scrwfile}'s control. Because of old versions of package
-% \pkg{hyperref}, that do a hard redefinition without any care for changed
-% definitions, we have to take care for that and cannot do a simple
-% \begin{verbatim}
-% \let\scrwfile at saved@starttoc\@starttoc
-% \let\@starttoc\scrwfile at starttoc
-% \end{verbatim}
-% \begin{macrocode}
-\newcommand*{\scrwfile at saved@starttoc}{}
-\AtBeginDocument{%
- \begingroup
- \@ifpackageloaded{hyperref}{%
- \scr at ifundefinedorrelax{Hy at AtBeginDocument}{%
- \PackageInfo{scrwfile}{%
- Using immediate redefinition of `\string\@starttoc'%
- }%
- \aftergroup\@firstofone
- }{%
- \ifx\Hy at AtBeginDocumentHook\@undefined
- \PackageInfo{scrwfile}{%
- Using immediate redefinition of `\string\@starttoc'%
- }%
- \aftergroup\@firstofone
- \else
-% \end{macrocode}
-% From v7.00o \pkg{hyperref} does not redefine \cs{@starttoc} any more. So we
-% do need the usage of \cs{Hy at AtBeginDocument} only for versions before.
-% \begin{macrocode}
- \@ifpackagelater{hyperref}{2022/02/22}{% newer than v7.00n
- \PackageInfo{scrwfile}{%
- Using immediate redefinition of `\string\@starttoc'%
- }%
- \aftergroup\@firstofone
- }{%
- \PackageWarning{scrwfile}{%
- Outdated package `hyperref' detected.\MessageBreak
- Using `\string\Hy at AtBeginDocument' for redefinition of
- `\string\@starttoc'.\MessageBreak
- We recommend to update `hyperref'
- }%
- \aftergroup\Hy at AtBeginDocument
- }%
- \fi
- }%
- }{%
- \PackageInfo{scrwfile}{%
- Using immediate redefinition of `\string\@starttoc'%
- }%
- \aftergroup\@firstofone
- }%
- \endgroup
- {%
- \PackageInfo{scrwfile}{%
- Extending `\string\@starttoc`
- }%
- \let\scrwfile at saved@starttoc\@starttoc
- \let\@starttoc\scrwfile at starttoc
- }%
-}
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \subsubsection{Clone TOC Feature}
-%
-% \pkg*{scrwfile} may clone a TOC, that means, every entry to one file will
-% be copied to other files, too. You must not clone recursively!
-%
-% \begin{description}
-% \item[ToDo:]The whole feature should be moved to \pkg*{tocbasic}. But this
-% would need a complete re-implementation and would result in one more write
-% handle for every cloned file. So maybe it wouldn't be a really good idea
-% to do so.
-% \end{description}
-%
-% \begin{macro}{\scrwfile at process@clones}
-% \begin{macrocode}
-\newcommand*{\scrwfile at process@clones}[1]{%
- \scr at ifundefinedorrelax{scrwfile at clone@#1}{}{%
- \begingroup
- \let\@@protect\protect\let\protect\@empty\afterassignment\restore at protect
- \edef\reserved at b{\csname scrwfile at clone@#1\endcsname}%
- \edef\reserved at c{,#1}%
- \@for \reserved at a:=\reserved at b\do {%
- \@tempswatrue
- \@for \reserved at d:=\reserved at c\do {%
- \ifx\reserved at d\reserved at a\@tempswafalse\fi
- }%
- \if at tempswa
-%<trace> \typeout{clone entry from `#1' to `\reserved at a'}%
- \immediate\write\scrwfile at wrtout{%
- \string\@writefile{\reserved at a}{\the\@temptokena}%
- }%
- \edef\reserved at c{\reserved at c,\reserved at a}%
- \fi
- }%
- \endgroup
- }%
-}%
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{command}{\TOCclone}
-% \changes{v0.1.8}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}
-% \changes{v0.1.8}{2019/11/19}{\cs{ifattoclist} replaced by \cs{Ifattoclist}}
-% \changes{v0.1.8}{2019/11/19}{\cs{iftocfeature} replaced by
-% \cs{Iftocfeature}}
-% \changes{v0.1.8}{2020/02/25}{spurious space in warning message removed}
-% \changes{v0.1.9}{2021/05/30}{requires package \pkg*{tocbasic}}
-% \changes{v0.1.9}{2021/05/30}{can be used only in preamble}
-% Clone the entries from the second (first mandatory) argument TOC to the
-% third (second mandatory) argument TOC. If the first (optional) argument was
-% given, define |\listof#3name| to this and also define |\listof#3| and clone
-% the toc features \texttt{leveldown}, \texttt{numbered}, \texttt{onecolumn}
-% and \texttt{totoc} of |#2| to |#3|. The toc feature \texttt{nobabel} will
-% always be set, because the babel entries at TOC |#3| will be cloned from TOC
-% |#2|.
-% \begin{description}
-% \item{Note:} We use owner \texttt{TOCclone} for all cloned extensions.
-% \end{description}
-% \begin{macrocode}
-\newcommand*{\TOCclone}[3][]{%
- \RequirePackage{tocbasic}%
- \scr at ifundefinedorrelax{scrwfile at clone@#2}{%
- \expandafter\protected at edef\csname scrwfile at clone@#2\endcsname{%
- #3,\protect\csname scrwfile at clone@#3\endcsname
- }%
- }{%
- \edef\reserved at b{\csname scrwfile at clone@#2\endcsname}%
- \expandafter\protected at edef\csname scrwfile at clone@#2\endcsname{%
- \csname scrwfile at clone@#2\endcsname,%
- #3,%
- \protect\csname scrwfile at clone@#3\endcsname
- }%
- }%
- \scr at ifundefinedorrelax{scrwfile at clone@#3}{%
- \expandafter\let\csname scrwfile at clone@#3\endcsname\@empty
- }{}%
- \Ifattoclist{#3}{%
- \PackageWarning{scrwfile}{`#3' already under control of
- tocbasic.\MessageBreak
- Nevertheless features will be set%
- }%
- }{%
- \addtotoclist[TOCclone]{#3}%
- }%
- \setuptoc{#3}{nobabel}%
- \Ifstr{#1}{}{%
- }{%
- \@namedef{listof#3name}{#1}%
- \@namedef{listof#3}{\listoftoc{#3}}%
- \Iftocfeature{#2}{leveldown}{\setuptoc{#3}{leveldown}}{}%
- \Iftocfeature{#2}{numbered}{\setuptoc{#3}{numbered}}{}%
- \Iftocfeature{#2}{onecolumn}{\setuptoc{#3}{leveldownonecolumn}}{}%
- \Iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}%
- }%
-}
-\@onlypreamble\TOCClone
-%</body>
-% \end{macrocode}
-% \end{command}
-%
-% \begin{macrocode}
-%</package>
-% \end{macrocode}
-%
-% \Finale
-% \PrintChanges
-%
-% \endinput
-% Local Variables:
-% mode: doctex
-% ispell-local-dictionary: "en_US"
-% eval: (flyspell-mode 1)
-% TeX-master: t
-% TeX-engine: luatex-dev
-% eval: (setcar (or (cl-member "Index" (setq-local TeX-command-list (copy-alist TeX-command-list)) :key #'car :test #'string-equal) (setq-local TeX-command-list (cons nil TeX-command-list))) '("Index" "mkindex %s" TeX-run-index nil t :help "makeindex for dtx"))
-% End:
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
DIN%
@@ -79,7 +79,7 @@
Letter configuration option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
@@ -130,17 +130,18 @@
\addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}}
\fi
\setplength{firstfootwidth}{\useplength{firstheadwidth}}
-\ifnum \scr at compatibility >\@nameuse{scr at v@2.9t}\relax
- \setplength{firstfootvpos}{\paperheight}
- \addtoplength{firstfootvpos}{-16mm}
-\else
- \setplength{firstfootvpos}{1in}
- \addtoplength{firstfootvpos}{\topmargin}
- \addtoplength{firstfootvpos}{\headheight}
- \addtoplength{firstfootvpos}{\headsep}
- \addtoplength{firstfootvpos}{\textheight}
- \addtoplength{firstfootvpos}{\footskip}
-\fi
+\setplength{firstfootvpos}{\paperheight}
+\addtoplength{firstfootvpos}{-16mm}
+\scr at ifundefinedorrelax{scr at v@is at le}{}{%
+ \expandafter\ifnum \scr at v@is at le{2.9t}\relax\else
+ \setplength{firstfootvpos}{1in}%
+ \addtoplength{firstfootvpos}{\topmargin}%
+ \addtoplength{firstfootvpos}{\headheight}%
+ \addtoplength{firstfootvpos}{\headsep}%
+ \addtoplength{firstfootvpos}{\textheight}%
+ \addtoplength{firstfootvpos}{\footskip}%
+ \fi
+}%
\setplength{refvpos}{%
98.5mm}
\setplength{refaftervskip}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
5008%
@@ -73,7 +73,7 @@
\LoadLetterOption{%
DINmtext%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\setplength{toaddrindent}{%
5mm}
@@ -92,17 +92,18 @@
\dimexpr\useplength{toaddrhpos}+\useplength{toaddrindent}}%
\setplength{firstfootwidth}{%
\dimexpr \paperwidth-\useplength{toaddrhpos}-\useplength{firstfoothpos}}%
-\ifnum \scr at compatibility >\@nameuse{scr at v@2.9t}\relax
- \setplength{firstfootvpos}{\paperheight}
- \addtoplength{firstfootvpos}{-16mm}
-\else
- \setplength{firstfootvpos}{1in}
- \addtoplength{firstfootvpos}{\topmargin}
- \addtoplength{firstfootvpos}{\headheight}
- \addtoplength{firstfootvpos}{\headsep}
- \addtoplength{firstfootvpos}{\textheight}
- \addtoplength{firstfootvpos}{\footskip}
-\fi
+\setplength{firstfootvpos}{\paperheight}
+\addtoplength{firstfootvpos}{-16mm}
+\scr at ifundefinedorrelax{scr at v@is at le}{}{%
+ \expandafter\ifnum \scr at v@is at le{2.9t}\relax\else
+ \setplength{firstfootvpos}{1in}%
+ \addtoplength{firstfootvpos}{\topmargin}%
+ \addtoplength{firstfootvpos}{\headheight}%
+ \addtoplength{firstfootvpos}{\headsep}%
+ \addtoplength{firstfootvpos}{\textheight}%
+ \addtoplength{firstfootvpos}{\footskip}%
+ \fi
+}%
\setplength{refvpos}{%
79.4mm}
\setplength{refaftervskip}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
5008%
@@ -73,7 +73,7 @@
\LoadLetterOption{%
DIN%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\setplength{toaddrindent}{%
5mm}
@@ -92,17 +92,18 @@
\dimexpr\useplength{toaddrhpos}+\useplength{toaddrindent}}%
\setplength{firstfootwidth}{%
\dimexpr \paperwidth-\useplength{toaddrhpos}-\useplength{firstfoothpos}}%
-\ifnum \scr at compatibility >\@nameuse{scr at v@2.9t}\relax
- \setplength{firstfootvpos}{\paperheight}
- \addtoplength{firstfootvpos}{-16mm}
-\else
- \setplength{firstfootvpos}{1in}
- \addtoplength{firstfootvpos}{\topmargin}
- \addtoplength{firstfootvpos}{\headheight}
- \addtoplength{firstfootvpos}{\headsep}
- \addtoplength{firstfootvpos}{\textheight}
- \addtoplength{firstfootvpos}{\footskip}
-\fi
+\setplength{firstfootvpos}{\paperheight}
+\addtoplength{firstfootvpos}{-16mm}
+\scr at ifundefinedorrelax{scr at v@is at le}{}{%
+ \expandafter\ifnum \scr at v@is at le{2.9t}\relax\else
+ \setplength{firstfootvpos}{1in}%
+ \addtoplength{firstfootvpos}{\topmargin}%
+ \addtoplength{firstfootvpos}{\headheight}%
+ \addtoplength{firstfootvpos}{\headsep}%
+ \addtoplength{firstfootvpos}{\textheight}%
+ \addtoplength{firstfootvpos}{\footskip}%
+ \fi
+}%
\setplength{refaftervskip}{%
8.46mm}
\newplength{specialmailheight}
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
DINmtext%
@@ -79,7 +79,7 @@
Letter configuration option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
@@ -130,17 +130,18 @@
\addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}}
\fi
\setplength{firstfootwidth}{\useplength{firstheadwidth}}
-\ifnum \scr at compatibility >\@nameuse{scr at v@2.9t}\relax
- \setplength{firstfootvpos}{\paperheight}
- \addtoplength{firstfootvpos}{-16mm}
-\else
- \setplength{firstfootvpos}{1in}
- \addtoplength{firstfootvpos}{\topmargin}
- \addtoplength{firstfootvpos}{\headheight}
- \addtoplength{firstfootvpos}{\headsep}
- \addtoplength{firstfootvpos}{\textheight}
- \addtoplength{firstfootvpos}{\footskip}
-\fi
+\setplength{firstfootvpos}{\paperheight}
+\addtoplength{firstfootvpos}{-16mm}
+\scr at ifundefinedorrelax{scr at v@is at le}{}{%
+ \expandafter\ifnum \scr at v@is at le{2.9t}\relax\else
+ \setplength{firstfootvpos}{1in}%
+ \addtoplength{firstfootvpos}{\topmargin}%
+ \addtoplength{firstfootvpos}{\headheight}%
+ \addtoplength{firstfootvpos}{\headsep}%
+ \addtoplength{firstfootvpos}{\textheight}%
+ \addtoplength{firstfootvpos}{\footskip}%
+ \fi
+}%
\setplength{refvpos}{%
80.5mm}
\setplength{refaftervskip}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
KOMAold%
@@ -80,7 +80,7 @@
Letter configuration option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
@@ -218,7 +218,7 @@
\@ObsoleteCommand{\subjectafteron}{subject=afteropening}}
\def\subjectafteroff{%
\@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}}
-%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\def\setpresigskip{\setplength{sigbeforevskip}}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $
%%% (run: Kaku,LATE,LOW,head)
@@ -71,7 +71,7 @@
L%
L%
}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NF.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
NF%
@@ -79,7 +79,7 @@
Letter configuration option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $
%%% (run: Ni,EARLY,HIGH,head)
@@ -71,7 +71,7 @@
E%
H%
}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $
%%% (run: Ni,EARLY,LOW,head)
@@ -71,7 +71,7 @@
E%
L%
}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $
%%% (run: Ni,LATE,HIGH,head)
@@ -71,7 +71,7 @@
L%
H%
}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $
%%% (run: Ni,LATE,LOW,head)
@@ -71,7 +71,7 @@
L%
L%
}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $
%%% (run: Ni,RIGHT,LOW,head)
@@ -71,7 +71,7 @@
R%
L%
}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/SN.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
SN%
@@ -79,7 +79,7 @@
Letter configuration option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
@@ -130,17 +130,18 @@
\addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}}
\fi
\setplength{firstfootwidth}{\useplength{firstheadwidth}}
-\ifnum \scr at compatibility >\@nameuse{scr at v@2.9t}\relax
- \setplength{firstfootvpos}{\paperheight}
- \addtoplength{firstfootvpos}{-16mm}
-\else
- \setplength{firstfootvpos}{1in}
- \addtoplength{firstfootvpos}{\topmargin}
- \addtoplength{firstfootvpos}{\headheight}
- \addtoplength{firstfootvpos}{\headsep}
- \addtoplength{firstfootvpos}{\textheight}
- \addtoplength{firstfootvpos}{\footskip}
-\fi
+\setplength{firstfootvpos}{\paperheight}
+\addtoplength{firstfootvpos}{-16mm}
+\scr at ifundefinedorrelax{scr at v@is at le}{}{%
+ \expandafter\ifnum \scr at v@is at le{2.9t}\relax\else
+ \setplength{firstfootvpos}{1in}%
+ \addtoplength{firstfootvpos}{\topmargin}%
+ \addtoplength{firstfootvpos}{\headheight}%
+ \addtoplength{firstfootvpos}{\headsep}%
+ \addtoplength{firstfootvpos}{\textheight}%
+ \addtoplength{firstfootvpos}{\footskip}%
+ \fi
+}%
\setplength{refvpos}{%
98.5mm}
\setplength{refaftervskip}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
SNleft%
@@ -79,7 +79,7 @@
Letter configuration option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
@@ -130,17 +130,18 @@
\addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}}
\fi
\setplength{firstfootwidth}{\useplength{firstheadwidth}}
-\ifnum \scr at compatibility >\@nameuse{scr at v@2.9t}\relax
- \setplength{firstfootvpos}{\paperheight}
- \addtoplength{firstfootvpos}{-16mm}
-\else
- \setplength{firstfootvpos}{1in}
- \addtoplength{firstfootvpos}{\topmargin}
- \addtoplength{firstfootvpos}{\headheight}
- \addtoplength{firstfootvpos}{\headsep}
- \addtoplength{firstfootvpos}{\textheight}
- \addtoplength{firstfootvpos}{\footskip}
-\fi
+\setplength{firstfootvpos}{\paperheight}
+\addtoplength{firstfootvpos}{-16mm}
+\scr at ifundefinedorrelax{scr at v@is at le}{}{%
+ \expandafter\ifnum \scr at v@is at le{2.9t}\relax\else
+ \setplength{firstfootvpos}{1in}%
+ \addtoplength{firstfootvpos}{\topmargin}%
+ \addtoplength{firstfootvpos}{\headheight}%
+ \addtoplength{firstfootvpos}{\headsep}%
+ \addtoplength{firstfootvpos}{\textheight}%
+ \addtoplength{firstfootvpos}{\footskip}%
+ \fi
+}%
\setplength{refvpos}{%
89mm}
\setplength{refaftervskip}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
UScommercial9
@@ -79,7 +79,7 @@
Letter configuration option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
@@ -131,17 +131,18 @@
\addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}}
\fi
\setplength{firstfootwidth}{\useplength{firstheadwidth}}
-\ifnum \scr at compatibility >\@nameuse{scr at v@2.9t}\relax
- \setplength{firstfootvpos}{\paperheight}
- \addtoplength{firstfootvpos}{-16mm}
-\else
- \setplength{firstfootvpos}{1in}
- \addtoplength{firstfootvpos}{\topmargin}
- \addtoplength{firstfootvpos}{\headheight}
- \addtoplength{firstfootvpos}{\headsep}
- \addtoplength{firstfootvpos}{\textheight}
- \addtoplength{firstfootvpos}{\footskip}
-\fi
+\setplength{firstfootvpos}{\paperheight}
+\addtoplength{firstfootvpos}{-16mm}
+\scr at ifundefinedorrelax{scr at v@is at le}{}{%
+ \expandafter\ifnum \scr at v@is at le{2.9t}\relax\else
+ \setplength{firstfootvpos}{1in}%
+ \addtoplength{firstfootvpos}{\topmargin}%
+ \addtoplength{firstfootvpos}{\headheight}%
+ \addtoplength{firstfootvpos}{\headsep}%
+ \addtoplength{firstfootvpos}{\textheight}%
+ \addtoplength{firstfootvpos}{\footskip}%
+ \fi
+}%
\setplength{refvpos}{%
3.4375in}
\setplength{refaftervskip}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
UScommercial9DW
@@ -79,7 +79,7 @@
Letter configuration option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
@@ -127,17 +127,18 @@
\paperwidth}
\addtoplength[-]{firstheadwidth}{.25in}
\setplength{firstfootwidth}{\useplength{firstheadwidth}}
-\ifnum \scr at compatibility >\@nameuse{scr at v@2.9t}\relax
- \setplength{firstfootvpos}{\paperheight}
- \addtoplength{firstfootvpos}{-16mm}
-\else
- \setplength{firstfootvpos}{1in}
- \addtoplength{firstfootvpos}{\topmargin}
- \addtoplength{firstfootvpos}{\headheight}
- \addtoplength{firstfootvpos}{\headsep}
- \addtoplength{firstfootvpos}{\textheight}
- \addtoplength{firstfootvpos}{\footskip}
-\fi
+\setplength{firstfootvpos}{\paperheight}
+\addtoplength{firstfootvpos}{-16mm}
+\scr at ifundefinedorrelax{scr at v@is at le}{}{%
+ \expandafter\ifnum \scr at v@is at le{2.9t}\relax\else
+ \setplength{firstfootvpos}{1in}%
+ \addtoplength{firstfootvpos}{\topmargin}%
+ \addtoplength{firstfootvpos}{\headheight}%
+ \addtoplength{firstfootvpos}{\headsep}%
+ \addtoplength{firstfootvpos}{\textheight}%
+ \addtoplength{firstfootvpos}{\footskip}%
+ \fi
+}%
\setplength{refvpos}{%
3.4375in}
\setplength{refaftervskip}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/float.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/float.hak 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/float.hak 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\ProvidesFile{float.hak}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
scrhack part
(hacking package
float)%
]
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/floatrow.hak 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\ProvidesFile{floatrow.hak}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
scrhack part
(hacking package
floatrow)%
]
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/hyperref.hak 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\ProvidesFile{hyperref.hak}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
scrhack part
(hacking package
hyperref)%
]
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/listings.hak 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\ProvidesFile{listings.hak}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
scrhack part
(hacking package
listings)%
]
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\newcommand*{\scr at do@hack at listings}{%
\RequirePackage{tocbasic}%
\addtotoclist[float]{lol}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\ProvidesFile{lscape.hak}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
scrhack part
(hacking package
lscape)%
]
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/nomencl.hak 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\ProvidesFile{nomencl.hak}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
scrhack part
(hacking package
nomencl)%
]
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,15 +106,13 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
\let\scr at clsextension\@clsextension
}
-\newcommand*{\KOMAClassName}{%
- scrartcl%
-}
+\newcommand*{\KOMAClassName}{scrartcl}
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\newcommand*{\ClassName}{%
@@ -121,16 +119,16 @@
article%
}
\ProvidesClass{\KOMAClassName}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
]
\addtotoclist[ToC]{toc}
\Ifstr{\ext at toc}{toc}{}{%
@@ -138,9 +136,9 @@
\expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]%
\expandafter{\ext at toc}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: prepare)
\newcommand*{\scr at dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
@@ -200,8 +198,8 @@
\newcommand*{\scr at fnt@paragraph}{\size at paragraph}
\newcommand*{\size at subparagraph}{}
\newcommand*{\scr at fnt@subparagraph}{\size at subparagraph}
-\newcommand*{\sectfont}{\normalcolor\@gr at gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries}
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -287,10 +285,11 @@
\@namedef{scr at v@3.36}{20}
\@namedef{scr at v@3.37}{20}
\@namedef{scr at v@3.38}{20}
+\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@last}{20}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\newif\if at scr@emulatestandardclasses
\let\scr at emulatestandardclassestrue\relax
@@ -326,7 +325,7 @@
Because of this, version was set to `first'%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{version}{first}%
}{%
@@ -335,7 +334,7 @@
}%
\edef\scr at compatibility{\@nameuse{scr at v@#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{version}{#1}%
\ifnum\scr at compatibility<\scr at v@last
@@ -356,7 +355,7 @@
\fi
}%
}
-\KOMA at kav@add{.\KOMAClassFileName}{version}{last}
+\KOMA at kav@add{\KOMAClassFileName}{version}{last}
\AtEndOfClass{%
\KOMA at key{version}[]{%
\ClassError{\KOMAClassName}{%
@@ -381,24 +380,27 @@
\newcommand*{\scr at v@is at ge}[1]{%
\numexpr\scr at compatibility+\@ne\relax>\@nameuse{scr at v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+\newcommand*{\scr at v@is at eq}[1]{%
+ \scr at compatibility=\@nameuse{scr at v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
@@ -405,7 +407,7 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{draft}{false}
+\KOMA at kav@add{\KOMAClassFileName}{draft}{false}
\KOMA at DeclareStandardOption
{final}{draft=false}
\KOMA at key{overfullrule}[true]{%
@@ -412,18 +414,18 @@
\KOMA at set@ifkey{overfullrule}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
@@ -430,16 +432,12 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{overfullrule}{false}
+\KOMA at kav@add{\KOMAClassFileName}{overfullrule}{false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-\KOMA at ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
-\newcommand*{\@gr at gsffamily}{%
- \if at egregdoesnotlikesansseriftitles\else\sffamily\fi
-}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\providecommand*\@ptsize{%
11%
@@ -528,7 +526,7 @@
\@tempa
}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{fontsize}{#1}%
}
@@ -550,7 +548,52 @@
\BeforePackage{tex4ht}{%
\let\scr at defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+\KOMA at ifkey{sfdefaults}{@sfdefaults}
+\newcommand*{\maybesffamily}{\if at sfdefaults \sffamily \fi}
+\newcommand*{\textmaybesf}{%
+ \if at sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi
+}
+%% \begin{option}{egegdoesnotlikesansseriftitles}
+\KOMA at key{egregdoesnotlikesansseriftitles}[true]{%
+ \ClassWarningNoLine{\KOMAClassName}%
+ {%
+ You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak
+ In 2016 this option has been implemented as a joke\MessageBreak
+ answer to egreg's comment:\MessageBreak
+ \space\space ``In my opinion there should be a document class\MessageBreak
+ \space\space option for it, instead of the
+ \string\setkomafont\MessageBreak
+ \space\space statement. And yes, I find imposing sans serif
+ for\MessageBreak
+ \space\space titles is not the best choice (one of the
+ reasons\MessageBreak
+ \space\space why I don't use Koma-script classes).''\MessageBreak
+ to question https://tex.stackexchange.com/q/289853\MessageBreak
+ at TeX.SX.\MessageBreak
+ The option has never been documented in the official\MessageBreak
+ user manuals and therefore should never have been\MessageBreak
+ used in real live documents. It was intended to be\MessageBreak
+ removed after some month.\MessageBreak
+ However, it has been used and also almost forgotten\MessageBreak
+ by the author.\MessageBreak
+ For this the author apologizes both to users but\MessageBreak
+ especially to egreg.\MessageBreak
+ Rightly, egreg has criticized the permanent retention\MessageBreak
+ of the option as unfunny to inappropriate and has\MessageBreak
+ asked that it be removed or replaced.\MessageBreak
+ It will be removed soon!\MessageBreak
+ You should use `sfdefaults=false` instead%
+ }%
+ \KOMA at set@ifkey{egregdoesnotlikesansseriftitles}%
+ {@sfdefaults}%
+ {#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if at sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}%
+ {sfdefaults}{\if at sfdefaults true\else false\fi}%
+ \fi
+}
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: options)
\KOMA at key{twoside}[true]{%
\if at atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -570,9 +613,9 @@
\if at twocolumn\sloppy\flushbottom\else\raggedbottom\fi
\fi
\fi
- \KOMA at kav@xreplacevalue{.%
- \KOMAClassFileName
- }{twoside}{#1}%
+ \KOMA at kav@xreplacevalue
+ {\KOMAClassFileName}%
+ {twoside}{#1}%
\fi
}
\KOMAExecuteOptions{twoside=false}
@@ -582,21 +625,23 @@
\if at atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
\KOMA at set@ifkey{twocolumn}{@twocolumn}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.%
- \KOMAClassFileName
- }{twocolumn}{@twocolumn}%
+ \KOMA at kav@replacebool
+ {\KOMAClassFileName}%
+ {twocolumn}{@twocolumn}%
\if at atdocument\expandafter\@firstofone
\else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
{\expandafter\AtEndOfClass}\fi
- {\expandafter\ifnum\scr at v@is at ge{3.17}%
- \if at twocolumn\twocolumn\sloppy\flushbottom
- \else
- \onecolumn
- \if at twoside\flushbottom\else
- \raggedbottom
+ {%
+ \expandafter\ifnum\scr at v@is at ge{3.17}%
+ \if at twocolumn\twocolumn\sloppy\flushbottom
+ \else
+ \onecolumn
+ \if at twoside\flushbottom\else
+ \raggedbottom
+ \fi
\fi
\fi
- \fi}%
+ }%
\fi
}
\AtEndOfClass{%
@@ -677,7 +722,7 @@
}
\DeclareOption*{%
\x at paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f at parindent{\the\parindent}%
@@ -690,16 +735,16 @@
\if at atdocument\let\par at update\default at par@update\fi
\par at updaterelative
}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{false}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{never}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full-}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full+}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full*}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half-}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half+}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half*}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{false}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{never}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full-}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full+}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full*}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half-}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half+}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half*}%
}
\newcommand*{\f at parindent}{\the\parindent}
\newcommand*{\f at parskip}{\the\parskip}
@@ -738,66 +783,66 @@
\ifcase\number\@tempa% 0
\endgroup
\setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{never}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{never}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
\setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{false}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{false}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 2
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full-}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full-}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half-}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half-}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 4
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 6
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full+}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full+}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half+}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half+}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 8
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full*}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full*}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half*}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half*}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 10
\endgroup
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{relative}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{relative}%
\ifx\par at updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -811,9 +856,9 @@
}%
\or%11
\endgroup
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{relative}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}%
\ifx\par at updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -841,9 +886,9 @@
\KOMA at DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA at DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA at DeclareDeprecatedOption{parindent}{parskip=false}
-\KOMA at kav@add{.\KOMAClassFileName}{parskip}{false}
-\KOMA at kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $
+\KOMA at kav@add{\KOMAClassFileName}{parskip}{false}
+\KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}
+%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $
%%% (run: option)
\newif\if at titlepage
\@titlepagefalse
@@ -853,7 +898,7 @@
\@titlepagetrue
\@titlepageiscoverpagetrue
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{titlepage}{firstiscover}%
}{%
@@ -860,10 +905,10 @@
\def\FamilyElseValue{, `firstiscover'}%
\KOMA at set@ifkey{titlepage}{@titlepage}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{titlepage}{firstiscover}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{titlepage}{@titlepage}%
\@titlepageiscoverpagefalse
@@ -870,7 +915,7 @@
\fi
}%
}
-\KOMA at kav@xadd{.%
+\KOMA at kav@xadd{%
\KOMAClassFileName
}{titlepage}{\if at titlepage true\else false\fi}
\KOMA at DeclareStandardOption%
@@ -878,9 +923,9 @@
\KOMA at ifkey{abstract}{@abstrt}
\KOMA at DeclareDeprecatedOption{abstracton}{abstract=true}
\KOMA at DeclareDeprecatedOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: option)
\KOMA at key{numbers}{%
\KOMA at set@ncmdkey{numbers}{@tempa}{%
@@ -891,7 +936,7 @@
{noenddot}{2},{nodotatend}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{numbers}{#1}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{numbers}{#1}%
\ifcase \@tempa\relax
\if at atdocument\scr at dotchangeatdocument{#1}\else
\let\scr at altsecnumhook\@empty
@@ -911,7 +956,7 @@
\KOMA at DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
\KOMA at ifkey{bookmarkpackage}{@scr at autoloadbookmarkpackage}
\@scr at autoloadbookmarkpackagetrue
-\KOMA at kav@add{.\KOMAClassFileName}{bookmarkpackage}{true}
+\KOMA at kav@add{\KOMAClassFileName}{bookmarkpackage}{true}
\AfterAtEndOfPackage{hyperref}{%
\AtBeginDocument{%
\@ifpackageloaded{bookmark}{}{%
@@ -1012,11 +1057,11 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax% big
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{big}%
\setkomafont{part}{\Huge}%
\setkomafont{partnumber}{\huge}%
\setkomafont{section}{\Large}%
@@ -1025,11 +1070,11 @@
\setkomafont{paragraph}{\normalsize}%
\setkomafont{subparagraph}{\normalsize}%
\or % normal
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{normal}%
\setkomafont{part}{\huge}%
\setkomafont{partnumber}{\huge}%
\setkomafont{section}{\large}%
@@ -1038,11 +1083,11 @@
\setkomafont{paragraph}{\normalsize}%
\setkomafont{subparagraph}{\normalsize}%
\or % small
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{small}%
\setkomafont{part}{\LARGE}%
\setkomafont{partnumber}{\LARGE}%
\setkomafont{section}{\normalsize}%
@@ -1058,29 +1103,29 @@
\or % twolineappendix
\or % onelineappendix
\or % optiontotocandhead
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontotocandhead}%
\scr at activate@xsection{3}%
\or % optiontotoc
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontotoc}%
\scr at activate@xsection{2}%
\or % optiontohead
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontohead}%
\scr at activate@xsection{1}%
\or % standardclasses
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{standardclasses}%
\setkomafont{part}{\huge}%
\setkomafont{partnumber}{\Large}%
\setkomafont{section}{\Large}%
@@ -1092,17 +1137,17 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{headings}{big}
+\KOMA at kav@add{\KOMAClassFileName}{headings}{big}
\KOMA at DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA at DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA at DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: option)
\KOMA at ifkey{headsepline}{@hsl}%
-\KOMA at kav@add{.\KOMAClassFileName}{headsepline}{false}
+\KOMA at kav@add{\KOMAClassFileName}{headsepline}{false}
\KOMA at DeclareDeprecatedOption{headnosepline}{headsepline=false}
\KOMA at ifkey{footsepline}{@fsl}%
-\KOMA at kav@add{.\KOMAClassFileName}{footsepline}{false}
+\KOMA at kav@add{\KOMAClassFileName}{footsepline}{false}
\KOMA at DeclareDeprecatedOption{footnosepline}{footsepline=false}
\KOMA at key{cleardoublepage}{%
\begingroup
@@ -1117,7 +1162,7 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{cleardoublepage}{current}%
}%
@@ -1128,7 +1173,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{cleardoublepage}{#1}%
}%
@@ -1141,7 +1186,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}%
{cleardoublepage}{#1}%
}%
}{}%
@@ -1169,16 +1214,18 @@
\newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}}
\newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}
\renewcommand*{\cleardoublepage}{%
- \expandafter\ifnum \@nameuse{scr at v@2.98c}<\scr at compatibility\relax
+ \expandafter\ifnum \scr at v@is at gt{2.98c}%
\cleardoubleemptypage
\else
\cleardoublestandardpage
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{cleardoublepage}{%
- \expandafter\ifnum \scr at v@is at gt{2.98c}empty\else current\fi
+ \expandafter\ifnum \scr at v@is at gt{2.98c}
+ empty%
+ \else current\fi
}
\AtEndOfClass{%
\KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
@@ -1185,10 +1232,10 @@
{%
\KOMAClassFileName
}{cleardoublepage}%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{cleardoublepage}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
\KOMAClassFileName
}{cleardoublepage}{\@tempa}%
}
@@ -1201,7 +1248,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 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
%%% (run: option)
\newif\if at captionabove\@captionabovefalse
\newif\if at tablecaptionabove\@tablecaptionabovefalse
@@ -1235,101 +1282,101 @@
\@tablecaptionabovetrue
\@figurecaptionabovetrue
\@captionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{heading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{signature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{heading}%
\or % signature
\@tablecaptionabovefalse
\@figurecaptionabovefalse
\@captionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{heading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{signature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{signature}%
\or % tableheading
\@tablecaptionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{tableheading}%
\or % tablesignature
\@tablecaptionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{tablesignature}%
\or % figureheading
\@figurecaptionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{figureheading}%
\or % figuresignature
\@figurecaptionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{figuresignature}%
\or % oneline
\onelinecaptionstrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{oneline}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{oneline}%
\or % nooneline
\onelinecaptionsfalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{oneline}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{nooneline}%
\or % rightbeside
\renewcommand*{\scap at pos}{r}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{rightbeside}%
\or % leftbeside
\renewcommand*{\scap at pos}{l}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{leftbeside}%
\or % innerbeside
\renewcommand*{\scap at pos}{i}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{innerbeside}%
\or % outerbeside
\renewcommand*{\scap at pos}{o}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{outerbeside}%
\or % topbeside
\renewcommand*{\scap at valign}{t}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{topbeside}%
\or % centeredbeside
\renewcommand*{\scap at valign}{c}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{centeredbeside}%
\or % bottombeside
\renewcommand*{\scap at valign}{b}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{bottombeside}%
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{signature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{tablesignature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{figuresignature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{oneline}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{rightbeside}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{bottombeside}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{signature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{tablesignature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{figuresignature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{oneline}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{rightbeside}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{bottombeside}
\KOMA at DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading}
\KOMA at DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature}
\newif\if at komalongtable\@komalongtabletrue
@@ -1336,7 +1383,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA at DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA at DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\KOMA at key{footnotes}{%
\ifx\@footnotemark\scr at saved@footnotemark
@@ -1356,7 +1403,7 @@
\def\FN at mf@prepare{\scr at mf@prepare}%
\def\scr at footmisc@options{multiple}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{footnotes}{multiple}%
}{%
@@ -1365,7 +1412,7 @@
\let\FN at mf@prepare\relax
\let\scr at footmisc@options\@empty
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{footnotes}{nomultiple}%
}{%
@@ -1375,17 +1422,17 @@
}
\AtBeginDocument{%
\ifx\@footnotemark\scr at saved@footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{footnotes}{nomultiple}%
\else\ifx\@footnotemark\scr at footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{footnotes}{multiple}%
\fi\fi
@@ -1407,7 +1454,7 @@
\csname FN at mf@prepare\endcsname
\ifhmode\spacefactor\@x at sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
%%% (run: option)
\newif\if at tocleft
\KOMA at key{toc}{%
@@ -1450,24 +1497,24 @@
\or % bibliographynumbered
\KOMAoptions{bibliography=totocnumbered}%
\or % flat
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{flat}%
\@toclefttrue
\or % graduated
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{graduated}%
\@tocleftfalse
\or % indenttextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{indenttextentries}%
\expandafter\setuptoc\expandafter{\ext at toc}{numberline}%
\or % leftaligntextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{leftaligntextentries}%
\expandafter\unsettoc\expandafter{\ext at toc}{numberline}%
\or % chapterentrywithdots/sectionentrywithdots
\KOMAoptions{sectionentrydots=true}%
@@ -1498,14 +1545,14 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax % notoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{notoc}%
\renewcommand*{\float@@listhead}{%
\section*
}%
@@ -1518,14 +1565,14 @@
\unsettoc{\@currext}{totoc}%
}%
\or% totoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{totoc}%
\renewcommand*{\float@@listhead}{%
\addsec
}%
@@ -1538,14 +1585,14 @@
\setuptoc{\@currext}{totoc}%
}%
\or% numbered
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{numbered}%
\renewcommand*{\float@@listhead}{%
\section
}%
@@ -1558,18 +1605,18 @@
\setuptoc{\@currext}{totoc}%
}%
\or% flat
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{flat}%
\@dynlisttrue
\or% graduated
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{graduated}%
\@dynlistfalse
\or% leveldown
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{leveldown}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
@@ -1577,8 +1624,8 @@
\setuptoc{\@currext}{leveldown}%
}%
\or% standardlevel
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leveldown}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{standardlevel}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{leveldown}%
}%
@@ -1586,7 +1633,7 @@
\unsettoc{\@currext}{leveldown}%
}%
\or% entryprefix
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{entryprefix}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{entryprefix}%
\@dynlisttrue
\doforeachtocfile[float]{%
\BeforeStartingTOC[\@currext]{%
@@ -1607,9 +1654,9 @@
}%
}%
\or% indenttextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{indenttextentries}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{numberline}%
}%
@@ -1617,9 +1664,9 @@
\setuptoc{\@currext}{numberline}%
}
\or% leftaligntextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{numberline}%
}%
@@ -1629,15 +1676,15 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{toc}{nolistof}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{notoc}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{graduated}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}
+\KOMA at kav@add{\KOMAClassFileName}{toc}{nolistof}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{notoc}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{graduated}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}
\KOMA at DeclareDeprecatedOption{liststotoc}{listof=totoc}
\KOMA at DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA at DeclareDeprecatedOption{listsleft}{listof=flat}
\KOMA at DeclareDeprecatedOption{listsindent}{listof=graduated}
-%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $
%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr at ifundefinedorrelax{scr at bibstyle@#2}{%
@@ -1660,13 +1707,13 @@
\@ifundefined{scr at current@bibstyle}{}{%
\Ifstr{\scr at current@bibstyle}{}{}{%
\edef\reserved at a{%
- \noexpand\KOMA at kav@remove{.\KOMAClassFileName}{bibliography}%
+ \noexpand\KOMA at kav@remove{\KOMAClassFileName}{bibliography}%
{\scr at current@bibstyle}%
}\reserved at a
}%
}%
\def\scr at current@bibstyle{#2}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{bibliography}{#2}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{bibliography}{#2}%
\csname scr at bibstyle@#1\endcsname
#3%
}%
@@ -1731,14 +1778,14 @@
{standardlevel}{4}%
}{#1}%
\ifcase \@tempa\relax % notoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{notoc}%
\renewcommand*{\bibliography at heading}[1]{%
\ifbib at leveldown
\subsection*{##1}%
@@ -1749,14 +1796,14 @@
\fi
}%
\or% totoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{totoc}%
\renewcommand*{\bibliography at heading}[1]{%
\ifbib at leveldown
\subsection*{%
@@ -1770,14 +1817,14 @@
\fi
}%
\or% numbered
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{numbered}%
\renewcommand*{\bibliography at heading}[1]{%
\ifbib at leveldown
\subsection{##1}%
@@ -1787,20 +1834,20 @@
\fi
}
\or% leveldown
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{leveldown}%
\bib at leveldowntrue
\or% standardlevel
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{standardlevel}%
\bib at leveldownfalse
\fi
}{%
\FamilyKeyStateProcessed
\edef\reserved at a{%
- \noexpand\KOMA at kav@remove{.\KOMAClassFileName}{bibliography}%
+ \noexpand\KOMA at kav@remove{\KOMAClassFileName}{bibliography}%
{\scr at current@bibstyle}%
}\reserved at a
\csname scr at bibstyle@#1\endcsname
@@ -1809,7 +1856,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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx at leveldown
@@ -1830,14 +1877,14 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{notoc}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
\expandafter\subsection
@@ -1846,14 +1893,14 @@
\fi*%
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{toc}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
\expandafter\subsection\expandafter*
@@ -1862,14 +1909,14 @@
\fi
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{numbered}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
\expandafter\subsection
@@ -1878,28 +1925,28 @@
\fi
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{leveldown}%
\idx at leveldowntrue
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{standardlevel}%
\idx at leveldownfalse
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{toc}{noindex}
-\KOMA at kav@add{.\KOMAClassFileName}{index}{notoc}
-\KOMA at kav@add{.\KOMAClassFileName}{index}{standardlevel}
+\KOMA at kav@add{\KOMAClassFileName}{toc}{noindex}
+\KOMA at kav@add{\KOMAClassFileName}{index}{notoc}
+\KOMA at kav@add{\KOMAClassFileName}{index}{standardlevel}
\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
@@ -1906,7 +1953,7 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\AtBeginDocument{%
\begingroup
@@ -1955,7 +2002,7 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\newcommand*\scr at setlength[4]{%
\expandafter\ifnum\scr at v@is at lt{3.12}\relax
@@ -1993,7 +2040,7 @@
\fi
}
\providecommand*{\simple at changefontsizes}[2][1.2\@tempdima]{%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{fontsize}%
\@defaultunits\@tempdima#2pt\relax\@nnil
@@ -2142,7 +2189,9 @@
\let\Huge\@undefined
\expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved at a}%
\normalsize
- \expandafter\ifnum\scr at v@is at ge{3.17}\@nameuse{par at updaterelative}\fi
+ \expandafter\ifnum\scr at v@is at ge{3.17}
+ \@nameuse{par at updaterelative}%
+ \fi
\expandafter\ifnum\scr at v@is at lt{3.12}\relax
\setlength{\footnotesep}{.7\@tempdimc}%
\setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
@@ -2342,25 +2391,25 @@
\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}%
}{%
\InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak
file `\@fontsizefilebase\@tempa.clo' to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb pt}%
}{%
\InputIfFileExists{size\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `size\@tempb.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
\edef\@tempa{%
\noexpand\changefontsizes{\@tempa}%
- \noexpand\KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ \noexpand\KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}%
}\@tempa
}%
}%
@@ -2454,13 +2503,13 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: body)
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2507,7 +2556,7 @@
\fi
}%
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
%%% (run: body)
\newcommand*{\par at updaterelative}{%
\begingroup
@@ -2683,7 +2732,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $
%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -2734,8 +2783,7 @@
\next at tpage\if at twoside \ifodd\value{page}\else\null\next at tpage\fi\fi
}
\newcommand*\maketitle[1][1]{%
- \expandafter\ifnum \csname scr at v@3.12\endcsname>\scr at compatibility\relax
- \else
+ \expandafter\ifnum \scr at v@is at ge{3.12}%
\def\and{%
\end{tabular}%
\hskip 1em \@plus.17fil%
@@ -2831,8 +2879,7 @@
\vfill\null
\if at twoside
\@tempswatrue
- \expandafter\ifnum \@nameuse{scr at v@3.12}>\scr at compatibility\relax
- \else
+ \expandafter\ifnum \scr at v@is at ge{3.12}%
\ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
\@tempswafalse
\fi\fi
@@ -2850,7 +2897,8 @@
\fi
\else
\ifx\@uppertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\uppertitleback\space ignored
by \string\maketitle\MessageBreak
in `twoside=false' mode%
@@ -2857,7 +2905,8 @@
}%
\fi
\ifx\@lowertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\lowertitleback\space ignored
by \string\maketitle\MessageBreak
in `twoside=false' mode%
@@ -2879,13 +2928,15 @@
\@tempcnta=%
#1%
\relax\ifnum\@tempcnta=1\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
Optional argument of \string\maketitle\space ignored\MessageBreak
in `titlepage=false' mode%
}%
\fi
\ifx\@uppertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\uppertitleback\space ignored
by \string\maketitle\MessageBreak
in `titlepage=false' mode%
@@ -2892,7 +2943,8 @@
}%
\fi
\ifx\@lowertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\lowertitleback\space ignored
by \string\maketitle\MessageBreak
in `titlepage=false' mode%
@@ -2954,7 +3006,7 @@
\endgroup
\fi
\setcounter{footnote}{0}%
- \expandafter\ifnum \csname scr at v@3.12\endcsname>\scr at compatibility\relax
+ \expandafter\ifnum \scr at v@is at lt{3.12}%
\let\thanks\relax
\let\maketitle\relax
\let\@maketitle\relax
@@ -3050,9 +3102,6 @@
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \if at compatibility
- \setcounter{page}{0}%
- \fi
}{%
\if at restonecol\twocolumn \else \newpage \fi
}%
@@ -3102,10 +3151,10 @@
\newcommand*\abstractname{Abstract}
\providecaptionname{american,australian,british,canadian,english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: body)
\let\numberline\scr at numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -3119,7 +3168,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
@@ -3138,7 +3187,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,subsection)
\CloneTOCEntryStyle{tocline}{subsection}
\TOCEntryStyleStartInitCode{subsection}{%
@@ -3145,10 +3194,10 @@
\expandafter\providecommand%
\csname scr at tso@#1 at linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{subsection}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: body)
\BeforeClosingMainAux{%
\if at autodot\if at filesw\immediate\write\@mainaux{%
@@ -3517,7 +3566,7 @@
\z@
\fi
\let\@svsec\@empty
- \expandafter\ifnum\scr at v@is at lt{3.31}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.31}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
@@ -3675,7 +3724,7 @@
This could result in several error messages}%
\def\scr at s@ct@@nn at m@{\string\scr at s@ct@@nn at m@}%
}{%
- \expandafter\ifnum\scr at v@is at lt{3.31}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.31}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@\scr at s@ct@@nn at m@\endcsname
@@ -4756,7 +4805,7 @@
{\@currenttocentry}%
\fi
}{%
- \expandafter\ifnum\scr at v@is at lt{3.18}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.18}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
@@ -4927,7 +4976,8 @@
\fi
{\parindent \z@
\expandafter\ifnum\scr at v@is at gt{2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+ \fi
\raggedsection\normalfont\sectfont\nobreak
\usekomafont{minisec}{\nobreak\interlinepenalty \@M #1\par\nobreak}%
}\nobreak
@@ -5048,7 +5098,7 @@
\fi
\newcommand*{\scr at fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\newif\if at restonecol
\newcommand{\dictum}[2][]{\par%
@@ -5070,7 +5120,7 @@
\newcommand*{\dictumauthorformat}[1]{(#1)}
\newcommand*{\raggeddictumtext}{\raggedright}
\newcommand*{\raggeddictumauthor}{\raggedleft}
-\newkomafont{dictum}{\normalfont\normalcolor\@gr at gsffamily\small}
+\newkomafont{dictum}{\normalfont\normalcolor\maybesffamily\small}
\newkomafont{dictumauthor}{\itshape}
\aliaskomafont{dictumtext}{dictum}
\setlength{\skip\@mpfootins}{\skip\footins}
@@ -5138,7 +5188,7 @@
\fi
}
\newcommand\marginline[1]{%
- \marginpar[\raggedleft{#1}]{\raggedright #1}%
+ \marginpar[{\raggedleft #1}]{\raggedright #1}%
}
\scr at ifundefinedorrelax{textsubscript}{%
\DeclareRobustCommand*\textsubscript[1]{%
@@ -5358,7 +5408,7 @@
\let\scr at mt@saved at sect\relax
\fi
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: body)
\newcommand*{\set at tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -5454,7 +5504,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\providecommand*{\@mkleft}{%
\IfActiveMkBoth{\markleft}{\@gobble}%
@@ -5465,7 +5515,7 @@
\providecommand{\@mkdouble}[1]{%
\@mkboth{#1}{#1}%
}
-%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
%%% (run: body)
\newlength{\abovecaptionskip}
\newlength{\belowcaptionskip}
@@ -6228,7 +6278,7 @@
\expandafter\ifnum\scr at v@is at lt{3.35}%
\renewcommand*\thetable{\@arabic\c at table}
\fi
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn at rule@test at values
@@ -6389,7 +6439,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
%%% (run: body)
\g at addto@macro{\numberline at numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -6533,7 +6583,7 @@
UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables}
\renewcommand*\listoflotname{\listtablename}
\renewcommand*\listoflotentryname{\tablename}
-%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $
%%% (run: body)
\newcommand*\refname{References}
\providecaptionname{american,australian,british,canadian,english,newzealand,%
@@ -6621,7 +6671,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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $
%%% (run: body)
\newcommand*{\index at preamble}{}
\let\index at preamble=\relax
@@ -6665,7 +6715,7 @@
\newcommand*\indexname{Index}
\providecaptionname{american,australian,british,canadian,english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\if at twocolumn
\setlength{\leftmargini}{2em}
@@ -6816,7 +6866,7 @@
\fi
\item\is at thispageodd@setlabel\nobreak\ignorespaces
}
-\newcommand*\descfont{\@gr at gsffamily\bfseries}
+\newcommand*\descfont{\maybesffamily\bfseries}
\newcommand*{\scr at fnt@descriptionlabel}{\descfont}
\newcommand*{\labelitemfont}{\normalfont}
\newcommand*\scr at fnt@itemizelabel{\labelitemfont}
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -60,15 +60,13 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
\let\scr at clsextension\@clsextension
}
-\newcommand*{\KOMAClassName}{%
- scrartcl%
-}
+\newcommand*{\KOMAClassName}{scrartcl}
\newcommand*{\ClassName}{%
article%
}
@@ -77,7 +75,7 @@
\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
\edef\KOMALongClassFileName{\KOMALongClassFileName}
\ProvidesClass{\KOMALongClassName}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrbase.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,19 +66,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package
(%
KOMA-Script-independent
@@ -597,7 +597,7 @@
\long\def\l at addto@macro#1#2{%
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: option)
\DefineFamily{KOMA}
\DefineFamilyMember{KOMA}
@@ -609,9 +609,9 @@
\RelaxFamilyKey[.scrbase.sty]{KOMA}{internalonly}%
}
\FamilyProcessOptions{KOMA}\relax
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: body)
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
@@ -2496,7 +2496,7 @@
}%
}%
}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: body)
\newcommand*{\defcaptionname}{%
\kernel at ifstar\scr at def@scaptionname\scr at def@captionname
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,15 +106,13 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
\let\scr at clsextension\@clsextension
}
-\newcommand*{\KOMAClassName}{%
- scrbook%
-}
+\newcommand*{\KOMAClassName}{scrbook}
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\newcommand*{\ClassName}{%
@@ -121,16 +119,16 @@
book%
}
\ProvidesClass{\KOMAClassName}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
@@ -141,9 +139,9 @@
\expandafter{\ext at toc}%
}
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: prepare)
\newif\if at openright
\@openrighttrue
@@ -229,8 +227,8 @@
\newcommand*{\scr at fnt@paragraph}{\size at paragraph}
\newcommand*{\size at subparagraph}{}
\newcommand*{\scr at fnt@subparagraph}{\size at subparagraph}
-\newcommand*{\sectfont}{\normalcolor\@gr at gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries}
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -316,10 +314,11 @@
\@namedef{scr at v@3.36}{20}
\@namedef{scr at v@3.37}{20}
\@namedef{scr at v@3.38}{20}
+\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@last}{20}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\newif\if at scr@emulatestandardclasses
\let\scr at emulatestandardclassestrue\relax
@@ -354,7 +353,7 @@
Because of this, version was set to `first'%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{version}{first}%
}{%
@@ -363,7 +362,7 @@
}%
\edef\scr at compatibility{\@nameuse{scr at v@#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{version}{#1}%
\ifnum\scr at compatibility<\scr at v@last
@@ -384,7 +383,7 @@
\fi
}%
}
-\KOMA at kav@add{.\KOMAClassFileName}{version}{last}
+\KOMA at kav@add{\KOMAClassFileName}{version}{last}
\AtEndOfClass{%
\KOMA at key{version}[]{%
\ClassError{\KOMAClassName}{%
@@ -409,24 +408,27 @@
\newcommand*{\scr at v@is at ge}[1]{%
\numexpr\scr at compatibility+\@ne\relax>\@nameuse{scr at v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+\newcommand*{\scr at v@is at eq}[1]{%
+ \scr at compatibility=\@nameuse{scr at v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
@@ -433,7 +435,7 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{draft}{false}
+\KOMA at kav@add{\KOMAClassFileName}{draft}{false}
\KOMA at DeclareStandardOption
{final}{draft=false}
\KOMA at key{overfullrule}[true]{%
@@ -440,18 +442,18 @@
\KOMA at set@ifkey{overfullrule}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
@@ -458,16 +460,12 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{overfullrule}{false}
+\KOMA at kav@add{\KOMAClassFileName}{overfullrule}{false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-\KOMA at ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
-\newcommand*{\@gr at gsffamily}{%
- \if at egregdoesnotlikesansseriftitles\else\sffamily\fi
-}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\providecommand*\@ptsize{%
11%
@@ -556,7 +554,7 @@
\@tempa
}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{fontsize}{#1}%
}
@@ -578,7 +576,52 @@
\BeforePackage{tex4ht}{%
\let\scr at defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+\KOMA at ifkey{sfdefaults}{@sfdefaults}
+\newcommand*{\maybesffamily}{\if at sfdefaults \sffamily \fi}
+\newcommand*{\textmaybesf}{%
+ \if at sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi
+}
+%% \begin{option}{egegdoesnotlikesansseriftitles}
+\KOMA at key{egregdoesnotlikesansseriftitles}[true]{%
+ \ClassWarningNoLine{\KOMAClassName}%
+ {%
+ You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak
+ In 2016 this option has been implemented as a joke\MessageBreak
+ answer to egreg's comment:\MessageBreak
+ \space\space ``In my opinion there should be a document class\MessageBreak
+ \space\space option for it, instead of the
+ \string\setkomafont\MessageBreak
+ \space\space statement. And yes, I find imposing sans serif
+ for\MessageBreak
+ \space\space titles is not the best choice (one of the
+ reasons\MessageBreak
+ \space\space why I don't use Koma-script classes).''\MessageBreak
+ to question https://tex.stackexchange.com/q/289853\MessageBreak
+ at TeX.SX.\MessageBreak
+ The option has never been documented in the official\MessageBreak
+ user manuals and therefore should never have been\MessageBreak
+ used in real live documents. It was intended to be\MessageBreak
+ removed after some month.\MessageBreak
+ However, it has been used and also almost forgotten\MessageBreak
+ by the author.\MessageBreak
+ For this the author apologizes both to users but\MessageBreak
+ especially to egreg.\MessageBreak
+ Rightly, egreg has criticized the permanent retention\MessageBreak
+ of the option as unfunny to inappropriate and has\MessageBreak
+ asked that it be removed or replaced.\MessageBreak
+ It will be removed soon!\MessageBreak
+ You should use `sfdefaults=false` instead%
+ }%
+ \KOMA at set@ifkey{egregdoesnotlikesansseriftitles}%
+ {@sfdefaults}%
+ {#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if at sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}%
+ {sfdefaults}{\if at sfdefaults true\else false\fi}%
+ \fi
+}
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: options)
\KOMA at key{twoside}[true]{%
\if at atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -598,9 +641,9 @@
\if at twocolumn\sloppy\flushbottom\else\raggedbottom\fi
\fi
\fi
- \KOMA at kav@xreplacevalue{.%
- \KOMAClassFileName
- }{twoside}{#1}%
+ \KOMA at kav@xreplacevalue
+ {\KOMAClassFileName}%
+ {twoside}{#1}%
\fi
}
\KOMAExecuteOptions{twoside=true}
@@ -610,21 +653,23 @@
\if at atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
\KOMA at set@ifkey{twocolumn}{@twocolumn}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.%
- \KOMAClassFileName
- }{twocolumn}{@twocolumn}%
+ \KOMA at kav@replacebool
+ {\KOMAClassFileName}%
+ {twocolumn}{@twocolumn}%
\if at atdocument\expandafter\@firstofone
\else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
{\expandafter\AtEndOfClass}\fi
- {\expandafter\ifnum\scr at v@is at ge{3.17}%
- \if at twocolumn\twocolumn\sloppy\flushbottom
- \else
- \onecolumn
- \if at twoside\flushbottom\else
- \raggedbottom
+ {%
+ \expandafter\ifnum\scr at v@is at ge{3.17}%
+ \if at twocolumn\twocolumn\sloppy\flushbottom
+ \else
+ \onecolumn
+ \if at twoside\flushbottom\else
+ \raggedbottom
+ \fi
\fi
\fi
- \fi}%
+ }%
\fi
}
\AtEndOfClass{%
@@ -705,7 +750,7 @@
}
\DeclareOption*{%
\x at paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f at parindent{\the\parindent}%
@@ -718,16 +763,16 @@
\if at atdocument\let\par at update\default at par@update\fi
\par at updaterelative
}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{false}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{never}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full-}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full+}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full*}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half-}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half+}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half*}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{false}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{never}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full-}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full+}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full*}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half-}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half+}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half*}%
}
\newcommand*{\f at parindent}{\the\parindent}
\newcommand*{\f at parskip}{\the\parskip}
@@ -766,66 +811,66 @@
\ifcase\number\@tempa% 0
\endgroup
\setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{never}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{never}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
\setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{false}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{false}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 2
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full-}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full-}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half-}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half-}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 4
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 6
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full+}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full+}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half+}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half+}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 8
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full*}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full*}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half*}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half*}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 10
\endgroup
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{relative}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{relative}%
\ifx\par at updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -839,9 +884,9 @@
}%
\or%11
\endgroup
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{relative}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}%
\ifx\par at updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -869,9 +914,9 @@
\KOMA at DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA at DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA at DeclareDeprecatedOption{parindent}{parskip=false}
-\KOMA at kav@add{.\KOMAClassFileName}{parskip}{false}
-\KOMA at kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $
+\KOMA at kav@add{\KOMAClassFileName}{parskip}{false}
+\KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}
+%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $
%%% (run: option)
\newif\if at titlepage
\@titlepagetrue
@@ -881,7 +926,7 @@
\@titlepagetrue
\@titlepageiscoverpagetrue
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{titlepage}{firstiscover}%
}{%
@@ -888,10 +933,10 @@
\def\FamilyElseValue{, `firstiscover'}%
\KOMA at set@ifkey{titlepage}{@titlepage}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{titlepage}{firstiscover}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{titlepage}{@titlepage}%
\@titlepageiscoverpagefalse
@@ -898,14 +943,14 @@
\fi
}%
}
-\KOMA at kav@xadd{.%
+\KOMA at kav@xadd{%
\KOMAClassFileName
}{titlepage}{\if at titlepage true\else false\fi}
\KOMA at DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: option)
\KOMA at key{open}{%
\KOMA at set@ncmdkey{open}{@tempa}{%
@@ -914,20 +959,20 @@
{left}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{open}{#1}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{openany}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{openright}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{openleft}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{open}{#1}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{openany}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{openright}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{openleft}%
\ifcase \@tempa\relax
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{openany}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{openany}%
\@openrightfalse
\renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
\or
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{openright}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{openright}%
\@openrighttrue
\renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
\or
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{openleft}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{openleft}%
\@openrighttrue
\renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
\fi
@@ -944,7 +989,7 @@
{noenddot}{2},{nodotatend}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{numbers}{#1}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{numbers}{#1}%
\ifcase \@tempa\relax
\if at atdocument\scr at dotchangeatdocument{#1}\else
\let\scr at altsecnumhook\@empty
@@ -964,7 +1009,7 @@
\KOMA at DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
\KOMA at ifkey{bookmarkpackage}{@scr at autoloadbookmarkpackage}
\@scr at autoloadbookmarkpackagetrue
-\KOMA at kav@add{.\KOMAClassFileName}{bookmarkpackage}{true}
+\KOMA at kav@add{\KOMAClassFileName}{bookmarkpackage}{true}
\AfterAtEndOfPackage{hyperref}{%
\AtBeginDocument{%
\@ifpackageloaded{bookmark}{}{%
@@ -1055,26 +1100,26 @@
\KOMA at key{chapterprefix}[true]{%
\KOMA at set@ifkey{chapterprefix}{@chapterprefix}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.\KOMAClassFileName}%
+ \KOMA at kav@replacebool{\KOMAClassFileName}%
{chapterprefix}{@chapterprefix}%
- \KOMA at kav@remove{.\KOMAClassFileName}%
+ \KOMA at kav@remove{\KOMAClassFileName}%
{headings}{twolinechapter}%
- \KOMA at kav@remove{.\KOMAClassFileName}%
+ \KOMA at kav@remove{\KOMAClassFileName}%
{headings}{onelinechapter}%
- \KOMA at kav@xadd{.\KOMAClassFileName}%
+ \KOMA at kav@xadd{\KOMAClassFileName}%
{headings}{%
\if at chapterprefix twolinechapter\else onelinechapter\fi
}%
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{headings}{onelinechapter}%
+\KOMA at kav@add{\KOMAClassFileName}{headings}{onelinechapter}%
\KOMA at DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
\IfLTXAtLeastTF{2020/10/01}{%
\KOMA at key{appendixprefix}[true]{%
\Ifstr{#1}{default}{%
- \KOMA at kav@removekey{.\KOMAClassFileName}{appendixprefix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{appendixprefix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{onelineappendix}%
\IfHookEmptyTF{\KOMAClassName/appendix}{}{%
\RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]%
}%
@@ -1082,18 +1127,18 @@
}{%
\KOMA at set@ifkey{appendixprefix}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{appendixprefix}{#1}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{onelineappendix}%
\IfHookEmptyTF{\KOMAClassName/appendix}{}{%
\RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]%
}%
\if at tempswa
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{twolineappendix}%
\AddToHook{\KOMAClassName/appendix}[appendixprefix]%
{\@chapterprefixtrue}%
\else
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{onelineappendix}%
\AddToHook{\KOMAClassName/appendix}[appendixprefix]%
{\@chapterprefixfalse}%
\fi
@@ -1104,11 +1149,11 @@
\KOMA at key{appendixprefix}[true]{%
\KOMA at set@ifkey{appendixprefix}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{appendixprefix}{#1}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{onelineappendix}%
\if at tempswa
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{twolineappendix}%
\@ifundefined{appendixmore}{%
\def\appendixmore{\@chapterprefixtrue}%
}{%
@@ -1115,7 +1160,7 @@
\l at addto@macro\appendixmore{\@chapterprefixtrue}%
}%
\else
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{onelineappendix}%
\@ifundefined{appendixmore}{%
\def\appendixmore{\@chapterprefixfalse}%
}{%
@@ -1150,11 +1195,11 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax% big
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{big}%
\renewcommand*{\scr at chapter@beforeskip}{-3.3\baselineskip-\parskip}%
\renewcommand*{\scr at chapter@afterskip}{%
1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip
@@ -1162,8 +1207,9 @@
\renewcommand*{\scr at chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa
- \else\vskip\@tempskipa\fi
+ \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa\else
+ \vskip\@tempskipa
+ \fi
}%
\renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\setkomafont{part}{\Huge}%
@@ -1176,11 +1222,11 @@
\setkomafont{paragraph}{\normalsize}%
\setkomafont{subparagraph}{\normalsize}%
\or % normal
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{normal}%
\renewcommand*{\scr at chapter@beforeskip}{-3\baselineskip-\parskip}%
\renewcommand*{\scr at chapter@afterskip}{%
1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip
@@ -1188,8 +1234,9 @@
\renewcommand*{\scr at chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa
- \else\vskip\@tempskipa\fi
+ \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa\else
+ \vskip\@tempskipa
+ \fi
}%
\renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\setkomafont{part}{\huge}%
@@ -1202,11 +1249,11 @@
\setkomafont{paragraph}{\normalsize}%
\setkomafont{subparagraph}{\normalsize}%
\or % small
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{small}%
\renewcommand*{\scr at chapter@beforeskip}{-2.8\baselineskip-\parskip}%
\renewcommand*{\scr at chapter@afterskip}{%
1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip
@@ -1214,8 +1261,9 @@
\renewcommand*{\scr at chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa
- \else\vskip\@tempskipa\fi
+ \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa\else
+ \vskip\@tempskipa
+ \fi
}%
\renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\setkomafont{part}{\LARGE}%
@@ -1242,29 +1290,29 @@
\or % onelineappendix
\KOMAoptions{appendixprefix=false}%
\or % optiontotocandhead
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontotocandhead}%
\scr at activate@xsection{3}%
\or % optiontotoc
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontotoc}%
\scr at activate@xsection{2}%
\or % optiontohead
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontohead}%
\scr at activate@xsection{1}%
\or % standardclasses
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{standardclasses}%
\renewcommand*{\scr at chapter@beforeskip}{-50\p@}%
\renewcommand*{\scr at chapter@afterskip}{40\p@}%
\renewcommand*{\scr at chapter@innerskip}{20\p@}%
@@ -1285,18 +1333,18 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{headings}{big}
-\KOMA at kav@add{.\KOMAClassFileName}{headings}{onelinechapter}
+\KOMA at kav@add{\KOMAClassFileName}{headings}{big}
+\KOMA at kav@add{\KOMAClassFileName}{headings}{onelinechapter}
\KOMA at DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA at DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA at DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: option)
\KOMA at ifkey{headsepline}{@hsl}%
-\KOMA at kav@add{.\KOMAClassFileName}{headsepline}{false}
+\KOMA at kav@add{\KOMAClassFileName}{headsepline}{false}
\KOMA at DeclareDeprecatedOption{headnosepline}{headsepline=false}
\KOMA at ifkey{footsepline}{@fsl}%
-\KOMA at kav@add{.\KOMAClassFileName}{footsepline}{false}
+\KOMA at kav@add{\KOMAClassFileName}{footsepline}{false}
\KOMA at DeclareDeprecatedOption{footnosepline}{footsepline=false}
\KOMA at key{cleardoublepage}{%
\begingroup
@@ -1311,7 +1359,7 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{cleardoublepage}{current}%
}%
@@ -1322,7 +1370,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{cleardoublepage}{#1}%
}%
@@ -1335,7 +1383,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}%
{cleardoublepage}{#1}%
}%
}{}%
@@ -1363,16 +1411,18 @@
\newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}}
\newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}
\renewcommand*{\cleardoublepage}{%
- \expandafter\ifnum \@nameuse{scr at v@2.98c}<\scr at compatibility\relax
+ \expandafter\ifnum \scr at v@is at gt{2.98c}%
\cleardoubleemptypage
\else
\cleardoublestandardpage
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{cleardoublepage}{%
- \expandafter\ifnum \scr at v@is at gt{2.98c}empty\else current\fi
+ \expandafter\ifnum \scr at v@is at gt{2.98c}
+ empty%
+ \else current\fi
}
\AtEndOfClass{%
\KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
@@ -1379,10 +1429,10 @@
{%
\KOMAClassFileName
}{cleardoublepage}%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{cleardoublepage}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
\KOMAClassFileName
}{cleardoublepage}{\@tempa}%
}
@@ -1395,7 +1445,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 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
%%% (run: option)
\newif\if at captionabove\@captionabovefalse
\newif\if at tablecaptionabove\@tablecaptionabovefalse
@@ -1429,101 +1479,101 @@
\@tablecaptionabovetrue
\@figurecaptionabovetrue
\@captionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{heading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{signature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{heading}%
\or % signature
\@tablecaptionabovefalse
\@figurecaptionabovefalse
\@captionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{heading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{signature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{signature}%
\or % tableheading
\@tablecaptionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{tableheading}%
\or % tablesignature
\@tablecaptionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{tablesignature}%
\or % figureheading
\@figurecaptionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{figureheading}%
\or % figuresignature
\@figurecaptionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{figuresignature}%
\or % oneline
\onelinecaptionstrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{oneline}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{oneline}%
\or % nooneline
\onelinecaptionsfalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{oneline}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{nooneline}%
\or % rightbeside
\renewcommand*{\scap at pos}{r}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{rightbeside}%
\or % leftbeside
\renewcommand*{\scap at pos}{l}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{leftbeside}%
\or % innerbeside
\renewcommand*{\scap at pos}{i}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{innerbeside}%
\or % outerbeside
\renewcommand*{\scap at pos}{o}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{outerbeside}%
\or % topbeside
\renewcommand*{\scap at valign}{t}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{topbeside}%
\or % centeredbeside
\renewcommand*{\scap at valign}{c}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{centeredbeside}%
\or % bottombeside
\renewcommand*{\scap at valign}{b}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{bottombeside}%
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{signature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{tablesignature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{figuresignature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{oneline}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{rightbeside}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{bottombeside}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{signature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{tablesignature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{figuresignature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{oneline}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{rightbeside}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{bottombeside}
\KOMA at DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading}
\KOMA at DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature}
\newif\if at komalongtable\@komalongtabletrue
@@ -1530,7 +1580,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA at DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA at DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\KOMA at key{footnotes}{%
\ifx\@footnotemark\scr at saved@footnotemark
@@ -1550,7 +1600,7 @@
\def\FN at mf@prepare{\scr at mf@prepare}%
\def\scr at footmisc@options{multiple}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{footnotes}{multiple}%
}{%
@@ -1559,7 +1609,7 @@
\let\FN at mf@prepare\relax
\let\scr at footmisc@options\@empty
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{footnotes}{nomultiple}%
}{%
@@ -1569,17 +1619,17 @@
}
\AtBeginDocument{%
\ifx\@footnotemark\scr at saved@footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{footnotes}{nomultiple}%
\else\ifx\@footnotemark\scr at footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{footnotes}{multiple}%
\fi\fi
@@ -1601,7 +1651,7 @@
\csname FN at mf@prepare\endcsname
\ifhmode\spacefactor\@x at sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
%%% (run: option)
\newif\if at tocleft
\KOMA at key{toc}{%
@@ -1644,24 +1694,24 @@
\or % bibliographynumbered
\KOMAoptions{bibliography=totocnumbered}%
\or % flat
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{flat}%
\@toclefttrue
\or % graduated
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{graduated}%
\@tocleftfalse
\or % indenttextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{indenttextentries}%
\expandafter\setuptoc\expandafter{\ext at toc}{numberline}%
\or % leftaligntextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{leftaligntextentries}%
\expandafter\unsettoc\expandafter{\ext at toc}{numberline}%
\or % chapterentrywithdots/sectionentrywithdots
\KOMAoptions{chapterentrydots=true}%
@@ -1696,14 +1746,14 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax % notoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{notoc}%
\renewcommand*{\float@@listhead}{%
\chapter*
}%
@@ -1716,14 +1766,14 @@
\unsettoc{\@currext}{totoc}%
}%
\or% totoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{totoc}%
\renewcommand*{\float@@listhead}{%
\addchap
}%
@@ -1736,14 +1786,14 @@
\setuptoc{\@currext}{totoc}%
}%
\or% numbered
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{numbered}%
\renewcommand*{\float@@listhead}{%
\chapter
}%
@@ -1756,18 +1806,18 @@
\setuptoc{\@currext}{totoc}%
}%
\or% flat
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{flat}%
\@dynlisttrue
\or% graduated
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{graduated}%
\@dynlistfalse
\or% leveldown
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{leveldown}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
@@ -1775,8 +1825,8 @@
\setuptoc{\@currext}{leveldown}%
}%
\or% standardlevel
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leveldown}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{standardlevel}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{leveldown}%
}%
@@ -1784,7 +1834,7 @@
\unsettoc{\@currext}{leveldown}%
}%
\or% entryprefix
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{entryprefix}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{entryprefix}%
\@dynlisttrue
\doforeachtocfile[float]{%
\BeforeStartingTOC[\@currext]{%
@@ -1805,9 +1855,9 @@
}%
}%
\or% indenttextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{indenttextentries}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{numberline}%
}%
@@ -1815,9 +1865,9 @@
\setuptoc{\@currext}{numberline}%
}
\or% leftaligntextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{numberline}%
}%
@@ -1835,10 +1885,10 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{toc}{nolistof}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{notoc}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{graduated}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}
+\KOMA at kav@add{\KOMAClassFileName}{toc}{nolistof}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{notoc}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{graduated}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}
\KOMA at DeclareDeprecatedOption{liststotoc}{listof=totoc}
\KOMA at DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA at DeclareDeprecatedOption{listsleft}{listof=flat}
@@ -1847,29 +1897,29 @@
\newif\if at chaptertolists\@chaptertolistsfalse
\KOMA at key{chapteratlists}[entry]{%
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chapterentry}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chaptergap}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chaptergapsmall}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chaptergapline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chapterentry}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chaptergap}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chaptergapsmall}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chaptergapline}%
\Ifstr{#1}{entry}{%
\@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}%
- \KOMA at kav@replacevalue{.\KOMAClassFileName}{chapteratlists}{entry}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chapterentry}%
+ \KOMA at kav@replacevalue{\KOMAClassFileName}{chapteratlists}{entry}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chapterentry}%
}{%
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
- \KOMA at kav@replacevalue{.\KOMAClassFileName}{chapteratlists}%
+ \KOMA at kav@replacevalue{\KOMAClassFileName}{chapteratlists}%
{\@chapterlistsgap}%
\def\reserved at a{\z@}%
\ifx\@chapterlistsgap\reserved at a
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergap}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergap}%
\else
\def\reserved at a{10\p@}%
\ifx\@chapterlistsgap\reserved at a
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergapsmall}%
\else
\def\reserved at a{\baselineskip}%
\ifx\@chapterlistsgap\reserved at a
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergapline}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergapline}%
\fi
\fi
\fi
@@ -1876,9 +1926,9 @@
}%
}
\BeforeTOCHead{\@chaptertolistsfalse}
-\KOMA at kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
-%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $
+\KOMA at kav@add{\KOMAClassFileName}{chapteratlists}{10\p@}%
+\KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergapsmall}%
+%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $
%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr at ifundefinedorrelax{scr at bibstyle@#2}{%
@@ -1901,13 +1951,13 @@
\@ifundefined{scr at current@bibstyle}{}{%
\Ifstr{\scr at current@bibstyle}{}{}{%
\edef\reserved at a{%
- \noexpand\KOMA at kav@remove{.\KOMAClassFileName}{bibliography}%
+ \noexpand\KOMA at kav@remove{\KOMAClassFileName}{bibliography}%
{\scr at current@bibstyle}%
}\reserved at a
}%
}%
\def\scr at current@bibstyle{#2}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{bibliography}{#2}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{bibliography}{#2}%
\csname scr at bibstyle@#1\endcsname
#3%
}%
@@ -1969,14 +2019,14 @@
{standardlevel}{4}%
}{#1}%
\ifcase \@tempa\relax % notoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{notoc}%
\renewcommand*{\bibliography at heading}[1]{%
\ifbib at leveldown
\section*{##1}%
@@ -1987,14 +2037,14 @@
\fi
}%
\or% totoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{totoc}%
\renewcommand*{\bibliography at heading}[1]{%
\ifbib at leveldown
\addsec{##1}%
@@ -2008,14 +2058,14 @@
\fi
}%
\or% numbered
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{numbered}%
\renewcommand*{\bibliography at heading}[1]{%
\ifbib at leveldown
\section{##1}%
@@ -2029,20 +2079,20 @@
\fi
}
\or% leveldown
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{leveldown}%
\bib at leveldowntrue
\or% standardlevel
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{standardlevel}%
\bib at leveldownfalse
\fi
}{%
\FamilyKeyStateProcessed
\edef\reserved at a{%
- \noexpand\KOMA at kav@remove{.\KOMAClassFileName}{bibliography}%
+ \noexpand\KOMA at kav@remove{\KOMAClassFileName}{bibliography}%
{\scr at current@bibstyle}%
}\reserved at a
\csname scr at bibstyle@#1\endcsname
@@ -2051,7 +2101,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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx at leveldown
@@ -2072,14 +2122,14 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{notoc}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
\expandafter\section
@@ -2088,14 +2138,14 @@
\fi*%
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{toc}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
\expandafter\addsec
@@ -2104,14 +2154,14 @@
\fi
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{numbered}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
\expandafter\section
@@ -2120,29 +2170,29 @@
\fi
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{leveldown}%
\idx at leveldowntrue
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{standardlevel}%
\idx at leveldownfalse
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{toc}{noindex}
-\KOMA at kav@add{.\KOMAClassFileName}{index}{notoc}
-\KOMA at kav@add{.\KOMAClassFileName}{index}{standardlevel}
+\KOMA at kav@add{\KOMAClassFileName}{toc}{noindex}
+\KOMA at kav@add{\KOMAClassFileName}{index}{notoc}
+\KOMA at kav@add{\KOMAClassFileName}{index}{standardlevel}
\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openright}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
@@ -2149,7 +2199,7 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\AtBeginDocument{%
\begingroup
@@ -2198,7 +2248,7 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\newcommand*\scr at setlength[4]{%
\expandafter\ifnum\scr at v@is at lt{3.12}\relax
@@ -2236,7 +2286,7 @@
\fi
}
\providecommand*{\simple at changefontsizes}[2][1.2\@tempdima]{%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{fontsize}%
\@defaultunits\@tempdima#2pt\relax\@nnil
@@ -2385,7 +2435,9 @@
\let\Huge\@undefined
\expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved at a}%
\normalsize
- \expandafter\ifnum\scr at v@is at ge{3.17}\@nameuse{par at updaterelative}\fi
+ \expandafter\ifnum\scr at v@is at ge{3.17}
+ \@nameuse{par at updaterelative}%
+ \fi
\expandafter\ifnum\scr at v@is at lt{3.12}\relax
\setlength{\footnotesep}{.7\@tempdimc}%
\setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
@@ -2585,31 +2637,31 @@
\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}%
}{%
\InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak
file `\@fontsizefilebase\@tempa.clo' to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb pt}%
}{%
\InputIfFileExists{bk\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `bk\@tempb.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
\InputIfFileExists{size\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `size\@tempb.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
\edef\@tempa{%
\noexpand\changefontsizes{\@tempa}%
- \noexpand\KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ \noexpand\KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}%
}\@tempa
}%
}%
@@ -2704,13 +2756,13 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: body)
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2757,7 +2809,7 @@
\fi
}%
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
%%% (run: body)
\newcommand*{\par at updaterelative}{%
\begingroup
@@ -2933,7 +2985,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $
%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -2984,8 +3036,7 @@
\next at tpage\if at twoside \ifodd\value{page}\else\null\next at tpage\fi\fi
}
\newcommand*\maketitle[1][1]{%
- \expandafter\ifnum \csname scr at v@3.12\endcsname>\scr at compatibility\relax
- \else
+ \expandafter\ifnum \scr at v@is at ge{3.12}%
\def\and{%
\end{tabular}%
\hskip 1em \@plus.17fil%
@@ -3081,8 +3132,7 @@
\vfill\null
\if at twoside
\@tempswatrue
- \expandafter\ifnum \@nameuse{scr at v@3.12}>\scr at compatibility\relax
- \else
+ \expandafter\ifnum \scr at v@is at ge{3.12}%
\ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
\@tempswafalse
\fi\fi
@@ -3100,7 +3150,8 @@
\fi
\else
\ifx\@uppertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\uppertitleback\space ignored
by \string\maketitle\MessageBreak
in `twoside=false' mode%
@@ -3107,7 +3158,8 @@
}%
\fi
\ifx\@lowertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\lowertitleback\space ignored
by \string\maketitle\MessageBreak
in `twoside=false' mode%
@@ -3129,13 +3181,15 @@
\@tempcnta=%
#1%
\relax\ifnum\@tempcnta=1\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
Optional argument of \string\maketitle\space ignored\MessageBreak
in `titlepage=false' mode%
}%
\fi
\ifx\@uppertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\uppertitleback\space ignored
by \string\maketitle\MessageBreak
in `titlepage=false' mode%
@@ -3142,7 +3196,8 @@
}%
\fi
\ifx\@lowertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\lowertitleback\space ignored
by \string\maketitle\MessageBreak
in `titlepage=false' mode%
@@ -3204,7 +3259,7 @@
\endgroup
\fi
\setcounter{footnote}{0}%
- \expandafter\ifnum \csname scr at v@3.12\endcsname>\scr at compatibility\relax
+ \expandafter\ifnum \scr at v@is at lt{3.12}%
\let\thanks\relax
\let\maketitle\relax
\let\@maketitle\relax
@@ -3301,9 +3356,6 @@
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \if at compatibility
- \setcounter{page}{0}%
- \fi
}{%
\if at restonecol\twocolumn \else \newpage \fi
}%
@@ -3317,10 +3369,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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: body)
\let\numberline\scr at numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -3334,7 +3386,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -3354,7 +3406,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
@@ -3361,10 +3413,10 @@
\expandafter\providecommand%
\csname scr at tso@#1 at linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: body)
\BeforeClosingMainAux{%
\if at autodot\if at filesw\immediate\write\@mainaux{%
@@ -3733,7 +3785,7 @@
\z@
\fi
\let\@svsec\@empty
- \expandafter\ifnum\scr at v@is at lt{3.31}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.31}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
@@ -3891,7 +3943,7 @@
This could result in several error messages}%
\def\scr at s@ct@@nn at m@{\string\scr at s@ct@@nn at m@}%
}{%
- \expandafter\ifnum\scr at v@is at lt{3.31}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.31}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@\scr at s@ct@@nn at m@\endcsname
@@ -5238,7 +5290,7 @@
{\@currenttocentry}%
\fi
}{%
- \expandafter\ifnum\scr at v@is at lt{3.18}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.18}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
@@ -5448,7 +5500,7 @@
{\@currenttocentry}%
\fi
\else
- \expandafter\ifnum\scr at v@is at lt{3.15}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.15}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
@@ -5571,7 +5623,9 @@
\csname scr@#1 at afterindent\endcsname
{\@afterindenttrue}{\@afterindentfalse}{%
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else
- \expandafter\ifnum\scr at v@is at ge{3.22}\@afterindenttrue\fi
+ \expandafter\ifnum\scr at v@is at ge{3.22}
+ \@afterindenttrue
+ \fi
\fi
}%
\chapterheadstartvskip
@@ -5633,7 +5687,9 @@
\csname scr@#1 at afterindent\endcsname
{\@afterindenttrue}{\@afterindentfalse}{%
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else
- \expandafter\ifnum\scr at v@is at ge{3.22}\@afterindenttrue\fi
+ \expandafter\ifnum\scr at v@is at ge{3.22}
+ \@afterindenttrue
+ \fi
\fi
}%
\chapterheadstartvskip
@@ -5830,7 +5886,8 @@
\fi
{\parindent \z@
\expandafter\ifnum\scr at v@is at gt{2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+ \fi
\raggedsection\normalfont\sectfont\nobreak
\usekomafont{minisec}{\nobreak\interlinepenalty \@M #1\par\nobreak}%
}\nobreak
@@ -5964,7 +6021,7 @@
\fi
\newcommand*{\scr at fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\@addtoreset{equation}{chapter}
\renewcommand*{\theequation}{%
@@ -5996,7 +6053,7 @@
\newcommand*{\dictumauthorformat}[1]{(#1)}
\newcommand*{\raggeddictumtext}{\raggedright}
\newcommand*{\raggeddictumauthor}{\raggedleft}
-\newkomafont{dictum}{\normalfont\normalcolor\@gr at gsffamily\small}
+\newkomafont{dictum}{\normalfont\normalcolor\maybesffamily\small}
\newkomafont{dictumauthor}{\itshape}
\aliaskomafont{dictumtext}{dictum}
\setlength{\skip\@mpfootins}{\skip\footins}
@@ -6064,7 +6121,7 @@
\fi
}
\newcommand\marginline[1]{%
- \marginpar[\raggedleft{#1}]{\raggedright #1}%
+ \marginpar[{\raggedleft #1}]{\raggedright #1}%
}
\scr at ifundefinedorrelax{textsubscript}{%
\DeclareRobustCommand*\textsubscript[1]{%
@@ -6283,7 +6340,7 @@
\let\scr at mt@saved at sect\relax
\fi
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: body)
\newcommand*{\set at tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -6384,7 +6441,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{headings}
\pagenumbering{arabic}
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\providecommand*{\@mkleft}{%
\IfActiveMkBoth{\markleft}{\@gobble}%
@@ -6395,7 +6452,7 @@
\providecommand{\@mkdouble}[1]{%
\@mkboth{#1}{#1}%
}
-%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
%%% (run: body)
\newlength{\abovecaptionskip}
\newlength{\belowcaptionskip}
@@ -7160,7 +7217,7 @@
\expandafter\ifnum\scr at v@is at le{2.97d}%
\renewcommand*\thetable{\thechapter.\@arabic\c at table}
\fi
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn at rule@test at values
@@ -7322,7 +7379,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
%%% (run: body)
\g at addto@macro{\numberline at numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -7472,7 +7529,7 @@
UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables}
\renewcommand*\listoflotname{\listtablename}
\renewcommand*\listoflotentryname{\tablename}
-%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $
%%% (run: body)
\newcommand*\bibname{Bibliography}
\providecaptionname{american,australian,british,canadian,english,newzealand,%
@@ -7560,7 +7617,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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $
%%% (run: body)
\newcommand*{\index at preamble}{}
\let\index at preamble=\relax
@@ -7603,7 +7660,7 @@
\newcommand*\indexname{Index}
\providecaptionname{american,australian,british,canadian,english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\if at twocolumn
\setlength{\leftmargini}{2em}
@@ -7754,7 +7811,7 @@
\fi
\item\is at thispageodd@setlabel\nobreak\ignorespaces
}
-\newcommand*\descfont{\@gr at gsffamily\bfseries}
+\newcommand*\descfont{\maybesffamily\bfseries}
\newcommand*{\scr at fnt@descriptionlabel}{\descfont}
\newcommand*{\labelitemfont}{\normalfont}
\newcommand*\scr at fnt@itemizelabel{\labelitemfont}
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,24 +65,24 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package
(day of the week)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $
-%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $
+%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $
\newcommand*{\CenturyPart}[1]{\XdivY{#1}{100}}
\newcommand*{\DecadePart}[1]{\XmodY{#1}{100}}
\newcommand*{\@GaussYear}[3]{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -65,7 +65,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrextend.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrextend.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: preidentify)
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname KOMAClassName\endcsname\relax\else
@@ -78,7 +78,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -100,16 +100,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrextend.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrextend.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: prepare)
\ProvidesPackage{scrextend}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: prepare)
-\newcommand*{\sectfont}{\normalcolor\@gr at gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries}
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: init)
\providecommand*
{\scr at compatibility}{\scr at v@last}
@@ -225,8 +225,9 @@
\@namedef{scr at v@3.36}{20}
\@namedef{scr at v@3.37}{20}
\@namedef{scr at v@3.38}{20}
+\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@last}{20}
-%%% From File: $Id: scrextend.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrextend.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\KOMA at key{extendedfeature}{%
\scr at ext@activate{#1}%
@@ -243,7 +244,7 @@
}%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@xadd{.scrextend.sty}{extendedfeature}{#1}%
+ \KOMA at kav@xadd{scrextend.sty}{extendedfeature}{#1}%
}
\AtEndOfPackage{%
\KOMA at key{extendedfeature}{%
@@ -250,7 +251,7 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\KOMA at key{version}[last]{%
\scr at ifundefinedorrelax{scr at v@#1}{%
@@ -263,7 +264,7 @@
Because of this, version was set to `first'%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrextend.\scr at pkgextension
}{version}{first}%
}{%
@@ -274,7 +275,7 @@
}%
\edef\scr at compatibility{\@nameuse{scr at v@#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
scrextend.\scr at pkgextension
}{version}{#1}%
\ifnum\scr at compatibility<\scr at v@last
@@ -323,24 +324,27 @@
\newcommand*{\scr at v@is at ge}[1]{%
\numexpr\scr at compatibility+\@ne\relax>\@nameuse{scr at v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+\newcommand*{\scr at v@is at eq}[1]{%
+ \scr at compatibility=\@nameuse{scr at v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
scrextend.\scr at pkgextension
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
scrextend.\scr at pkgextension
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
scrextend.\scr at pkgextension
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
scrextend.\scr at pkgextension
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
@@ -347,7 +351,7 @@
\fi
\fi
}
-\KOMA at kav@xadd{.scrextend.\scr at pkgextension}{draft}{%
+\KOMA at kav@xadd{scrextend.\scr at pkgextension}{draft}{%
\ifdim\overfullrule>\z@ true\else false\fi
}
\KOMA at DeclareStandardOption
@@ -357,18 +361,18 @@
\KOMA at set@ifkey{overfullrule}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
scrextend.\scr at pkgextension
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
scrextend.\scr at pkgextension
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
scrextend.\scr at pkgextension
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
scrextend.\scr at pkgextension
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
@@ -375,14 +379,10 @@
\fi
\fi
}
-\KOMA at kav@xadd{.scrextend.\scr at pkgextension}{overfullrule}{%
+\KOMA at kav@xadd{scrextend.\scr at pkgextension}{overfullrule}{%
\ifdim\overfullrule>\z@ true\else false\fi
}
-\KOMA at ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
-\newcommand*{\@gr at gsffamily}{%
- \if at egregdoesnotlikesansseriftitles\else\sffamily\fi
-}
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\providecommand*{\@fontsizefilebase}{scrsize}
\KOMA at key{fontsize}{%
@@ -440,11 +440,56 @@
\@tempa
}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
scrextend.\scr at pkgextension
}{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $
+\KOMA at ifkey{sfdefaults}{@sfdefaults}
+\newcommand*{\maybesffamily}{\if at sfdefaults \sffamily \fi}
+\newcommand*{\textmaybesf}{%
+ \if at sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi
+}
+%% \begin{option}{egegdoesnotlikesansseriftitles}
+\KOMA at key{egregdoesnotlikesansseriftitles}[true]{%
+ \PackageWarningNoLine{scrextend}%
+ {%
+ You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak
+ In 2016 this option has been implemented as a joke\MessageBreak
+ answer to egreg's comment:\MessageBreak
+ \space\space ``In my opinion there should be a document class\MessageBreak
+ \space\space option for it, instead of the
+ \string\setkomafont\MessageBreak
+ \space\space statement. And yes, I find imposing sans serif
+ for\MessageBreak
+ \space\space titles is not the best choice (one of the
+ reasons\MessageBreak
+ \space\space why I don't use Koma-script classes).''\MessageBreak
+ to question https://tex.stackexchange.com/q/289853\MessageBreak
+ at TeX.SX.\MessageBreak
+ The option has never been documented in the official\MessageBreak
+ user manuals and therefore should never have been\MessageBreak
+ used in real live documents. It was intended to be\MessageBreak
+ removed after some month.\MessageBreak
+ However, it has been used and also almost forgotten\MessageBreak
+ by the author.\MessageBreak
+ For this the author apologizes both to users but\MessageBreak
+ especially to egreg.\MessageBreak
+ Rightly, egreg has criticized the permanent retention\MessageBreak
+ of the option as unfunny to inappropriate and has\MessageBreak
+ asked that it be removed or replaced.\MessageBreak
+ It will be removed soon!\MessageBreak
+ You should use `sfdefaults=false` instead%
+ }%
+ \KOMA at set@ifkey{egregdoesnotlikesansseriftitles}%
+ {@sfdefaults}%
+ {#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if at sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi
+ \KOMA at kav@xreplacevalue{scrextend.\scr at pkgextension}%
+ {sfdefaults}{\if at sfdefaults true\else false\fi}%
+ \fi
+}
+%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $
%%% (run: option)
\scr at ext@activateable{title}{%
\scr at ifundefinedorrelax{if at titlepage}{%
@@ -460,7 +505,7 @@
\@titlepagetrue
\@titlepageiscoverpagetrue
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrextend.\scr at pkgextension
}{titlepage}{firstiscover}%
}{%
@@ -467,10 +512,10 @@
\def\FamilyElseValue{, `firstiscover'}%
\KOMA at set@ifkey{titlepage}{@titlepage}{##1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrextend.\scr at pkgextension
}{titlepage}{firstiscover}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
scrextend.\scr at pkgextension
}{titlepage}{@titlepage}%
\@titlepageiscoverpagefalse
@@ -477,7 +522,7 @@
\fi
}%
}
-\KOMA at kav@xadd{.%
+\KOMA at kav@xadd{%
scrextend.\scr at pkgextension
}{titlepage}{\if at titlepage true\else false\fi}
\def\scr at ext@immediate at title{%
@@ -488,9 +533,9 @@
\KOMA at DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: option)
\KOMA at key{cleardoublepage}{%
\begingroup
@@ -505,7 +550,7 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrextend.\scr at pkgextension
}{cleardoublepage}{current}%
}%
@@ -516,7 +561,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
scrextend.\scr at pkgextension
}{cleardoublepage}{#1}%
}%
@@ -543,16 +588,18 @@
\newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}}
\newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}
\renewcommand*{\cleardoublepage}{%
- \expandafter\ifnum \@nameuse{scr at v@2.98c}<\scr at compatibility\relax
+ \expandafter\ifnum \scr at v@is at gt{2.98c}%
\cleardoubleemptypage
\else
\cleardoublestandardpage
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrextend.\scr at pkgextension
}{cleardoublepage}{%
- \expandafter\ifnum \scr at v@is at gt{2.98c}empty\else current\fi
+ \expandafter\ifnum \scr at v@is at gt{2.98c}
+ empty%
+ \else current\fi
}
\AtEndOfPackage{%
\KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
@@ -559,10 +606,10 @@
{%
scrextend.\scr at pkgextension
}{cleardoublepage}%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
scrextend.\scr at pkgextension
}{cleardoublepage}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
scrextend.\scr at pkgextension
}{cleardoublepage}{\@tempa}%
}
@@ -572,9 +619,9 @@
{\pagestyle{#1}\cleardoublestandardpage}}
\newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}}
\newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}}
-%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\KOMA at key{footnotes}{%
\ifx\@footnotemark\scr at saved@footnotemark
@@ -594,7 +641,7 @@
\def\FN at mf@prepare{\scr at mf@prepare}%
\def\scr at footmisc@options{multiple}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrextend.\scr at pkgextension
}{footnotes}{multiple}%
}{%
@@ -603,7 +650,7 @@
\let\FN at mf@prepare\relax
\let\scr at footmisc@options\@empty
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrextend.\scr at pkgextension
}{footnotes}{nomultiple}%
}{%
@@ -613,17 +660,17 @@
}
\AtBeginDocument{%
\ifx\@footnotemark\scr at saved@footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
scrextend.\scr at pkgextension
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrextend.\scr at pkgextension
}{footnotes}{nomultiple}%
\else\ifx\@footnotemark\scr at footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
scrextend.\scr at pkgextension
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrextend.\scr at pkgextension
}{footnotes}{multiple}%
\fi\fi
@@ -645,14 +692,14 @@
\csname FN at mf@prepare\endcsname
\ifhmode\spacefactor\@x at sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: execoption)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: execoption)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\AtBeginDocument{%
\begingroup
@@ -701,7 +748,7 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\newcommand*\scr at setlength[4]{%
\expandafter\ifnum\scr at v@is at lt{3.12}\relax
@@ -739,7 +786,7 @@
\fi
}
\providecommand*{\simple at changefontsizes}[2][1.2\@tempdima]{%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
scrextend.\scr at pkgextension
}{fontsize}%
\@defaultunits\@tempdima#2pt\relax\@nnil
@@ -1078,7 +1125,7 @@
because I do not change it%
}%
}
-%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $
%%% (run: body)
\scr at ext@addto at activateable{title}{%
\newcommand*{\@extratitle}{}%
@@ -1131,8 +1178,7 @@
}
\let\maketitle\relax\let\@maketitle\relax
\newcommand*\maketitle[1][1]{%
- \expandafter\ifnum \csname scr at v@3.12\endcsname>\scr at compatibility\relax
- \else
+ \expandafter\ifnum \scr at v@is at ge{3.12}%
\def\and{%
\end{tabular}%
\hskip 1em \@plus.17fil%
@@ -1228,8 +1274,7 @@
\vfill\null
\if at twoside
\@tempswatrue
- \expandafter\ifnum \@nameuse{scr at v@3.12}>\scr at compatibility\relax
- \else
+ \expandafter\ifnum \scr at v@is at ge{3.12}%
\ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
\@tempswafalse
\fi\fi
@@ -1247,7 +1292,8 @@
\fi
\else
\ifx\@uppertitleback\@empty\else
- \PackageWarning{scrextend}{%
+ \PackageWarning{scrextend}%
+ {%
non empty \string\uppertitleback\space ignored
by \string\maketitle\MessageBreak
in `twoside=false' mode%
@@ -1254,7 +1300,8 @@
}%
\fi
\ifx\@lowertitleback\@empty\else
- \PackageWarning{scrextend}{%
+ \PackageWarning{scrextend}%
+ {%
non empty \string\lowertitleback\space ignored
by \string\maketitle\MessageBreak
in `twoside=false' mode%
@@ -1276,13 +1323,15 @@
\@tempcnta=%
##1%
\relax\ifnum\@tempcnta=1\else
- \PackageWarning{scrextend}{%
+ \PackageWarning{scrextend}%
+ {%
Optional argument of \string\maketitle\space ignored\MessageBreak
in `titlepage=false' mode%
}%
\fi
\ifx\@uppertitleback\@empty\else
- \PackageWarning{scrextend}{%
+ \PackageWarning{scrextend}%
+ {%
non empty \string\uppertitleback\space ignored
by \string\maketitle\MessageBreak
in `titlepage=false' mode%
@@ -1289,7 +1338,8 @@
}%
\fi
\ifx\@lowertitleback\@empty\else
- \PackageWarning{scrextend}{%
+ \PackageWarning{scrextend}%
+ {%
non empty \string\lowertitleback\space ignored
by \string\maketitle\MessageBreak
in `titlepage=false' mode%
@@ -1351,7 +1401,7 @@
\endgroup
\fi
\setcounter{footnote}{0}%
- \expandafter\ifnum \csname scr at v@3.12\endcsname>\scr at compatibility\relax
+ \expandafter\ifnum \scr at v@is at lt{3.12}%
\let\thanks\relax
\let\maketitle\relax
\let\@maketitle\relax
@@ -1448,9 +1498,7 @@
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \if at compatibility
- \setcounter{page}{0}%
- \fi
+ \if at compatibility \setcounter{page}{0}\fi
}{%
\if at restonecol\twocolumn \else \newpage \fi
}%
@@ -1466,9 +1514,11 @@
\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 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+\newcommand*{\scr at fnt@disposition}{\sectfont}
+\aliaskomafont{sectioning}{disposition}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\scr at ifundefinedorrelax{if at restonecol}{%
\expandafter\newif\csname if at restonecol\endcsname
@@ -1493,7 +1543,7 @@
\newcommand*{\dictumauthorformat}[1]{(#1)}
\newcommand*{\raggeddictumtext}{\raggedright}
\newcommand*{\raggeddictumauthor}{\raggedleft}
-\newkomafont{dictum}{\normalfont\normalcolor\@gr at gsffamily\small}
+\newkomafont{dictum}{\normalfont\normalcolor\maybesffamily\small}
\newkomafont{dictumauthor}{\itshape}
\aliaskomafont{dictumtext}{dictum}
\newcommand*{\new at tpo@label}{\@newl at bel{tpo}}
@@ -1558,7 +1608,7 @@
\fi
}
\newcommand\marginline[1]{%
- \marginpar[\raggedleft{#1}]{\raggedright #1}%
+ \marginpar[{\raggedleft #1}]{\raggedright #1}%
}
\scr at ifundefinedorrelax{textsubscript}{%
\DeclareRobustCommand*\textsubscript[1]{%
@@ -1575,11 +1625,11 @@
{\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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\newcommand\deffootnote[4][]{%
\expandafter\ifnum\scr at v@is at ge{3.22}\relax
@@ -1714,7 +1764,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\newenvironment{labeling}[2][]{%
\def\sc at septext{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,21 +64,21 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: identify)
\ProvidesPackage{scrfontsizes}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package (font size file generator)]
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{}
\newcommand*{\generatefontfile}[1]{%
@@ -354,8 +354,9 @@
\endgroup
\immediate\write\@fontfile{%
\string\@ifundefined{@list at extra}{}{\@percentchar^^J%
- \string\expandafter\string\ifnum\string\scr at v@is at ge{3.17}%
- \string\par at updaterelative\string\fi^^J%
+ \string\expandafter\string\ifnum\string\scr at v@is at ge{3.17}^^J%
+ \string\par at updaterelative^^J%
+ \string\fi^^J%
\@ind\string\l at addto@macro{\string\@listi}{\string\@list at extra}%
\@percentchar^^J%
\@ind\string\let\string\@listI=\string\@listi^^J%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,22 +65,22 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
%%% using: package,identify
\ProvidesPackage{scrhack}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package (hacking other packages)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
%%% using: package,body
\newcommand{\scr at ifexpected}[2]{%
\begingroup
@@ -139,7 +139,7 @@
\PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak
detection of KOMA-Script class, that doesn't\MessageBreak
need that hack,}%
- \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}%
+ \KOMAExecuteOptions[scrhack.sty]{hyperref=false}%
}%
}
\AfterPackage*{hyperref}{%
@@ -148,10 +148,10 @@
\PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak
detection of hyperref version, that doesn't\MessageBreak
need that hack,}%
- \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}%
+ \KOMAExecuteOptions[scrhack.sty]{hyperref=false}%
}{%
\AtEndOfPackage{%
- \KOMA at key[.scrhack.sty]{hyperref}{%
+ \KOMA at key[scrhack.sty]{hyperref}{%
\PackageWarning{scrhack}{option `hyperref=#1' ignored}%
\FamilyKeyStateProcessed
}%
@@ -163,7 +163,7 @@
\AfterPackage*{floatrow}{%
\KOMAoptions{float=false}%
\PackageInfo{scrhack}{option `float' deactivated}%
- \KOMA at key[.scrhack.sty]{floatrow}{%
+ \KOMA at key[scrhack.sty]{floatrow}{%
\PackageWarning{scrhack}{option `floatrow' ignored}%
\FamilyKeyStateProcessed
}%
@@ -170,7 +170,7 @@
\if at scrhack@floatrow\scr at hack@load\@pkgextension{floatrow}\fi
}
\AfterPackage*{float}{%
- \KOMA at key[.scrhack.sty]{float}{%
+ \KOMA at key[scrhack.sty]{float}{%
\PackageWarning{scrhack}{option `float' ignored}%
\FamilyKeyStateProcessed
}%
@@ -177,7 +177,7 @@
\if at scrhack@float\scr at hack@load\@pkgextension{float}\fi
}
\AfterPackage*{listings}{%
- \KOMA at key[.scrhack.sty]{listings}{%
+ \KOMA at key[scrhack.sty]{listings}{%
\PackageWarning{scrhack}{option `listings' ignored}%
\FamilyKeyStateProcessed
}%
@@ -184,7 +184,7 @@
\if at scrhack@listings\scr at hack@load\@pkgextension{listings}\fi
}
\AfterPackage*{nomencl}{%
- \KOMA at key[.scrhack.sty]{nomencl}{%
+ \KOMA at key[scrhack.sty]{nomencl}{%
\PackageWarning{scrhack}{option `nomencl' ignored}%
\FamilyKeyStateProcessed
}%
@@ -191,7 +191,7 @@
\if at scrhack@nomencl\scr at hack@load\@pkgextension{nomencl}\fi
}
\AfterPackage*{setspace}{%
- \KOMA at key[.scrhack.sty]{setspace}{%
+ \KOMA at key[scrhack.sty]{setspace}{%
\PackageWarning{scrhack}{option `setspace' ignored}%
\FamilyKeyStateProcessed
}%
@@ -199,7 +199,7 @@
}
\AfterPackage*{lscape}{%
\if at scrhack@lscape\scr at hack@load\@pkgextension{lscape}\else
- \KOMA at key[.scrhack.sty]{lscape}{%
+ \KOMA at key[scrhack.sty]{lscape}{%
\PackageWarning{scrhack}{option `lscape' ignored}%
\FamilyKeyStateProcessed
}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package
(for jurists)
]
-%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z 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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $
%%% (run: options)
\KOMA at ifkey{contract}{@documentcontract}
\IfLTXAtLeastTF{2020/10/01}{%
@@ -95,21 +95,21 @@
\else
\DeclareTOCStyleEntry[level=#1]{default}{cpar}%
\fi
- \KOMA at kav@xreplacevalue{.scrjura.sty}{juratotoc}{\cpartocdepth}%
+ \KOMA at kav@xreplacevalue{scrjura.sty}{juratotoc}{\cpartocdepth}%
}
-\KOMA at kav@xadd{.scrjura.sty}{juratotoc}{\cpartocdepth}%
+\KOMA at kav@xadd{scrjura.sty}{juratotoc}{\cpartocdepth}%
\KOMA at key{juratocnumberwidth}{%
\DeclareTOCStyleEntry[numwidth=#1]{default}{cpar}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.scrjura.sty}{juratocnumberwidth}{#1}%
+ \KOMA at kav@replacevalue{scrjura.sty}{juratocnumberwidth}{#1}%
}
-\KOMA at kav@add{.scrjura.sty}{juratocnumberwidth}{2em}
+\KOMA at kav@add{scrjura.sty}{juratocnumberwidth}{2em}
\KOMA at key{juratocindent}{%
\DeclareTOCStyleEntry[indent=#1]{default}{cpar}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.scrjura.sty}{juratocindent}{#1}%
+ \KOMA at kav@replacevalue{scrjura.sty}{juratocindent}{#1}%
}
-\KOMA at kav@add{.scrjura.sty}{juratocindent}{1.5em}%
+\KOMA at kav@add{scrjura.sty}{juratocindent}{1.5em}%
\KOMA at ifkey{juratitlepagebreak}{@juratitlepagebreak}
\newif\ifparnumber
\KOMA at key{parnumber}[true]{%
@@ -116,24 +116,24 @@
\Ifstr{#1}{auto}{%
\AutoPar
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.scrjura.sty}{parnumber}{manual}%
- \KOMA at kav@remove{.scrjura.sty}{parnumber}{auto}%
- \KOMA at kav@add{.scrjura.sty}{parnumber}{auto}%
+ \KOMA at kav@remove{scrjura.sty}{parnumber}{manual}%
+ \KOMA at kav@remove{scrjura.sty}{parnumber}{auto}%
+ \KOMA at kav@add{scrjura.sty}{parnumber}{auto}%
}{%
\Ifstr{#1}{manual}{%
\ManualPar
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.scrjura.sty}{parnumber}{manual}%
- \KOMA at kav@remove{.scrjura.sty}{parnumber}{auto}%
- \KOMA at kav@add{.scrjura.sty}{parnumber}{manual}%
+ \KOMA at kav@remove{scrjura.sty}{parnumber}{manual}%
+ \KOMA at kav@remove{scrjura.sty}{parnumber}{auto}%
+ \KOMA at kav@add{scrjura.sty}{parnumber}{manual}%
}{%
\KOMA at set@ifkey{parnumber}{parnumber}{#1}%
- \KOMA at kav@replacebool{.scrjura.sty}{parnumber}{parnumber}%
+ \KOMA at kav@replacebool{scrjura.sty}{parnumber}{parnumber}%
}%
}%
}
-\KOMA at kav@add{.scrjura.sty}{parnumber}{true}
-\KOMA at kav@add{.scrjura.sty}{parnumber}{auto}
+\KOMA at kav@add{scrjura.sty}{parnumber}{true}
+\KOMA at kav@add{scrjura.sty}{parnumber}{auto}
\newcommand*{\Clausemark}[1]{}
\KOMA at key{clausemark}{%
\begingroup
@@ -178,11 +178,13 @@
\endgroup
\FamilyKeyStateUnknownValue
\fi
- \KOMA at kav@xreplacevalue{.scrjura.sty}{clausemark}{#1}%
+ \KOMA at kav@xreplacevalue{scrjura.sty}{clausemark}{#1}%
}
-\KOMA at kav@add{.scrjura.sty}{clausemark}{false}
-\KOMA at DeclareDeprecatedOption[scrjura]{markright}{clausemark=forceright}
-\KOMA at DeclareDeprecatedOption[scrjura]{markboth}{clausemark=forceboth}
+\KOMA at kav@add{scrjura.sty}{clausemark}{false}
+\@ifundefined{KOMA at DeclareDeprecatedOption}{}{%
+ \KOMA at DeclareDeprecatedOption[scrjura]{markright}{clausemark=forceright}%
+ \KOMA at DeclareDeprecatedOption[scrjura]{markboth}{clausemark=forceboth}%
+}
\KOMA at key{paragraphmark}{%
\PackageWarningNoLine{scrjura}{%
You've used obsolete option `paragraphmark'.\MessageBreak
@@ -252,35 +254,37 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrjura.sty}{ref}%
+ \KOMA at kav@removekey{scrjura.sty}{ref}%
\ifcase\parcite at format
- \KOMA at kav@add{.scrjura.sty}{ref}{parlong}%
+ \KOMA at kav@add{scrjura.sty}{ref}{parlong}%
\or
- \KOMA at kav@add{.scrjura.sty}{ref}{parshort}%
+ \KOMA at kav@add{scrjura.sty}{ref}{parshort}%
\or
- \KOMA at kav@add{.scrjura.sty}{ref}{parnumeric}%
+ \KOMA at kav@add{scrjura.sty}{ref}{parnumeric}%
\or
- \KOMAQkav at add{.scrjura.sty}{ref}{paroff}%
+ \KOMA at kav@add{scrjura.sty}{ref}{paroff}%
\fi
\ifcase\sentencecite at format
- \KOMA at kav@add{.scrjura.sty}{ref}{sentencelong}%
+ \KOMA at kav@add{scrjura.sty}{ref}{sentencelong}%
\or
- \KOMA at kav@add{.scrjura.sty}{ref}{sentenceshort}%
+ \KOMA at kav@add{scrjura.sty}{ref}{sentenceshort}%
\or
- \KOMA at kav@add{.scrjura.sty}{ref}{sentencenumeric}%
+ \KOMA at kav@add{scrjura.sty}{ref}{sentencenumeric}%
\or
- \KOMA at kav@add{.scrjura.sty}{ref}{sentenceoff}%
+ \KOMA at kav@add{scrjura.sty}{ref}{sentenceoff}%
\fi
\fi
}
-\KOMA at kav@add{.scrjura.sty}{ref}{parlong}%
-\KOMA at kav@add{.scrjura.sty}{ref}{sentencelong}%
-\KOMA at DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong}
-\KOMA at DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
-%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $
+\KOMA at kav@add{scrjura.sty}{ref}{parlong}%
+\KOMA at kav@add{scrjura.sty}{ref}{sentencelong}%
+\@ifundefined{KOMA at DeclareDeprecatedOption}{}{%
+ \KOMA at DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong}
+ \KOMA at DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
+}
+%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $
%%% (run: postoptions)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $
%%% (run: body)
\providecommand*{\DeprecatedParagraph}{%
\PackageError{scrjura}{modification of old document needed}{%
@@ -1115,7 +1119,7 @@
}%
\fi
}
-%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $
%%% (run: final)
%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,72 +66,72 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package
(%
KOMA-Script-dependent
basics and keyval usage)]
\RequirePackage{scrbase}[\KOMAScriptVersion]
-\newcommand*{\KOMA at key}[1][.\@currname.\@currext]{%
- \DefineFamilyMember[{#1}]{KOMA}%
- \@ifundefined{scr at kav@KOMA#1}{\@namedef{scr at kav@KOMA#1}{}}{}%
- \DefineFamilyKey[{#1}]{KOMA}%
+\newcommand*{\KOMA at key}[1][\@currname.\@currext]{%
+ \DefineFamilyMember[{.#1}]{KOMA}%
+ \@ifundefined{scr at kav@KOMA.#1}{\@namedef{scr at kav@KOMA.#1}{}}{}%
+ \DefineFamilyKey[{.#1}]{KOMA}%
}
\newcommand*{\KOMA at kav@add}[3]{%
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@add{#1}%
}{%
- \expandafter\l at addto@macro\csname scr at kav@KOMA#1\endcsname{\do{{#2}{#3}}}%
+ \expandafter\l at addto@macro\csname scr at kav@KOMA.#1\endcsname{\do{{#2}{#3}}}%
}%
}
\newcommand*{\KOMA at kav@xadd}[3]{%
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@xadd{#1}%
}{%
\protected at edef\reserved at a{{#2}{#3}}%
- \expandafter\l at addto@macro\csname scr at kav@KOMA#1\expandafter\endcsname
+ \expandafter\l at addto@macro\csname scr at kav@KOMA.#1\expandafter\endcsname
\expandafter{\expandafter\do\expandafter{\reserved at a}}%
}%
}
\newcommand*{\KOMA at kav@remove}[3]{%
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@remove{#1}%
}{%
\begingroup
- \def\reserved at a{\endgroup\@namedef{scr at kav@KOMA#1}{}}%
+ \def\reserved at a{\endgroup\@namedef{scr at kav@KOMA.#1}{}}%
\edef\reserved at b{\detokenize{{#2}{#3}}}%
\def\do##1{%
\edef\reserved at c{\detokenize{##1}}%
\ifx\reserved at b\reserved at c\else
\l at addto@macro\reserved at a{%
- \expandafter\l at addto@macro\csname scr at kav@KOMA#1\endcsname{%
+ \expandafter\l at addto@macro\csname scr at kav@KOMA.#1\endcsname{%
\do{##1}%
}%
}%
\fi
}%
- \@nameuse{scr at kav@KOMA#1}%
+ \@nameuse{scr at kav@KOMA.#1}%
\reserved at a
}%
}
\newcommand*{\KOMA at kav@removekey}[2]{%
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@removekey{#1}%
}{%
\begingroup
- \def\reserved at a{\endgroup\@namedef{scr at kav@KOMA#1}{}}%
+ \def\reserved at a{\endgroup\@namedef{scr at kav@KOMA.#1}{}}%
\edef\reserved at b{\detokenize{#2}}%
\def\reserved at d##1##2{\edef\reserved at c{\detokenize{##1}}}%
\def\do##1{%
@@ -138,19 +138,19 @@
\reserved at d##1\relax
\ifx\reserved at b\reserved at c\else
\l at addto@macro\reserved at a{%
- \expandafter\l at addto@macro\csname scr at kav@KOMA#1\endcsname{%
+ \expandafter\l at addto@macro\csname scr at kav@KOMA.#1\endcsname{%
\do{##1}%
}%
}%
\fi
}%
- \@nameuse{scr at kav@KOMA#1}%
+ \@nameuse{scr at kav@KOMA.#1}%
\reserved at a
}%
}
\newcommand*{\KOMA at kav@replacevalue}[3]{%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@replacevalue{#1}%
}{%
\KOMA at kav@removekey{#1}{#2}%
@@ -160,7 +160,7 @@
}
\newcommand*{\KOMA at kav@xreplacevalue}[3]{%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@replacevalue{#1}%
}{%
\KOMA at kav@removekey{#1}{#2}%
@@ -170,7 +170,7 @@
}
\newcommand*{\KOMA at kav@replacebool}[3]{%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \@ifundefined{scr at kav@KOMA#1}{%
+ \@ifundefined{scr at kav@KOMA.#1}{%
\KOMA at internal@error\KOMA at kav@replacebool{#1}%
}{%
\KOMA at kav@remove{#1}{#2}{false}%
@@ -185,7 +185,7 @@
\fi
}
\newcommand*{\KOMA at kav@defall}[2]{%
- \@ifundefined{scr at kav@KOMA#2}{%
+ \@ifundefined{scr at kav@KOMA.#2}{%
\KOMA at internal@error\KOMA at kav@defall{#1}%
}{%
\begingroup
@@ -192,7 +192,7 @@
\let\reserved at a\@empty
\def\reserved at b##1##2{\l at addto@macro\reserved at a{,{##1=##2}}}%
\def\do##1{\reserved at b##1}%
- \@nameuse{scr at kav@KOMA#2}%
+ \@nameuse{scr at kav@KOMA.#2}%
\ifx\reserved at a\@empty
\def\reserved at b{\endgroup\let#1\@empty}%
\else
@@ -206,7 +206,7 @@
}%
}
\newcommand*{\KOMA at kav@defone}[3]{%
- \@ifundefined{scr at kav@KOMA#2}{%
+ \@ifundefined{scr at kav@KOMA.#2}{%
\KOMA at internal@error\KOMA at kav@defall{#1}%
}{%
\begingroup
@@ -215,7 +215,7 @@
\Ifstr{##1}{#3}{\l at addto@macro\reserved at a{,{##2}}}{}%
}%
\def\do##1{\reserved at b##1}%
- \@nameuse{scr at kav@KOMA#2}%
+ \@nameuse{scr at kav@KOMA.#2}%
\ifx\reserved at a\@empty
\def\reserved at b{\endgroup\let#1\@empty}%
\else
@@ -237,20 +237,29 @@
that\MessageBreak
shows this error, to komascript at gmx dot info or report it
at\MessageBreak
- <http://www.komascript.de/forum/20> (you need an account to do so).%
+ <https://sf.net/p/koma-script/tickets/> (you need an account to do so).%
}%
}
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: option)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: body)
-\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
- \FamilyExecuteOptions[#1]{KOMA}%
+\newcommand*{\KOMAExecuteOptions}[1][\@currname.\@currext]{%
+ \Ifstrstart{#1}{.}{%
+ \PackageWarning{scrkbase}{Deprecated initial dot of member
+ argument\MessageBreak
+ of \string\KOMAExecuteOptions\space detected%
+ }%
+ \expandafter\FamilyExecuteOptions[#1]%
+ }{%
+ \FamilyExecuteOptions[.#1]%
+ }%
+ {KOMA}%
}
\newcommand*{\KOMAoptions}{\FamilyOptions{KOMA}}
\newcommand*{\KOMAoptionsOf}[2][\@firstofone]{%
@@ -261,7 +270,7 @@
}{%
\begingroup
\def\reserved at a{#1}%
- \KOMA at kav@defall\reserved at b{.#2}%
+ \KOMA at kav@defall\reserved at b{#2}%
\expandafter\expandafter\expandafter\endgroup
\expandafter\reserved at a\expandafter{\reserved at b}%
}%
@@ -274,7 +283,7 @@
}{%
\begingroup
\def\reserved at a{#1}%
- \KOMA at kav@defone\reserved at b{.#2}{#3}%
+ \KOMA at kav@defone\reserved at b{#2}{#3}%
\ifx\reserved at b\@empty
\PackageWarning{scrkbase}{option `#3' for `#2' unset}%
\endgroup
@@ -287,7 +296,7 @@
\newcommand*{\AfterKOMAoptions}{\AtEndOfFamilyOptions}
\newcommand*{\KOMAoption}{\FamilyOption{KOMA}}
\newcommand*{\KOMA at unknown@keyval}{\FamilyUnknownKeyValue{KOMA}}
-\newcommand*{\KOMA at ifkey}[2][.\@currname.\@currext]{%
+\newcommand*{\KOMA at ifkey}[2][\@currname.\@currext]{%
\begingroup\edef\reserved at a{\noexpand\KOMA@@ifkey{#1}{#2}}%
\expandafter\endgroup\reserved at a
}
@@ -306,7 +315,7 @@
\fi
}
\newcommand*{\KOMA at set@ifkey}{\FamilySetBool{KOMA}}
-\newcommand*{\KOMA at ncmdkey}[2][.\@currname.\@currext]{%
+\newcommand*{\KOMA at ncmdkey}[2][\@currname.\@currext]{%
\begingroup\edef\reserved at a{\noexpand\KOMA@@ncmdkey{#1}{#2}}%
\expandafter\endgroup\reserved at a
}
@@ -415,7 +424,7 @@
}%
\KOMAoptions{#3}%
}
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\newcommand*{\IfExistskomafont}[1]{%
\scr at ifundefinedorrelax{scr at fnt@#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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -66,7 +66,7 @@
2022/06/29 v0.3.3915 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: init)
\RequirePackage{scrlayer}
\scr at ifundefinedorrelax{scrlayer at AtEndOfPackage}{%
@@ -110,7 +110,7 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: options)
\KOMA at key{markcase}{%
\begingroup
@@ -142,13 +142,13 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{markcase}%
- \KOMA at kav@xadd{.scrlayer.sty}{markcase}{#1}%
+ \KOMA at kav@removekey{scrlayer.sty}{markcase}%
+ \KOMA at kav@xadd{scrlayer.sty}{markcase}{#1}%
\fi
}
\KOMA at key{autooneside}[true]{%
\KOMA at set@ifkey{autooneside}{scrlayer at autooneside}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer at autooneside}%
+ \KOMA at kav@replacebool{scrlayer.sty}{autooneside}{scrlayer at autooneside}%
}
\KOMA at key{automark}[]{%
\scrlayer at testunexpectedarg{automark}{#1}%
@@ -172,86 +172,86 @@
\fi
}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{automark}%
- \KOMA at kav@removekey{.scrlayer.sty}{manualmark}%
- \KOMA at kav@add{.scrlayer.sty}{automark}{}%
+ \KOMA at kav@removekey{scrlayer.sty}{automark}%
+ \KOMA at kav@removekey{scrlayer.sty}{manualmark}%
+ \KOMA at kav@add{scrlayer.sty}{automark}{}%
}
\KOMA at key{manualmark}[]{%
\scrlayer at testunexpectedarg{manualmark}{#1}%
\scrlayer at AtEndOfPackage{\manualmark}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{automark}%
- \KOMA at kav@removekey{.scrlayer.sty}{manualmark}%
- \KOMA at kav@add{.scrlayer.sty}{manualmark}{}%
+ \KOMA at kav@removekey{scrlayer.sty}{automark}%
+ \KOMA at kav@removekey{scrlayer.sty}{manualmark}%
+ \KOMA at kav@add{scrlayer.sty}{manualmark}{}%
}
\KOMA at key{onpsselect}{%
\l at addto@macro{\@ps at initialhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsselect}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsselect}{#1}%
}
\KOMA at key{onpsinit}{%
\l at addto@macro{\@ps at hook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsinit}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsinit}{#1}%
}
\KOMA at key{onpsoneside}{%
\l at addto@macro{\@ps at onesidehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsoneside}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsoneside}{#1}%
}
\KOMA at key{onpstwoside}{%
\l at addto@macro{\@ps at twosidehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpstwoside}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpstwoside}{#1}%
}
\KOMA at key{onpsoddpage}{%
\l at addto@macro{\@ps at oddpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsoddpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsoddpage}{#1}%
}
\KOMA at key{onpsevenpage}{%
\l at addto@macro{\@ps at evenpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsevenpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsevenpage}{#1}%
}
\KOMA at key{onpsfloatpage}{%
\l at addto@macro{\@ps at floatpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsfloatpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsfloatpage}{#1}%
}
\KOMA at key{onpsnonfloatpage}{%
\l at addto@macro{\@ps at nonfloatpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsnonfloatpage}{#1}%
}
\KOMA at key{onpsbackground}{%
\l at addto@macro{\@ps at backgroundhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsbackground}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsbackground}{#1}%
}
\KOMA at key{onpsforeground}{%
\l at addto@macro{\@ps at foregroundhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsforeground}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsforeground}{#1}%
}
\KOMA at ifkey{singlespacing}{@ps at singlespacing}
\KOMA at key{deactivatepagestylelayers}[true]{%
\KOMA at set@ifkey{deactivatepagestylelayers}{scrlayer at deactivate@layers}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers}
+ \KOMA at kav@replacebool{scrlayer.sty}{deactivatepagestylelayers}
{scrlayer at deactivate@layers}%
}
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{scrlayer at draft}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{draft}{scrlayer at draft}%
+ \KOMA at kav@replacebool{scrlayer.sty}{draft}{scrlayer at draft}%
}
\KOMA at key{forceoverwrite}[true]{%
\KOMA at set@ifkey{forceoverwrite}{scrlayer at forceoverwrite}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer at forceoverwrite}%
+ \KOMA at kav@replacebool{scrlayer.sty}{forceoverwrite}{scrlayer at forceoverwrite}%
}
\KOMA at key{autoremoveinterfaces}[true]{%
\scrlayer at report@deprecated{#1}{autoremoveinterface}%
\KOMA at set@ifkey{autoremoveinterfaces}{scrlayer at autoremoveinterfaces}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
+ \KOMA at kav@replacebool{scrlayer.sty}{autoremoveinterfaces}
{scrlayer at autoremoveinterfaces}%
}
%%% From File: $Id: scrlayer-notecolumn.dtx 3915 2022-06-29 07:09:48Z kohm $
@@ -258,7 +258,7 @@
%%% (run: options)
\KOMA at ifkey{autoclearnotecolumns}{slnc at autoclearnotecolumns}
\slnc at autoclearnotecolumnstrue
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -45,14 +45,14 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-scrpage.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: init)
\RequirePackage{scrlayer}
\scr at ifundefinedorrelax{scrlayer at AtEndOfPackage}{%
@@ -63,7 +63,7 @@
\fi
}
\let\scrlayer at AtEndOfPackage\AtEndOfPackage
-%%% From File: $Id: scrlayer-scrpage.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $
%%% (run: init)
\AtEndOfPackage{%
\sls at auto@pagestyleset%
@@ -76,7 +76,7 @@
{pagestyleset=KOMA-Script}%
}%
}
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: options)
\KOMA at key{markcase}{%
\scrlayer at AtEndOfPackage{%
@@ -109,14 +109,14 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{markcase}%
- \KOMA at kav@xadd{.scrlayer.sty}{markcase}{#1}%
+ \KOMA at kav@removekey{scrlayer.sty}{markcase}%
+ \KOMA at kav@xadd{scrlayer.sty}{markcase}{#1}%
\fi
}%
}
\KOMA at key{autooneside}[true]{%
\KOMA at set@ifkey{autooneside}{scrlayer at autooneside}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer at autooneside}%
+ \KOMA at kav@replacebool{scrlayer.sty}{autooneside}{scrlayer at autooneside}%
}
\KOMA at key{automark}[]{%
\scrlayer at testunexpectedarg{automark}{#1}%
@@ -140,89 +140,89 @@
\fi
}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{automark}%
- \KOMA at kav@removekey{.scrlayer.sty}{manualmark}%
- \KOMA at kav@add{.scrlayer.sty}{automark}{}%
+ \KOMA at kav@removekey{scrlayer.sty}{automark}%
+ \KOMA at kav@removekey{scrlayer.sty}{manualmark}%
+ \KOMA at kav@add{scrlayer.sty}{automark}{}%
}
\KOMA at key{manualmark}[]{%
\scrlayer at testunexpectedarg{manualmark}{#1}%
\scrlayer at AtEndOfPackage{\manualmark}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{automark}%
- \KOMA at kav@removekey{.scrlayer.sty}{manualmark}%
- \KOMA at kav@add{.scrlayer.sty}{manualmark}{}%
+ \KOMA at kav@removekey{scrlayer.sty}{automark}%
+ \KOMA at kav@removekey{scrlayer.sty}{manualmark}%
+ \KOMA at kav@add{scrlayer.sty}{manualmark}{}%
}
\KOMA at key{onpsselect}{%
\l at addto@macro{\@ps at initialhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsselect}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsselect}{#1}%
}
\KOMA at key{onpsinit}{%
\l at addto@macro{\@ps at hook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsinit}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsinit}{#1}%
}
\KOMA at key{onpsoneside}{%
\l at addto@macro{\@ps at onesidehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsoneside}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsoneside}{#1}%
}
\KOMA at key{onpstwoside}{%
\l at addto@macro{\@ps at twosidehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpstwoside}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpstwoside}{#1}%
}
\KOMA at key{onpsoddpage}{%
\l at addto@macro{\@ps at oddpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsoddpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsoddpage}{#1}%
}
\KOMA at key{onpsevenpage}{%
\l at addto@macro{\@ps at evenpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsevenpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsevenpage}{#1}%
}
\KOMA at key{onpsfloatpage}{%
\l at addto@macro{\@ps at floatpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsfloatpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsfloatpage}{#1}%
}
\KOMA at key{onpsnonfloatpage}{%
\l at addto@macro{\@ps at nonfloatpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsnonfloatpage}{#1}%
}
\KOMA at key{onpsbackground}{%
\l at addto@macro{\@ps at backgroundhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsbackground}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsbackground}{#1}%
}
\KOMA at key{onpsforeground}{%
\l at addto@macro{\@ps at foregroundhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsforeground}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsforeground}{#1}%
}
\KOMA at ifkey{singlespacing}{@ps at singlespacing}
\KOMA at key{deactivatepagestylelayers}[true]{%
\KOMA at set@ifkey{deactivatepagestylelayers}{scrlayer at deactivate@layers}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers}
+ \KOMA at kav@replacebool{scrlayer.sty}{deactivatepagestylelayers}
{scrlayer at deactivate@layers}%
}
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{scrlayer at draft}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{draft}{scrlayer at draft}%
+ \KOMA at kav@replacebool{scrlayer.sty}{draft}{scrlayer at draft}%
}
\KOMA at key{forceoverwrite}[true]{%
\KOMA at set@ifkey{forceoverwrite}{scrlayer at forceoverwrite}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer at forceoverwrite}%
+ \KOMA at kav@replacebool{scrlayer.sty}{forceoverwrite}{scrlayer at forceoverwrite}%
}
\KOMA at key{autoremoveinterfaces}[true]{%
\scrlayer at report@deprecated{#1}{autoremoveinterface}%
\KOMA at set@ifkey{autoremoveinterfaces}{scrlayer at autoremoveinterfaces}{#1}%
- \KOMA at kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
+ \KOMA at kav@replacebool{scrlayer.sty}{autoremoveinterfaces}
{scrlayer at autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-scrpage.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $
%%% (run: options)
\KOMA at key{headwidth}{%
\begingroup
@@ -232,7 +232,7 @@
\noexpand\endgroup
\noexpand\sls at set@hf at width{head}{\reserved at b}{\reserved at c}{\reserved at a}%
\noexpand\FamilyKeyStateProcessed
- \noexpand\KOMA at kav@replacevalue{.scrlayer-scrpage.sty}{headwidth}{%
+ \noexpand\KOMA at kav@replacevalue{scrlayer-scrpage.sty}{headwidth}{%
\reserved at a:\reserved at b:\reserved at c
}%
}%
@@ -246,7 +246,7 @@
\noexpand\endgroup
\noexpand\sls at set@hf at width{foot}{\reserved at b}{\reserved at c}{\reserved at a}%
\noexpand\FamilyKeyStateProcessed
- \noexpand\KOMA at kav@replacevalue{.scrlayer-scrpage.sty}{footwidth}{%
+ \noexpand\KOMA at kav@replacevalue{scrlayer-scrpage.sty}{footwidth}{%
\reserved at a:\reserved at b:\reserved at c
}%
}%
@@ -292,8 +292,12 @@
\addtolength{\@tempdima}{-\csname sls@#1width\endcsname}%
\Ifstr{#2}{}{%
\ifdim \csname sls@#1width\endcsname
- = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax
- \setlength{\@tempdimb}{\z@}
+ = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax
+ \if at reversemargin
+ \setlength{\@tempdimb}{-\dimexpr \marginparwidth+\marginparsep\relax}%
+ \else
+ \setlength{\@tempdimb}{\z@}%
+ \fi
\else
\if at twoside
\setlength{\@tempdimb}{.3333333333\@tempdima}%
@@ -325,19 +329,19 @@
}%
\scr at ifundefinedorrelax{@headwidth}{%
\newcommand*{\sls at headwidth}{\textwidth}%
- \KOMA at kav@add{.scrlayer-scrpage.sty}{headwidth}{\textwidth:0pt:0pt}%
+ \KOMA at kav@add{scrlayer-scrpage.sty}{headwidth}{\textwidth:0pt:0pt}%
}{%
\newcommand*{\sls at headwidth}{\@headwidth}%
- \KOMA at kav@xadd{.scrlayer-scrpage.sty}{headwidth}{\@headwidth:0pt:0pt}%
+ \KOMA at kav@xadd{scrlayer-scrpage.sty}{headwidth}{\@headwidth:0pt:0pt}%
}%
\newcommand*{\sls at oddheadshift}{0pt}
\newcommand*{\sls at evenheadshift}{0pt}
\scr at ifundefinedorrelax{@footwidth}{%
\newcommand*{\sls at footwidth}{\textwidth}%
- \KOMA at kav@add{.scrlayer-scrpage.sty}{footwidth}{\textwidth:0pt:0pt}
+ \KOMA at kav@add{scrlayer-scrpage.sty}{footwidth}{\textwidth:0pt:0pt}
}{%
\newcommand*{\sls at footwidth}{\@footwidth}%
- \KOMA at kav@xadd{.scrlayer-scrpage.sty}{footwidth}{\@footwidth:0pt:0pt}
+ \KOMA at kav@xadd{scrlayer-scrpage.sty}{footwidth}{\@footwidth:0pt:0pt}
}%
\newcommand*{\sls at oddfootshift}{0pt}
\newcommand*{\sls at evenfootshift}{0pt}
@@ -470,7 +474,7 @@
\reserved at b
\FamilyKeyStateProcessed
\Ifstr{#1}{}{}{%
- \KOMA at kav@xreplacevalue{.scrlayer-scrpage.sty}{#1}{%
+ \KOMA at kav@xreplacevalue{scrlayer-scrpage.sty}{#1}{%
\csname sls@#2#3 at linethickness\endcsname
:\csname sls@#2#3 at linelength\endcsname
}%
@@ -492,25 +496,25 @@
}%
\newcommand*{\sls at headabove@linelength}{\sls at headwidth}%
\newcommand*{\sls at headabove@linethickness}{0pt}%
-\KOMA at kav@xadd{.scrlayer-scrpage.sty}{headtopline}{%
+\KOMA at kav@xadd{scrlayer-scrpage.sty}{headtopline}{%
\expandafter\noexpand\sls at headabove@linethickness:%
\expandafter\noexpand\sls at headabove@linelength
}
\newcommand*{\sls at headbelow@linelength}{\sls at headwidth}%
\newcommand*{\sls at headbelow@linethickness}{0pt}%
-\KOMA at kav@xadd{.scrlayer-scrpage.sty}{headsepline}{%
+\KOMA at kav@xadd{scrlayer-scrpage.sty}{headsepline}{%
\expandafter\noexpand\sls at headbelow@linethickness:%
\expandafter\noexpand\sls at headbelow@linelength
}
\newcommand*{\sls at footabove@linelength}{\sls at footwidth}%
\newcommand*{\sls at footabove@linethickness}{0pt}%
-\KOMA at kav@xadd{.scrlayer-scrpage.sty}{footsepline}{%
+\KOMA at kav@xadd{scrlayer-scrpage.sty}{footsepline}{%
\expandafter\noexpand\sls at footabove@linethickness:%
\expandafter\noexpand\sls at footabove@linelength
}
\newcommand*{\sls at footbelow@linelength}{\sls at footwidth}%
\newcommand*{\sls at footbelow@linethickness}{0pt}%
-\KOMA at kav@xadd{.scrlayer-scrpage.sty}{footbotline}{%
+\KOMA at kav@xadd{scrlayer-scrpage.sty}{footbotline}{%
\expandafter\noexpand\sls at footbelow@linethickness:%
\expandafter\noexpand\sls at footbelow@linelength
}
@@ -519,15 +523,15 @@
\KOMA at ifkey{plainfootsepline}{sls at plain@foot at above@line}%
\KOMA at ifkey{plainfootbotline}{sls at plain@foot at below@line}%
\newcommand*{\sls at hfline@adjust}{0}%
-\KOMA at kav@add{.scrlayer-scrpage.sty}{ilines}{}
+\KOMA at kav@add{scrlayer-scrpage.sty}{ilines}{}
\KOMA at key{ilines}[]{%
\ifx\relax#1\relax
\renewcommand*{\sls at hfline@adjust}{0}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{ilines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{clines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{olines}%
- \KOMA at kav@add{.scrlayer-scrpage.sty}{ilines}{}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{ilines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{clines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{olines}%
+ \KOMA at kav@add{scrlayer-scrpage.sty}{ilines}{}%
\else
\def\FamilyKeyStateProcessed{unexpected value}%
\fi
@@ -536,10 +540,10 @@
\ifx\relax#1\relax
\renewcommand*{\sls at hfline@adjust}{1}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{ilines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{clines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{olines}%
- \KOMA at kav@add{.scrlayer-scrpage.sty}{clines}{}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{ilines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{clines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{olines}%
+ \KOMA at kav@add{scrlayer-scrpage.sty}{clines}{}%
\else
\def\FamilyKeyStateProcessed{unexpected value}%
\fi
@@ -548,15 +552,15 @@
\ifx\relax#1\relax
\renewcommand*{\sls at hfline@adjust}{2}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{ilines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{clines}%
- \KOMA at kav@removekey{.scrlayer-scrpage.sty}{olines}%
- \KOMA at kav@add{.scrlayer-scrpage.sty}{olines}{}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{ilines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{clines}%
+ \KOMA at kav@removekey{scrlayer-scrpage.sty}{olines}%
+ \KOMA at kav@add{scrlayer-scrpage.sty}{olines}{}%
\else
\def\FamilyKeyStateProcessed{unexpected value}%
\fi
}
-\KOMA at kav@add{.scrlayer-scrpage.sty}{ilines}{}
+\KOMA at kav@add{scrlayer-scrpage.sty}{ilines}{}
\KOMA at key{pagestyleset}{%
\scr at ifundefinedorrelax{sls at ps@style@#1}{%
\FamilyKeyStateUnknownValue
@@ -564,7 +568,7 @@
\let\sls at auto@pagestyleset\relax
\@nameuse{sls at ps@style@#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.scrlayer-scrpage.sty}{pagestyleset}{#1}%
+ \KOMA at kav@replacevalue{scrlayer-scrpage.sty}{pagestyleset}{#1}%
}%
}
\newcommand*{\sls at ps@style at standard}{%
@@ -615,19 +619,23 @@
}%
}%
}%
-\KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{komastyle}{%
- pagestyleset=KOMA-Script}
-\KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{standardstyle}{%
- pagestyleset=standard}
-\KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{markuppercase}{markcase=upper}
-\KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{markusedcase}{markcase=used}
-\KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{nouppercase}{%
- markcase=ignoreuppercase%
+\@ifundefined{KOMA at DeclareDeprecatedOption}{}{%
+ \KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{komastyle}{%
+ pagestyleset=KOMA-Script}%
+ \KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{standardstyle}{%
+ pagestyleset=standard}%
}
+\@ifundefined{KOMA at DeclareDeprecatedOption}{}{%
+ \KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{markuppercase}{markcase=upper}
+ \KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{markusedcase}{markcase=used}
+ \KOMA at DeclareDeprecatedOption[scrlayer-scrpage]{nouppercase}{%
+ markcase=ignoreuppercase%
+ }
+}
\KOMA at ifkey{hmode}{sls at leavevmode}
\KOMA at ifkey{autoenlargeheadfoot}{sls at autoenlarge}
\KOMAExecuteOptions{autoenlargeheadfoot=true}
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
@@ -699,7 +707,7 @@
\expandafter\let
\csname KV at KOMA.\@currname.\@currext @autoremoveinterfaces at default\endcsname
\relax
-%%% From File: $Id: scrlayer-scrpage.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $
%%% (run: body)
\newcommand*{\setheadwidth}[2][]{%
\PackageWarning{scrlayer-scrpage}{%
@@ -738,17 +746,17 @@
\Ifstr{#2}{current}{}{%
\setlength{\@tempdima}{#2}%
\Ifstr{#1}{headabove}{%
- \KOMAExecuteOptions[.scrlayer-scrpage.sty]%
+ \KOMAExecuteOptions[scrlayer-scrpage.sty]%
{headtopline=\@tempdima:\csname sls@#1 at linelength\endcsname}%
}{\Ifstr{#1}{headbelow}{%
- \KOMAExecuteOptions[.scrlayer-scrpage.sty]%
+ \KOMAExecuteOptions[scrlayer-scrpage.sty]%
{headsepline=\@tempdima:\csname sls@#1 at linelength\endcsname}%
}{%
\Ifstr{#1}{footabove}{%
- \KOMAExecuteOptions[.scrlayer-scrpage.sty]%
+ \KOMAExecuteOptions[scrlayer-scrpage.sty]%
{footsepline=\@tempdima:\csname sls@#1 at linelength\endcsname}%
}{%
- \KOMAExecuteOptions[.scrlayer-scrpage.sty]%
+ \KOMAExecuteOptions[scrlayer-scrpage.sty]%
{footbotline=\@tempdima:\csname sls@#1 at linelength\endcsname}%
}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: init)
\newcommand*{\scrlayer@@inherited at options@cslist}{}
\newcommand*{\scrlayer@@add at inherited@option}[1]{%
@@ -145,7 +145,7 @@
\@namedef{scrlayer at deprecated@reported at for@#1}{\string #2}%
}{}%
}
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: options)
\KOMA at key{markcase}{%
\begingroup
@@ -177,20 +177,20 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{markcase}%
- \KOMA at kav@xadd{.scrlayer.sty}{markcase}{#1}%
+ \KOMA at kav@removekey{scrlayer.sty}{markcase}%
+ \KOMA at kav@xadd{scrlayer.sty}{markcase}{#1}%
\fi
}
\scrlayer@@add at inherited@option{markcase}
\@ifundefined{MakeMarkcase}{\let\MakeMarkcase\@firstofone}{}
\ifx\MakeMarkcase\@firstofone
- \KOMA at kav@replacevalue{.scrlayer.sty}{markcase}{used}%
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{used}%
\else\ifx\MakeMarkcase\MakeUppercase
- \KOMA at kav@replacevalue{.scrlayer.sty}{markcase}{upper}%
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{upper}%
\else\ifx\MakeMarkcase\MakeLowercase
- \KOMA at kav@replacevalue{.scrlayer.sty}{markcase}{lower}%
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{lower}%
\else\ifx\MakeMarkcase\scr at ignoreuppercase
- \KOMA at kav@replacevalue{.scrlayer.sty}{markcase}{ignoreuppercase}%
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{ignoreuppercase}%
\fi\fi\fi\fi
\DeclareRobustCommand*{\scrlayer at ignoreuppercase}[1]{%
\begingroup
@@ -203,7 +203,7 @@
\newif\ifscrlayer at forceignoreuppercase
\KOMA at ifkey{autooneside}{scrlayer at autooneside}\scrlayer at autoonesidetrue
\scrlayer@@add at inherited@option{autooneside}
-\KOMA at kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer at autooneside}
+\KOMA at kav@replacebool{scrlayer.sty}{autooneside}{scrlayer at autooneside}
\KOMA at key{automark}[]{%
\scrlayer at testunexpectedarg{automark}{#1}%
\scrlayer at AtEndOfPackage{%
@@ -226,9 +226,9 @@
\fi
}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{automark}%
- \KOMA at kav@removekey{.scrlayer.sty}{manualmark}%
- \KOMA at kav@add{.scrlayer.sty}{automark}{}%
+ \KOMA at kav@removekey{scrlayer.sty}{automark}%
+ \KOMA at kav@removekey{scrlayer.sty}{manualmark}%
+ \KOMA at kav@add{scrlayer.sty}{automark}{}%
}
\scrlayer@@add at inherited@option{automark}
\KOMA at key{manualmark}[]{%
@@ -235,91 +235,91 @@
\scrlayer at testunexpectedarg{manualmark}{#1}%
\scrlayer at AtEndOfPackage{\manualmark}%
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.scrlayer.sty}{automark}%
- \KOMA at kav@removekey{.scrlayer.sty}{manualmark}%
- \KOMA at kav@add{.scrlayer.sty}{manualmark}{}%
+ \KOMA at kav@removekey{scrlayer.sty}{automark}%
+ \KOMA at kav@removekey{scrlayer.sty}{manualmark}%
+ \KOMA at kav@add{scrlayer.sty}{manualmark}{}%
}
\scrlayer@@add at inherited@option{manualmark}
\KOMA at key{onpsselect}{%
\l at addto@macro{\@ps at initialhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsselect}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsselect}{#1}%
}
\scrlayer@@add at inherited@option{onpsselect}
\newcommand*{\@ps at initialhook}{}
-\KOMA at kav@add{.scrlayer.sty}{onpsselect}{}
+\KOMA at kav@add{scrlayer.sty}{onpsselect}{}
\KOMA at key{onpsinit}{%
\l at addto@macro{\@ps at hook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsinit}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsinit}{#1}%
}
\scrlayer@@add at inherited@option{onpsinit}
\newcommand*{\@ps at hook}{}
-\KOMA at kav@add{.scrlayer.sty}{onpsinit}{}
+\KOMA at kav@add{scrlayer.sty}{onpsinit}{}
\KOMA at key{onpsoneside}{%
\l at addto@macro{\@ps at onesidehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsoneside}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsoneside}{#1}%
}
\scrlayer@@add at inherited@option{onpsoneside}
\newcommand*{\@ps at onesidehook}{}
-\KOMA at kav@add{.scrlayer.sty}{onpsoneside}{}
+\KOMA at kav@add{scrlayer.sty}{onpsoneside}{}
\KOMA at key{onpstwoside}{%
\l at addto@macro{\@ps at twosidehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpstwoside}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpstwoside}{#1}%
}
\scrlayer@@add at inherited@option{onpstwoside}
\newcommand*{\@ps at twosidehook}{}
-\KOMA at kav@add{.scrlayer.sty}{onpstwoside}{}
+\KOMA at kav@add{scrlayer.sty}{onpstwoside}{}
\KOMA at key{onpsoddpage}{%
\l at addto@macro{\@ps at oddpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsoddpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsoddpage}{#1}%
}
\scrlayer@@add at inherited@option{onpsoddpage}
\newcommand*{\@ps at oddpagehook}{}
-\KOMA at kav@add{.scrlayer.sty}{onpsoddpage}{}
+\KOMA at kav@add{scrlayer.sty}{onpsoddpage}{}
\KOMA at key{onpsevenpage}{%
\l at addto@macro{\@ps at evenpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsevenpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsevenpage}{#1}%
}
\scrlayer@@add at inherited@option{onpsevenpage}
\newcommand*{\@ps at evenpagehook}{}
-\KOMA at kav@add{.scrlayer.sty}{onpsevenpage}{}
+\KOMA at kav@add{scrlayer.sty}{onpsevenpage}{}
\KOMA at key{onpsfloatpage}{%
\l at addto@macro{\@ps at floatpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsfloatpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsfloatpage}{#1}%
}
\scrlayer@@add at inherited@option{onpsfloatpage}
\newcommand*{\@ps at floatpagehook}{}
-\KOMA at kav@add{.scrlayer.sty}{onpsfloatpage}{}
+\KOMA at kav@add{scrlayer.sty}{onpsfloatpage}{}
\KOMA at key{onpsnonfloatpage}{%
\l at addto@macro{\@ps at nonfloatpagehook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsnonfloatpage}{#1}%
}
\scrlayer@@add at inherited@option{onpsnonfloatpage}
\newcommand*{\@ps at nonfloatpagehook}{}
-\KOMA at kav@add{.scrlayer.sty}{onpsnonfloatpage}{}
+\KOMA at kav@add{scrlayer.sty}{onpsnonfloatpage}{}
\KOMA at key{onpsbackground}{%
\l at addto@macro{\@ps at backgroundhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsbackground}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsbackground}{#1}%
}
\scrlayer@@add at inherited@option{onpsbackground}
\newcommand*{\@ps at backgroundhook}{}
-\KOMA at kav@add{.scrlayer.sty}{onpsbackground}{}
+\KOMA at kav@add{scrlayer.sty}{onpsbackground}{}
\KOMA at key{onpsforeground}{%
\l at addto@macro{\@ps at foregroundhook}{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@add{.scrlayer.sty}{onpsforeground}{#1}%
+ \KOMA at kav@add{scrlayer.sty}{onpsforeground}{#1}%
}
\scrlayer@@add at inherited@option{onpsforeground}
\newcommand*{\@ps at foregroundhook}{}
-\KOMA at kav@add{.scrlayer.sty}{onpsforeground}{}
+\KOMA at kav@add{scrlayer.sty}{onpsforeground}{}
\KOMA at ifkey{singlespacing}{@ps at singlespacing}
\scrlayer@@add at inherited@option{singlespacing}
\KOMA at ifkey{deactivatepagestylelayers}{scrlayer at deactivate@layers}
@@ -330,7 +330,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 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty}
@@ -2356,7 +2356,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 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.cls 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -60,15 +60,13 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
\let\scr at clsextension\@clsextension
}
-\newcommand*{\KOMAClassName}{%
- scrartcl%
-}
+\newcommand*{\KOMAClassName}{scrartcl}
\newcommand*{\ClassName}{%
article%
}
@@ -77,7 +75,7 @@
\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
\edef\KOMALongClassFileName{\KOMALongClassFileName}
\ProvidesClass{\KOMALongClassName}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -84,7 +84,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -91,13 +91,13 @@
\let\scr at pkgextension\@pkgextension
}
\ProvidesPackage{scrletter}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
letter package extending any KOMA-Script class%
]
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: init)
\scr at ifundefinedorrelax{KOMAClassName}{%
\PackageWarningNoLine{scrletter}{%
@@ -121,37 +121,37 @@
}
\providecommand*{\par at updaterelative}{}
}{}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: option)
\AtEndOfPackage
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: option)
\newif\if at orgdate\@orgdatetrue
\KOMA at key{numericaldate}[true]{%
\if at orgdate\@orgdatefalse\else\@orgdatetrue\fi
\KOMA at set@ifkey{numericaldate}{@orgdate}{#1}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
scrletter.\scr at pkgextension
}{numericaldate}{@orgdate}%
\if at orgdate\@orgdatefalse\else\@orgdatetrue\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{numericaldate}{true}
\KOMA at DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA at DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-variables.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pseudolengths.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: options)
\providecommand*{\PaperNameToSize}[2][warning]{%
\Ifstr{#2}{letter}{%
@@ -242,9 +242,9 @@
because of unknown paper size.%
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\KOMA at ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -259,13 +259,13 @@
{no}{10000},{false}{10000},{off}{10000}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
scrletter.\scr at pkgextension
}{fromalign}{#1}%
\ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{fromalign}{left}
\KOMA at ncmdkey{fromrule}[below]{@rulefrom}{%
@@ -272,7 +272,7 @@
{false}{0},{no}{0},{off}{0},{aftername}{1},%
{below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}%
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{fromrule}{false}
\KOMA at ifkey{fromphone}{@phone}
@@ -296,7 +296,7 @@
{ppimage}{4},{ppImage}{4},%
{topaligned}{5},{alignedtop}{5}%
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{addrfield}{true}
\KOMA at ncmdkey{priority}[A]{ltr at priority}{%
@@ -308,7 +308,7 @@
{priority}{2},{Priority}{2},{PRIORITY}{2},%
{A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}%
}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{priority}{false}
\newcommand{\backaddr at format}[1]{}
@@ -343,22 +343,22 @@
\fi
\if at baddr
\ifx\backaddr at format\underline
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrletter.\scr at pkgextension
}{backaddress}{underlined}%
\else
\ifx\backaddr at format\@firstofone
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrletter.\scr at pkgextension
}{backaddress}{plain}%
\else
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrletter.\scr at pkgextension
}{backaddress}{true}%
\fi
\fi
\else
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrletter.\scr at pkgextension
}{backaddress}{false}%
\fi
@@ -375,13 +375,13 @@
\ifcase\@tempa
\endgroup
\@bigloctrue
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrletter.\scr at pkgextension
}{locfield}{wide}%
\else
\endgroup
\@biglocfalse
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
scrletter.\scr at pkgextension
}{locfield}{narrow}%
\fi
@@ -390,7 +390,7 @@
\FamilyKeyStateUnknownValue
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{locfield}{narrow}
\KOMA at DeclareDeprecatedOption{wlocfield}{locfield=wide}
@@ -450,18 +450,18 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
scrletter.\scr at pkgextension
}{foldmarks}{\@usefolds}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
scrletter.\scr at pkgextension
}{foldmarks}{\if at fold true\else false\fi}%
\fi
}
-\KOMA at kav@xadd{.%
+\KOMA at kav@xadd{%
scrletter.\scr at pkgextension
}{foldmarks}{\@usefolds}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{foldmarks}{true}%
\newcommand*{\scr at removechar}[2]{%
@@ -489,14 +489,14 @@
\endgroup
\@refwidetrue
\@reflinetrue
- \KOMA at kav@remove{.scrletter.\scr at pkgextension}{refline}{false}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{scrletter.\scr at pkgextension}{refline}{false}%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{wide}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{narrow}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrletter.\scr at pkgextension
}{refline}{wide}%
\or% narrow
@@ -503,67 +503,67 @@
\endgroup
\@refwidefalse
\@reflinetrue
- \KOMA at kav@remove{.scrletter.\scr at pkgextension}{refline}{false}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{scrletter.\scr at pkgextension}{refline}{false}%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{wide}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{narrow}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrletter.\scr at pkgextension
}{refline}{narrow}%
\or% dateleft
\endgroup
\def\@datepos{2}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{dateleft}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{dateright}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{nodate}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrletter.\scr at pkgextension
}{refline}{dateleft}%
\or% dateright
\endgroup
\def\@datepos{1}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{dateleft}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{dateright}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{nodate}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrletter.\scr at pkgextension
}{refline}{dateright}%
\or% nodate
\endgroup
\def\@datepos{0}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{dateleft}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{dateright}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
scrletter.\scr at pkgextension
}{refline}{nodate}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrletter.\scr at pkgextension
}{refline}{nodate}%
\or% false
\endgroup
\@reflinefalse
- \KOMA at kav@remove{.scrletter.\scr at pkgextension}{refline}{wide}%
- \KOMA at kav@remove{.scrletter.\scr at pkgextension}{reline}{narrow}%
- \KOMA at kav@add{.scrletter.\scr at pkgextension}{refline}{false}%
+ \KOMA at kav@remove{scrletter.\scr at pkgextension}{refline}{wide}%
+ \KOMA at kav@remove{scrletter.\scr at pkgextension}{reline}{narrow}%
+ \KOMA at kav@add{scrletter.\scr at pkgextension}{refline}{false}%
\fi
\else
\endgroup
@@ -570,10 +570,10 @@
\FamilyKeyStateUnknownValue
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{refline}{dateright}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{refline}{narrow}%
\newcommand{\subject at format}[1]{#1}
@@ -616,29 +616,29 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
scrletter.\scr at pkgextension
}{subject}{\if at subj titled\else untitled\fi}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
scrletter.\scr at pkgextension
}{subject}{\if at subjafter after\else before\fi opening}%
\ifx\subject at format\underline
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrletter.\scr at pkgextension
}{subject}{underlined}%
\fi
\ifx\raggedsubject\raggedright
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrletter.\scr at pkgextension
}{subject}{left}%
\else
\ifx\raggedsubject\raggedleft
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrletter.\scr at pkgextension
}{subject}{right}%
\else
\ifx\raggedsubject\centering
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
scrletter.\scr at pkgextension
}{subject}{centered}%
\fi
@@ -646,10 +646,10 @@
\fi
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{subject}{untitled}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{subject}{beforeopening}%
\KOMA at ifkey{enlargefirstpage}{@enlargefp}
@@ -700,7 +700,7 @@
\def\@tempa{\endgroup\FamilyKeyStateUnknownValue}%
\fi
\@tempa
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
scrletter.\scr at pkgextension
}{pagenumber}{%
\ifcase \@pageat
@@ -720,7 +720,7 @@
\fi
}%
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{pagenumber}{botmiddle}
\newif\if at scrsymbols
@@ -743,7 +743,7 @@
\fi
\fi
\ifx \FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
scrletter.\scr at pkgextension
}{symbolicnames}{#1}%
\if at scrsymbols
@@ -803,7 +803,7 @@
\fi
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
scrletter.\scr at pkgextension
}{symbolicnames}{false}%
\newcommand*{\scr at symbols@font}{}
@@ -814,15 +814,15 @@
\newcommand*{\scr at symbol@www}{\undefined}
%%% From File: $Id: scrkernel-addressfiles.dtx 3874 2022-06-05 10:38:02Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: execoption)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\providecommand*{\scr at endstrut}{\unskip\ifhmode\nobreak\strut\fi}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore at catcode@level}%
@@ -844,11 +844,11 @@
\edef\reserved at a{%
\noexpand\edef\noexpand\scr at currentlco{\reserved at a}%
\noexpand\InputIfFileExists{\reserved at a.lco}{%
- \noexpand\PackageInfo{scrletter%
- }{Letter-Class-Option `#1' loaded}%
+ \noexpand\PackageInfo{scrletter}%
+ {Letter-Class-Option `#1' loaded}%
}{%
- \noexpand\PackageError{scrletter%
- }{%
+ \noexpand\PackageError{scrletter}%
+ {%
Letter-Class-Option file `#1.lco' not found%
}{%
You've told me to load the Letter-Class-Option `#1'. So I have
@@ -972,34 +972,35 @@
}
\newcommand*{\@@PapersizeWarning}{%
\if at tempswa\else%
- \PackageWarningNoLine{scrletter%
- }{%
- Letter option file `\LOPNP at option.lco'\MessageBreak
- needs paper size `\LOPNP at size'.\MessageBreak
- Current paper size is not `\LOPNP at size'!\MessageBreak
- \scr at ifundefinedorrelax{KOMAClassName}{%
- You should load package `typearea' either\MessageBreak
- with option `paper=\LOPNP at size,paper=portrait' or
- additionally\MessageBreak
- }{%
- You should add `paper=\LOPNP at size,paper=portrait' at the\MessageBreak
- option list of `\string\documentclass' or\MessageBreak
+ \PackageWarningNoLine{scrletter}%
+ {%
+ Letter option file `\LOPNP at option.lco'\MessageBreak
+ needs paper size `\LOPNP at size'.\MessageBreak
+ Current paper size is not `\LOPNP at size'!\MessageBreak
+ \scr at ifundefinedorrelax{KOMAClassName}{%
+ You should load package `typearea' either\MessageBreak
+ with option `paper=\LOPNP at size,paper=portrait' or
+ additionally\MessageBreak
+ }{%
+ You should add `paper=\LOPNP at size,paper=portrait' at the\MessageBreak
+ option list of `\string\documentclass' or\MessageBreak
+ }%
+ add `\string\KOMAoptions{paper=\LOPNP at size,paper=portrait}'\MessageBreak
+ before starting this letter!\MessageBreak
+ Maybe you know what you are doing,\MessageBreak
+ so I do not change this myself%
}%
- add `\string\KOMAoptions{paper=\LOPNP at size,paper=portrait}'\MessageBreak
- before starting this letter!\MessageBreak
- Maybe you know what you are doing,\MessageBreak
- so I do not change this myself}%
\fi
- }
+}
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP at size{#2}\edef\LOPNP at option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: body)
\newcommand*{\g at addnumerical@date}[2]{%
\@ifundefined{date#1}{%
- \PackageInfo{scrletter%
- }{%
+ \PackageInfo{scrletter}
+ {%
no date found for language `#1'\MessageBreak
--> skipped%
}%
@@ -1364,8 +1365,8 @@
\dateenglish
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname date\languagename\endcsname\relax
- \PackageWarningNoLine{scrletter%
- }{%
+ \PackageWarningNoLine{scrletter}
+ {%
\string\language\space is \the\language, \string\languagename\space is
`\languagename'\MessageBreak
but \expandafter\string\csname
@@ -1376,8 +1377,8 @@
\let\languagename=\undefined
\fi
\ifx\languagename\undefined
- \PackageWarningNoLine{scrletter%
- }{\string\languagename\space not
+ \PackageWarningNoLine{scrletter}
+ {\string\languagename\space not
defined, using \string\language.\MessageBreak
This may result in use of wrong language!\MessageBreak
You should use a compatible language
@@ -1531,8 +1532,8 @@
\else
\edef\@tempa{nohyphenation}%
\ifx\languagename\@tempa
- \PackageWarningNoLine{scrletter%
- }{%
+ \PackageWarningNoLine{scrletter}
+ {%
You've selected language `\languagename'.\MessageBreak
Maybe your LaTeX format contains Babel extension\MessageBreak
but you have not selected a language using\MessageBreak
@@ -1542,15 +1543,15 @@
will be used%
}%
\else
- \PackageInfo{scrletter%
- }{%
+ \PackageInfo{scrletter}
+ {%
trying to activate captions and date\MessageBreak
of language `\languagename'%
}%
\csname date\languagename\endcsname
\csname captions\languagename\endcsname
- \PackageInfo{scrletter%
- }{%
+ \PackageInfo{scrletter}
+ {%
used language is `\languagename'.\MessageBreak
Supported languages are: `english', `UKenglish',\MessageBreak
`ukenglish', `british', `american', `USenglish',\MessageBreak
@@ -1565,7 +1566,7 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\newcommand*{\newkomavar}{%
\kernel at ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
@@ -1580,8 +1581,8 @@
\expandafter\let\csname scr@#2 at var\endcsname=\@empty
\if at tempswa\addtoreffields{#2}\fi
}{%
- \PackageError{scrletter%
- }{%
+ \PackageError{scrletter}
+ {%
This should never happen%
}{%
The contents of the KOMA-Script variable `#2'\MessageBreak
@@ -1591,8 +1592,8 @@
}%
}%
}{%
- \PackageError{scrletter%
- }{%
+ \PackageError{scrletter}
+ {%
Variable `#2' already defined%
}{%
I'll ignore this command, if you'll continue.%
@@ -1628,8 +1629,8 @@
}%
}
\newcommand*{\@komavar at err}[2]{%
- \PackageError{scrletter%
- }{%
+ \PackageError{scrletter}
+ {%
KOMA-Script variable not defined%
}{%
You've tried to #1 the not defined KOMA-Script variable
@@ -1750,7 +1751,7 @@
\fi
}%
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\newcommand*{\Ifplength}[1]{%
\@ifundefined{ltr at len@#1}{\@secondoftwo}{\@firstoftwo}%
@@ -1765,8 +1766,8 @@
\@ifundefined{ltr at len@#1}{%
\expandafter\let\csname ltr at len@#1\endcsname=\z@%
}{%
- \PackageError{scrletter%
- }{%
+ \PackageError{scrletter}%
+ {%
pseudo-length \expandafter\string\csname ltr at len@#1\endcsname
already defined%
}{%
@@ -1869,7 +1870,7 @@
Internal macro `\string\@addtoplength' is deprecated.\MessageBreak
Please use `\string\addtoplength' instead}%
\addtoplength}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: body)
\newcommand*{%
\letterpagemark
@@ -1901,7 +1902,7 @@
\rofoot[\ifnum\@pageat=5 \pagemark\fi]%
{}%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\newkomavar{firsthead}
@@ -1920,7 +1921,7 @@
}%
}
\newcommand*{\scr at firsthead@postsetvar}{%
- \KOMAExecuteOptions[.%
+ \KOMAExecuteOptions[%
scrletter.\scr at pkgextension
]{fromalign=no}%
}
@@ -2068,7 +2069,7 @@
\newkomafont{fromname}{}
\newkomafont{fromaddress}{}
\newkomafont{fromrule}{}
-\newkomafont{backaddress}{\@gr at gsffamily}
+\newkomafont{backaddress}{\maybesffamily}
\newkomafont{specialmail}{}
\newkomafont{priority}{\fontsize{10pt}{10pt}\sffamily\bfseries}
\newkomafont{prioritykey}{\fontsize{24.88pt}{24.88pt}\selectfont}
@@ -2077,10 +2078,10 @@
\newkomafont{addressee}{}
\newkomafont{toname}{}
\newkomafont{toaddress}{}
-\newkomafont{refname}{\@gr at gsffamily\scriptsize}
+\newkomafont{refname}{\maybesffamily\scriptsize}
\newkomafont{refvalue}{}
\newkomafont{placeanddate}{}
-\newkomafont{lettertitle}{\normalcolor\@gr at gsffamily\bfseries}
+\newkomafont{lettertitle}{\normalcolor\maybesffamily\bfseries}
\scr at ifundefinedorrelax{scr at fnt@title}{%
\aliaskomafont{title}{lettertitle}%
}{}
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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook-3.34.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile-hook.dtx$
\ProvidesPackage{scrlfile-hook-3.34}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile-hook.dtx$
\ProvidesPackage{scrlfile-hook}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile-patcholdlatex.dtx 3874 2022-06-05 10:38:02Z kohm $
\ProvidesPackage{scrlfile-patcholdlatex}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile.dtx 3874 2022-06-05 10:38:02Z kohm $
\ProvidesPackage{scrlfile}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -40,7 +40,7 @@
%%
%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $
\ProvidesPackage{scrlogo}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,15 +95,13 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
\let\scr at clsextension\@clsextension
}
-\newcommand*{\KOMAClassName}{%
- scrlttr2%
-}
+\newcommand*{\KOMAClassName}{scrlttr2}
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\newcommand*{\ClassName}{%
@@ -110,13 +108,13 @@
letter%
}
\ProvidesClass{\KOMAClassName}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -202,10 +200,11 @@
\@namedef{scr at v@3.36}{20}
\@namedef{scr at v@3.37}{20}
\@namedef{scr at v@3.38}{20}
+\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@last}{20}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\KOMA at key{version}[last]{%
\scr at ifundefinedorrelax{scr at v@#1}{%
@@ -216,7 +215,7 @@
Because of this, version was set to `first'%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{version}{first}%
}{%
@@ -225,7 +224,7 @@
}%
\edef\scr at compatibility{\@nameuse{scr at v@#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{version}{#1}%
\ifnum\scr at compatibility<\scr at v@last
@@ -246,7 +245,7 @@
\fi
}%
}
-\KOMA at kav@add{.\KOMAClassFileName}{version}{last}
+\KOMA at kav@add{\KOMAClassFileName}{version}{last}
\AtEndOfClass{%
\KOMA at key{version}[]{%
\ClassError{\KOMAClassName}{%
@@ -271,24 +270,27 @@
\newcommand*{\scr at v@is at ge}[1]{%
\numexpr\scr at compatibility+\@ne\relax>\@nameuse{scr at v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+\newcommand*{\scr at v@is at eq}[1]{%
+ \scr at compatibility=\@nameuse{scr at v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
@@ -295,7 +297,7 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{draft}{false}
+\KOMA at kav@add{\KOMAClassFileName}{draft}{false}
\KOMA at DeclareStandardOption
{final}{draft=false}
\KOMA at key{overfullrule}[true]{%
@@ -302,18 +304,18 @@
\KOMA at set@ifkey{overfullrule}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
@@ -320,12 +322,8 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{overfullrule}{false}
-\KOMA at ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
-\newcommand*{\@gr at gsffamily}{%
- \if at egregdoesnotlikesansseriftitles\else\sffamily\fi
-}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+\KOMA at kav@add{\KOMAClassFileName}{overfullrule}{false}
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: option)
\newcommand*{\lco at test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -350,23 +348,23 @@
}
\AtEndOfClass
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: option)
\newif\if at orgdate\@orgdatetrue
\KOMA at key{numericaldate}[true]{%
\if at orgdate\@orgdatefalse\else\@orgdatetrue\fi
\KOMA at set@ifkey{numericaldate}{@orgdate}{#1}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{numericaldate}{@orgdate}%
\if at orgdate\@orgdatefalse\else\@orgdatetrue\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{numericaldate}{true}
\KOMA at DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA at DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\providecommand*\@ptsize{%
12%
@@ -455,7 +453,7 @@
\@tempa
}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{fontsize}{#1}%
}
@@ -477,11 +475,56 @@
\BeforePackage{tex4ht}{%
\let\scr at defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-variables.dtx 3874 2022-06-05 10:38:02Z kohm $
+\KOMA at ifkey{sfdefaults}{@sfdefaults}
+\newcommand*{\maybesffamily}{\if at sfdefaults \sffamily \fi}
+\newcommand*{\textmaybesf}{%
+ \if at sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi
+}
+%% \begin{option}{egegdoesnotlikesansseriftitles}
+\KOMA at key{egregdoesnotlikesansseriftitles}[true]{%
+ \ClassWarningNoLine{\KOMAClassName}%
+ {%
+ You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak
+ In 2016 this option has been implemented as a joke\MessageBreak
+ answer to egreg's comment:\MessageBreak
+ \space\space ``In my opinion there should be a document class\MessageBreak
+ \space\space option for it, instead of the
+ \string\setkomafont\MessageBreak
+ \space\space statement. And yes, I find imposing sans serif
+ for\MessageBreak
+ \space\space titles is not the best choice (one of the
+ reasons\MessageBreak
+ \space\space why I don't use Koma-script classes).''\MessageBreak
+ to question https://tex.stackexchange.com/q/289853\MessageBreak
+ at TeX.SX.\MessageBreak
+ The option has never been documented in the official\MessageBreak
+ user manuals and therefore should never have been\MessageBreak
+ used in real live documents. It was intended to be\MessageBreak
+ removed after some month.\MessageBreak
+ However, it has been used and also almost forgotten\MessageBreak
+ by the author.\MessageBreak
+ For this the author apologizes both to users but\MessageBreak
+ especially to egreg.\MessageBreak
+ Rightly, egreg has criticized the permanent retention\MessageBreak
+ of the option as unfunny to inappropriate and has\MessageBreak
+ asked that it be removed or replaced.\MessageBreak
+ It will be removed soon!\MessageBreak
+ You should use `sfdefaults=false` instead%
+ }%
+ \KOMA at set@ifkey{egregdoesnotlikesansseriftitles}%
+ {@sfdefaults}%
+ {#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if at sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}%
+ {sfdefaults}{\if at sfdefaults true\else false\fi}%
+ \fi
+}
+%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pseudolengths.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: options)
\KOMA at key{twoside}[true]{%
\if at atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -501,9 +544,9 @@
\if at twocolumn\sloppy\flushbottom\else\raggedbottom\fi
\fi
\fi
- \KOMA at kav@xreplacevalue{.%
- \KOMAClassFileName
- }{twoside}{#1}%
+ \KOMA at kav@xreplacevalue
+ {\KOMAClassFileName}%
+ {twoside}{#1}%
\fi
}
\KOMAExecuteOptions{twoside=false}
@@ -513,21 +556,23 @@
\if at atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
\KOMA at set@ifkey{twocolumn}{@twocolumn}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.%
- \KOMAClassFileName
- }{twocolumn}{@twocolumn}%
+ \KOMA at kav@replacebool
+ {\KOMAClassFileName}%
+ {twocolumn}{@twocolumn}%
\if at atdocument\expandafter\@firstofone
\else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
{\expandafter\AtEndOfClass}\fi
- {\expandafter\ifnum\scr at v@is at ge{3.17}%
- \if at twocolumn\twocolumn\sloppy\flushbottom
- \else
- \onecolumn
- \if at twoside\flushbottom\else
- \raggedbottom
+ {%
+ \expandafter\ifnum\scr at v@is at ge{3.17}%
+ \if at twocolumn\twocolumn\sloppy\flushbottom
+ \else
+ \onecolumn
+ \if at twoside\flushbottom\else
+ \raggedbottom
+ \fi
\fi
\fi
- \fi}%
+ }%
\fi
}
\AtEndOfClass{%
@@ -608,7 +653,7 @@
\DeclareOption*{%
\lco at test
\x at paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f at parindent{\the\parindent}%
@@ -621,16 +666,16 @@
\if at atdocument\let\par at update\default at par@update\fi
\par at updaterelative
}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{false}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{never}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full-}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full+}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full*}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half-}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half+}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half*}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{false}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{never}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full-}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full+}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full*}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half-}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half+}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half*}%
}
\newcommand*{\f at parindent}{\the\parindent}
\newcommand*{\f at parskip}{\the\parskip}
@@ -669,66 +714,66 @@
\ifcase\number\@tempa% 0
\endgroup
\setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{never}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{never}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
\setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{false}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{false}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 2
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full-}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full-}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half-}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half-}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 4
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 6
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full+}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full+}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half+}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half+}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 8
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full*}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full*}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half*}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half*}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 10
\endgroup
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{relative}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{relative}%
\ifx\par at updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -742,9 +787,9 @@
}%
\or%11
\endgroup
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{relative}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}%
\ifx\par at updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -772,15 +817,15 @@
\KOMA at DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA at DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\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 3874 2022-06-05 10:38:02Z kohm $
+\KOMA at kav@add{\KOMAClassFileName}{parskip}{false}
+\KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: option)
\KOMA at ifkey{headsepline}{@hsl}%
-\KOMA at kav@add{.\KOMAClassFileName}{headsepline}{false}
+\KOMA at kav@add{\KOMAClassFileName}{headsepline}{false}
\KOMA at DeclareDeprecatedOption{headnosepline}{headsepline=false}
\KOMA at ifkey{footsepline}{@fsl}%
-\KOMA at kav@add{.\KOMAClassFileName}{footsepline}{false}
+\KOMA at kav@add{\KOMAClassFileName}{footsepline}{false}
\KOMA at DeclareDeprecatedOption{footnosepline}{footsepline=false}
\KOMA at key{cleardoublepage}{%
\begingroup
@@ -795,7 +840,7 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{cleardoublepage}{current}%
}%
@@ -806,7 +851,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{cleardoublepage}{#1}%
}%
@@ -819,7 +864,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}%
{cleardoublepage}{#1}%
}%
}{}%
@@ -847,16 +892,18 @@
\newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}}
\newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}
\renewcommand*{\cleardoublepage}{%
- \expandafter\ifnum \@nameuse{scr at v@2.98c}<\scr at compatibility\relax
+ \expandafter\ifnum \scr at v@is at gt{2.98c}%
\cleardoubleemptypage
\else
\cleardoublestandardpage
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{cleardoublepage}{%
- \expandafter\ifnum \scr at v@is at gt{2.98c}empty\else current\fi
+ \expandafter\ifnum \scr at v@is at gt{2.98c}
+ empty%
+ \else current\fi
}
\AtEndOfClass{%
\KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
@@ -863,10 +910,10 @@
{%
\KOMAClassFileName
}{cleardoublepage}%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{cleardoublepage}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
\KOMAClassFileName
}{cleardoublepage}{\@tempa}%
}
@@ -879,9 +926,9 @@
\KOMA at DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA at DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA at DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\KOMA at key{footnotes}{%
\ifx\@footnotemark\scr at saved@footnotemark
@@ -901,7 +948,7 @@
\def\FN at mf@prepare{\scr at mf@prepare}%
\def\scr at footmisc@options{multiple}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{footnotes}{multiple}%
}{%
@@ -910,7 +957,7 @@
\let\FN at mf@prepare\relax
\let\scr at footmisc@options\@empty
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{footnotes}{nomultiple}%
}{%
@@ -920,17 +967,17 @@
}
\AtBeginDocument{%
\ifx\@footnotemark\scr at saved@footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{footnotes}{nomultiple}%
\else\ifx\@footnotemark\scr at footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{footnotes}{multiple}%
\fi\fi
@@ -952,9 +999,9 @@
\csname FN at mf@prepare\endcsname
\ifhmode\spacefactor\@x at sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\KOMA at ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -969,13 +1016,13 @@
{no}{10000},{false}{10000},{off}{10000}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{fromalign}{#1}%
\ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{fromalign}{left}
\KOMA at ncmdkey{fromrule}[below]{@rulefrom}{%
@@ -982,7 +1029,7 @@
{false}{0},{no}{0},{off}{0},{aftername}{1},%
{below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}%
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{fromrule}{false}
\KOMA at ifkey{fromphone}{@phone}
@@ -1006,7 +1053,7 @@
{ppimage}{4},{ppImage}{4},%
{topaligned}{5},{alignedtop}{5}%
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{addrfield}{true}
\KOMA at ncmdkey{priority}[A]{ltr at priority}{%
@@ -1018,7 +1065,7 @@
{priority}{2},{Priority}{2},{PRIORITY}{2},%
{A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}%
}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{priority}{false}
\newcommand{\backaddr at format}[1]{}
@@ -1053,22 +1100,22 @@
\fi
\if at baddr
\ifx\backaddr at format\underline
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{backaddress}{underlined}%
\else
\ifx\backaddr at format\@firstofone
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{backaddress}{plain}%
\else
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{backaddress}{true}%
\fi
\fi
\else
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{backaddress}{false}%
\fi
@@ -1085,13 +1132,13 @@
\ifcase\@tempa
\endgroup
\@bigloctrue
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{locfield}{wide}%
\else
\endgroup
\@biglocfalse
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{locfield}{narrow}%
\fi
@@ -1100,7 +1147,7 @@
\FamilyKeyStateUnknownValue
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{locfield}{narrow}
\KOMA at DeclareDeprecatedOption{wlocfield}{locfield=wide}
@@ -1160,18 +1207,18 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{foldmarks}{\@usefolds}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
\KOMAClassFileName
}{foldmarks}{\if at fold true\else false\fi}%
\fi
}
-\KOMA at kav@xadd{.%
+\KOMA at kav@xadd{%
\KOMAClassFileName
}{foldmarks}{\@usefolds}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{foldmarks}{true}%
\newcommand*{\scr at removechar}[2]{%
@@ -1196,70 +1243,70 @@
\ifcase\@tempa% wide
\endgroup
\@refwidetrue
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{wide}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{narrow}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{refline}{wide}%
\or% narrow
\endgroup
\@refwidefalse
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{wide}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{narrow}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{refline}{narrow}%
\or% dateleft
\endgroup
\def\@datepos{2}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{dateleft}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{dateright}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{nodate}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{refline}{dateleft}%
\or% dateright
\endgroup
\def\@datepos{1}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{dateleft}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{dateright}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{nodate}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{refline}{dateright}%
\or% nodate
\endgroup
\def\@datepos{0}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{dateleft}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{dateright}%
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{refline}{nodate}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{refline}{nodate}%
\fi
@@ -1268,10 +1315,10 @@
\FamilyKeyStateUnknownValue
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{refline}{dateright}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{refline}{narrow}%
\newcommand{\subject at format}[1]{#1}
@@ -1314,29 +1361,29 @@
\fi
\endgroup
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{subject}{\if at subj titled\else untitled\fi}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
\KOMAClassFileName
}{subject}{\if at subjafter after\else before\fi opening}%
\ifx\subject at format\underline
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{subject}{underlined}%
\fi
\ifx\raggedsubject\raggedright
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{subject}{left}%
\else
\ifx\raggedsubject\raggedleft
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{subject}{right}%
\else
\ifx\raggedsubject\centering
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{subject}{centered}%
\fi
@@ -1344,10 +1391,10 @@
\fi
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{subject}{untitled}%
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{subject}{beforeopening}%
\KOMA at ifkey{enlargefirstpage}{@enlargefp}
@@ -1398,7 +1445,7 @@
\def\@tempa{\endgroup\FamilyKeyStateUnknownValue}%
\fi
\@tempa
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{pagenumber}{%
\ifcase \@pageat
@@ -1418,7 +1465,7 @@
\fi
}%
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{pagenumber}{botmiddle}
\newif\if at scrsymbols
@@ -1441,7 +1488,7 @@
\fi
\fi
\ifx \FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{symbolicnames}{#1}%
\if at scrsymbols
@@ -1501,7 +1548,7 @@
\fi
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{symbolicnames}{false}%
\newcommand*{\scr at symbols@font}{}
@@ -1512,13 +1559,13 @@
\newcommand*{\scr at symbol@www}{\undefined}
%%% From File: $Id: scrkernel-addressfiles.dtx 3874 2022-06-05 10:38:02Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\AtBeginDocument{%
\begingroup
@@ -1578,7 +1625,7 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\newcommand*\scr at setlength[4]{%
\expandafter\ifnum\scr at v@is at lt{3.12}\relax
@@ -1616,7 +1663,7 @@
\fi
}
\providecommand*{\simple at changefontsizes}[2][1.2\@tempdima]{%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{fontsize}%
\@defaultunits\@tempdima#2pt\relax\@nnil
@@ -1765,7 +1812,9 @@
\let\Huge\@undefined
\expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved at a}%
\normalsize
- \expandafter\ifnum\scr at v@is at ge{3.17}\@nameuse{par at updaterelative}\fi
+ \expandafter\ifnum\scr at v@is at ge{3.17}
+ \@nameuse{par at updaterelative}%
+ \fi
\expandafter\ifnum\scr at v@is at lt{3.12}\relax
\setlength{\footnotesep}{.7\@tempdimc}%
\setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
@@ -1965,25 +2014,25 @@
\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}%
}{%
\InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak
file `\@fontsizefilebase\@tempa.clo' to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb pt}%
}{%
\InputIfFileExists{size\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `size\@tempb.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
\edef\@tempa{%
\noexpand\changefontsizes{\@tempa}%
- \noexpand\KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ \noexpand\KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}%
}\@tempa
}%
}%
@@ -2077,7 +2126,7 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
@@ -2144,7 +2193,7 @@
\fi
}
\newcommand\marginline[1]{%
- \marginpar[\raggedleft{#1}]{\raggedright #1}%
+ \marginpar[{\raggedleft #1}]{\raggedright #1}%
}
\scr at ifundefinedorrelax{textsubscript}{%
\DeclareRobustCommand*\textsubscript[1]{%
@@ -2201,7 +2250,7 @@
`parskip' with one of it's several values}
\scr at package@not at recommended{titleps}{%
package `scrlayer-scrpage'}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore at catcode@level}%
@@ -2223,11 +2272,11 @@
\edef\reserved at a{%
\noexpand\edef\noexpand\scr at currentlco{\reserved at a}%
\noexpand\InputIfFileExists{\reserved at a.lco}{%
- \noexpand\ClassInfo{scrlttr2%
- }{Letter-Class-Option `#1' loaded}%
+ \noexpand\ClassInfo{scrlttr2}%
+ {Letter-Class-Option `#1' loaded}%
}{%
- \noexpand\ClassError{scrlttr2%
- }{%
+ \noexpand\ClassError{scrlttr2}%
+ {%
Letter-Class-Option file `#1.lco' not found%
}{%
You've told me to load the Letter-Class-Option `#1'. So I have
@@ -2353,34 +2402,35 @@
}
\newcommand*{\@@PapersizeWarning}{%
\if at tempswa\else%
- \ClassWarningNoLine{scrlttr2%
- }{%
- Letter option file `\LOPNP at option.lco'\MessageBreak
- needs paper size `\LOPNP at size'.\MessageBreak
- Current paper size is not `\LOPNP at size'!\MessageBreak
- \scr at ifundefinedorrelax{KOMAClassName}{%
- You should load package `typearea' either\MessageBreak
- with option `paper=\LOPNP at size,paper=portrait' or
- additionally\MessageBreak
- }{%
- You should add `paper=\LOPNP at size,paper=portrait' at the\MessageBreak
- option list of `\string\documentclass' or\MessageBreak
+ \ClassWarningNoLine{scrlttr2}%
+ {%
+ Letter option file `\LOPNP at option.lco'\MessageBreak
+ needs paper size `\LOPNP at size'.\MessageBreak
+ Current paper size is not `\LOPNP at size'!\MessageBreak
+ \scr at ifundefinedorrelax{KOMAClassName}{%
+ You should load package `typearea' either\MessageBreak
+ with option `paper=\LOPNP at size,paper=portrait' or
+ additionally\MessageBreak
+ }{%
+ You should add `paper=\LOPNP at size,paper=portrait' at the\MessageBreak
+ option list of `\string\documentclass' or\MessageBreak
+ }%
+ add `\string\KOMAoptions{paper=\LOPNP at size,paper=portrait}'\MessageBreak
+ before starting this letter!\MessageBreak
+ Maybe you know what you are doing,\MessageBreak
+ so I do not change this myself%
}%
- add `\string\KOMAoptions{paper=\LOPNP at size,paper=portrait}'\MessageBreak
- before starting this letter!\MessageBreak
- Maybe you know what you are doing,\MessageBreak
- so I do not change this myself}%
\fi
- }
+}
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP at size{#2}\edef\LOPNP at option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: body)
\newcommand*{\g at addnumerical@date}[2]{%
\@ifundefined{date#1}{%
- \ClassInfo{scrlttr2%
- }{%
+ \ClassInfo{scrlttr2}
+ {%
no date found for language `#1'\MessageBreak
--> skipped%
}%
@@ -2745,8 +2795,8 @@
\dateenglish
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname date\languagename\endcsname\relax
- \ClassWarningNoLine{scrlttr2%
- }{%
+ \ClassWarningNoLine{scrlttr2}
+ {%
\string\language\space is \the\language, \string\languagename\space is
`\languagename'\MessageBreak
but \expandafter\string\csname
@@ -2757,8 +2807,8 @@
\let\languagename=\undefined
\fi
\ifx\languagename\undefined
- \ClassWarningNoLine{scrlttr2%
- }{\string\languagename\space not
+ \ClassWarningNoLine{scrlttr2}
+ {\string\languagename\space not
defined, using \string\language.\MessageBreak
This may result in use of wrong language!\MessageBreak
You should use a compatible language
@@ -2912,8 +2962,8 @@
\else
\edef\@tempa{nohyphenation}%
\ifx\languagename\@tempa
- \ClassWarningNoLine{scrlttr2%
- }{%
+ \ClassWarningNoLine{scrlttr2}
+ {%
You've selected language `\languagename'.\MessageBreak
Maybe your LaTeX format contains Babel extension\MessageBreak
but you have not selected a language using\MessageBreak
@@ -2923,15 +2973,15 @@
will be used%
}%
\else
- \ClassInfo{scrlttr2%
- }{%
+ \ClassInfo{scrlttr2}
+ {%
trying to activate captions and date\MessageBreak
of language `\languagename'%
}%
\csname date\languagename\endcsname
\csname captions\languagename\endcsname
- \ClassInfo{scrlttr2%
- }{%
+ \ClassInfo{scrlttr2}
+ {%
used language is `\languagename'.\MessageBreak
Supported languages are: `english', `UKenglish',\MessageBreak
`ukenglish', `british', `american', `USenglish',\MessageBreak
@@ -2946,7 +2996,7 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\newcommand*{\newkomavar}{%
\kernel at ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
@@ -2961,8 +3011,8 @@
\expandafter\let\csname scr@#2 at var\endcsname=\@empty
\if at tempswa\addtoreffields{#2}\fi
}{%
- \ClassError{scrlttr2%
- }{%
+ \ClassError{scrlttr2}
+ {%
This should never happen%
}{%
The contents of the KOMA-Script variable `#2'\MessageBreak
@@ -2972,8 +3022,8 @@
}%
}%
}{%
- \ClassError{scrlttr2%
- }{%
+ \ClassError{scrlttr2}
+ {%
Variable `#2' already defined%
}{%
I'll ignore this command, if you'll continue.%
@@ -3009,8 +3059,8 @@
}%
}
\newcommand*{\@komavar at err}[2]{%
- \ClassError{scrlttr2%
- }{%
+ \ClassError{scrlttr2}
+ {%
KOMA-Script variable not defined%
}{%
You've tried to #1 the not defined KOMA-Script variable
@@ -3131,7 +3181,7 @@
\fi
}%
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\newcommand*{\Ifplength}[1]{%
\@ifundefined{ltr at len@#1}{\@secondoftwo}{\@firstoftwo}%
@@ -3146,8 +3196,8 @@
\@ifundefined{ltr at len@#1}{%
\expandafter\let\csname ltr at len@#1\endcsname=\z@%
}{%
- \ClassError{scrlttr2%
- }{%
+ \ClassError{scrlttr2}%
+ {%
pseudo-length \expandafter\string\csname ltr at len@#1\endcsname
already defined%
}{%
@@ -3250,7 +3300,7 @@
Internal macro `\string\@addtoplength' is deprecated.\MessageBreak
Please use `\string\addtoplength' instead}%
\addtoplength}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -3262,7 +3312,7 @@
\let\x@@paper =\relax
\let\scr at pti@nerr at r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
%%% (run: body)
\newcommand*{\par at updaterelative}{%
\begingroup
@@ -3436,7 +3486,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: body)
\newcommand*{\set at tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -3533,9 +3583,9 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn at rule@test at values
@@ -3696,7 +3746,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\setlength{\leftmargini}{2.5em}
\setlength{\leftmarginii}{2.2em}
@@ -3838,7 +3888,7 @@
\fi
\item\is at thispageodd@setlabel\nobreak\ignorespaces
}
-\newcommand*\descfont{\@gr at gsffamily\bfseries}
+\newcommand*\descfont{\maybesffamily\bfseries}
\newcommand*{\scr at fnt@descriptionlabel}{\descfont}
\newcommand*{\labelitemfont}{\normalfont}
\newcommand*\scr at fnt@itemizelabel{\labelitemfont}
@@ -3853,7 +3903,7 @@
\setlength\arrayrulewidth{.4\p@}
\setlength\doublerulesep{2\p@}
\setlength\tabbingsep{\labelsep}
-%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\newkomavar{firsthead}
@@ -3872,7 +3922,7 @@
}%
}
\newcommand*{\scr at firsthead@postsetvar}{%
- \KOMAExecuteOptions[.%
+ \KOMAExecuteOptions[%
\KOMAClassFileName
]{fromalign=no}%
}
@@ -4036,7 +4086,7 @@
\newkomafont{fromname}{}
\newkomafont{fromaddress}{}
\newkomafont{fromrule}{}
-\newkomafont{backaddress}{\@gr at gsffamily}
+\newkomafont{backaddress}{\maybesffamily}
\newkomafont{specialmail}{}
\newkomafont{priority}{\fontsize{10pt}{10pt}\sffamily\bfseries}
\newkomafont{prioritykey}{\fontsize{24.88pt}{24.88pt}\selectfont}
@@ -4045,14 +4095,14 @@
\newkomafont{addressee}{}
\newkomafont{toname}{}
\newkomafont{toaddress}{}
-\newkomafont{refname}{\@gr at gsffamily\scriptsize}
-\ifnum\scr at compatibility=\@nameuse{scr at v@2.97}\relax
+\newkomafont{refname}{\maybesffamily\scriptsize}
+\expandafter\ifnum\scr at v@is at eq{2.97}%
\newkomafont{refvalue}{\sffamily\scriptsize}
\else
\newkomafont{refvalue}{}
\fi
\newkomafont{placeanddate}{}
-\newkomafont{lettertitle}{\normalcolor\@gr at gsffamily\bfseries}
+\newkomafont{lettertitle}{\normalcolor\maybesffamily\bfseries}
\aliaskomafont{title}{lettertitle}%
\newkomafont{lettersubject}{\normalfont\bfseries}
\aliaskomafont{subject}{lettersubject}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrreport.cls 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrreport.cls 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -60,15 +60,13 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
\let\scr at clsextension\@clsextension
}
-\newcommand*{\KOMAClassName}{%
- scrreprt%
-}
+\newcommand*{\KOMAClassName}{scrreprt}
\newcommand*{\ClassName}{%
report%
}
@@ -77,7 +75,7 @@
\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
\edef\KOMALongClassFileName{\KOMALongClassFileName}
\ProvidesClass{\KOMALongClassName}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 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-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,15 +106,13 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
\let\scr at clsextension\@clsextension
}
-\newcommand*{\KOMAClassName}{%
- scrreprt%
-}
+\newcommand*{\KOMAClassName}{scrreprt}
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\newcommand*{\ClassName}{%
@@ -121,16 +119,16 @@
report%
}
\ProvidesClass{\KOMAClassName}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
@@ -141,9 +139,9 @@
\expandafter{\ext at toc}%
}
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: prepare)
\newif\if at openright
\@openrightfalse
@@ -229,8 +227,8 @@
\newcommand*{\scr at fnt@paragraph}{\size at paragraph}
\newcommand*{\size at subparagraph}{}
\newcommand*{\scr at fnt@subparagraph}{\size at subparagraph}
-\newcommand*{\sectfont}{\normalcolor\@gr at gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries}
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -316,10 +314,11 @@
\@namedef{scr at v@3.36}{20}
\@namedef{scr at v@3.37}{20}
\@namedef{scr at v@3.38}{20}
+\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@last}{20}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\newif\if at scr@emulatestandardclasses
\let\scr at emulatestandardclassestrue\relax
@@ -355,7 +354,7 @@
Because of this, version was set to `first'%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{version}{first}%
}{%
@@ -364,7 +363,7 @@
}%
\edef\scr at compatibility{\@nameuse{scr at v@#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{version}{#1}%
\ifnum\scr at compatibility<\scr at v@last
@@ -385,7 +384,7 @@
\fi
}%
}
-\KOMA at kav@add{.\KOMAClassFileName}{version}{last}
+\KOMA at kav@add{\KOMAClassFileName}{version}{last}
\AtEndOfClass{%
\KOMA at key{version}[]{%
\ClassError{\KOMAClassName}{%
@@ -410,24 +409,27 @@
\newcommand*{\scr at v@is at ge}[1]{%
\numexpr\scr at compatibility+\@ne\relax>\@nameuse{scr at v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+\newcommand*{\scr at v@is at eq}[1]{%
+ \scr at compatibility=\@nameuse{scr at v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
@@ -434,7 +436,7 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{draft}{false}
+\KOMA at kav@add{\KOMAClassFileName}{draft}{false}
\KOMA at DeclareStandardOption
{final}{draft=false}
\KOMA at key{overfullrule}[true]{%
@@ -441,18 +443,18 @@
\KOMA at set@ifkey{overfullrule}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if at tempswa
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{draft}{@tempswa}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
@@ -459,16 +461,12 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{overfullrule}{false}
+\KOMA at kav@add{\KOMAClassFileName}{overfullrule}{false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-\KOMA at ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
-\newcommand*{\@gr at gsffamily}{%
- \if at egregdoesnotlikesansseriftitles\else\sffamily\fi
-}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
\providecommand*\@ptsize{%
11%
@@ -557,7 +555,7 @@
\@tempa
}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{fontsize}{#1}%
}
@@ -579,7 +577,52 @@
\BeforePackage{tex4ht}{%
\let\scr at defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+\KOMA at ifkey{sfdefaults}{@sfdefaults}
+\newcommand*{\maybesffamily}{\if at sfdefaults \sffamily \fi}
+\newcommand*{\textmaybesf}{%
+ \if at sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi
+}
+%% \begin{option}{egegdoesnotlikesansseriftitles}
+\KOMA at key{egregdoesnotlikesansseriftitles}[true]{%
+ \ClassWarningNoLine{\KOMAClassName}%
+ {%
+ You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak
+ In 2016 this option has been implemented as a joke\MessageBreak
+ answer to egreg's comment:\MessageBreak
+ \space\space ``In my opinion there should be a document class\MessageBreak
+ \space\space option for it, instead of the
+ \string\setkomafont\MessageBreak
+ \space\space statement. And yes, I find imposing sans serif
+ for\MessageBreak
+ \space\space titles is not the best choice (one of the
+ reasons\MessageBreak
+ \space\space why I don't use Koma-script classes).''\MessageBreak
+ to question https://tex.stackexchange.com/q/289853\MessageBreak
+ at TeX.SX.\MessageBreak
+ The option has never been documented in the official\MessageBreak
+ user manuals and therefore should never have been\MessageBreak
+ used in real live documents. It was intended to be\MessageBreak
+ removed after some month.\MessageBreak
+ However, it has been used and also almost forgotten\MessageBreak
+ by the author.\MessageBreak
+ For this the author apologizes both to users but\MessageBreak
+ especially to egreg.\MessageBreak
+ Rightly, egreg has criticized the permanent retention\MessageBreak
+ of the option as unfunny to inappropriate and has\MessageBreak
+ asked that it be removed or replaced.\MessageBreak
+ It will be removed soon!\MessageBreak
+ You should use `sfdefaults=false` instead%
+ }%
+ \KOMA at set@ifkey{egregdoesnotlikesansseriftitles}%
+ {@sfdefaults}%
+ {#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if at sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}%
+ {sfdefaults}{\if at sfdefaults true\else false\fi}%
+ \fi
+}
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: options)
\KOMA at key{twoside}[true]{%
\if at atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -599,9 +642,9 @@
\if at twocolumn\sloppy\flushbottom\else\raggedbottom\fi
\fi
\fi
- \KOMA at kav@xreplacevalue{.%
- \KOMAClassFileName
- }{twoside}{#1}%
+ \KOMA at kav@xreplacevalue
+ {\KOMAClassFileName}%
+ {twoside}{#1}%
\fi
}
\KOMAExecuteOptions{twoside=false}
@@ -611,21 +654,23 @@
\if at atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
\KOMA at set@ifkey{twocolumn}{@twocolumn}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.%
- \KOMAClassFileName
- }{twocolumn}{@twocolumn}%
+ \KOMA at kav@replacebool
+ {\KOMAClassFileName}%
+ {twocolumn}{@twocolumn}%
\if at atdocument\expandafter\@firstofone
\else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
{\expandafter\AtEndOfClass}\fi
- {\expandafter\ifnum\scr at v@is at ge{3.17}%
- \if at twocolumn\twocolumn\sloppy\flushbottom
- \else
- \onecolumn
- \if at twoside\flushbottom\else
- \raggedbottom
+ {%
+ \expandafter\ifnum\scr at v@is at ge{3.17}%
+ \if at twocolumn\twocolumn\sloppy\flushbottom
+ \else
+ \onecolumn
+ \if at twoside\flushbottom\else
+ \raggedbottom
+ \fi
\fi
\fi
- \fi}%
+ }%
\fi
}
\AtEndOfClass{%
@@ -706,7 +751,7 @@
}
\DeclareOption*{%
\x at paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f at parindent{\the\parindent}%
@@ -719,16 +764,16 @@
\if at atdocument\let\par at update\default at par@update\fi
\par at updaterelative
}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{false}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{never}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full-}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full+}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{full*}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half-}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half+}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{half*}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{false}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{never}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full-}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full+}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{full*}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half-}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half+}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{half*}%
}
\newcommand*{\f at parindent}{\the\parindent}
\newcommand*{\f at parskip}{\the\parskip}
@@ -767,66 +812,66 @@
\ifcase\number\@tempa% 0
\endgroup
\setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{never}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{never}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
\setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{false}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{false}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 2
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full-}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full-}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half-}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half-}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 4
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 6
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full+}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full+}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half+}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half+}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 8
\endgroup
\setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{full*}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{full*}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{half*}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{half*}%
\if at atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 10
\endgroup
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{relative}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{relative}%
\ifx\par at updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -840,9 +885,9 @@
}%
\or%11
\endgroup
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
- \KOMA at kav@remove{.\KOMAClassFileName}{parskip}{relative}%
- \KOMA at kav@add{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA at kav@remove{\KOMAClassFileName}{parskip}{relative}%
+ \KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}%
\ifx\par at updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -870,9 +915,9 @@
\KOMA at DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA at DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA at DeclareDeprecatedOption{parindent}{parskip=false}
-\KOMA at kav@add{.\KOMAClassFileName}{parskip}{false}
-\KOMA at kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $
+\KOMA at kav@add{\KOMAClassFileName}{parskip}{false}
+\KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}
+%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $
%%% (run: option)
\newif\if at titlepage
\@titlepagetrue
@@ -882,7 +927,7 @@
\@titlepagetrue
\@titlepageiscoverpagetrue
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{titlepage}{firstiscover}%
}{%
@@ -889,10 +934,10 @@
\def\FamilyElseValue{, `firstiscover'}%
\KOMA at set@ifkey{titlepage}{@titlepage}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@remove{.%
+ \KOMA at kav@remove{%
\KOMAClassFileName
}{titlepage}{firstiscover}%
- \KOMA at kav@replacebool{.%
+ \KOMA at kav@replacebool{%
\KOMAClassFileName
}{titlepage}{@titlepage}%
\@titlepageiscoverpagefalse
@@ -899,7 +944,7 @@
\fi
}%
}
-\KOMA at kav@xadd{.%
+\KOMA at kav@xadd{%
\KOMAClassFileName
}{titlepage}{\if at titlepage true\else false\fi}
\KOMA at DeclareStandardOption%
@@ -907,9 +952,9 @@
\KOMA at ifkey{abstract}{@abstrt}
\KOMA at DeclareDeprecatedOption{abstracton}{abstract=true}
\KOMA at DeclareDeprecatedOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: option)
\KOMA at key{open}{%
\KOMA at set@ncmdkey{open}{@tempa}{%
@@ -918,20 +963,20 @@
{left}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{open}{#1}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{openany}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{openright}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{openleft}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{open}{#1}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{openany}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{openright}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{openleft}%
\ifcase \@tempa\relax
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{openany}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{openany}%
\@openrightfalse
\renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
\or
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{openright}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{openright}%
\@openrighttrue
\renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
\or
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{openleft}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{openleft}%
\@openrighttrue
\renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
\fi
@@ -948,7 +993,7 @@
{noenddot}{2},{nodotatend}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{numbers}{#1}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{numbers}{#1}%
\ifcase \@tempa\relax
\if at atdocument\scr at dotchangeatdocument{#1}\else
\let\scr at altsecnumhook\@empty
@@ -968,7 +1013,7 @@
\KOMA at DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
\KOMA at ifkey{bookmarkpackage}{@scr at autoloadbookmarkpackage}
\@scr at autoloadbookmarkpackagetrue
-\KOMA at kav@add{.\KOMAClassFileName}{bookmarkpackage}{true}
+\KOMA at kav@add{\KOMAClassFileName}{bookmarkpackage}{true}
\AfterAtEndOfPackage{hyperref}{%
\AtBeginDocument{%
\@ifpackageloaded{bookmark}{}{%
@@ -1059,26 +1104,26 @@
\KOMA at key{chapterprefix}[true]{%
\KOMA at set@ifkey{chapterprefix}{@chapterprefix}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.\KOMAClassFileName}%
+ \KOMA at kav@replacebool{\KOMAClassFileName}%
{chapterprefix}{@chapterprefix}%
- \KOMA at kav@remove{.\KOMAClassFileName}%
+ \KOMA at kav@remove{\KOMAClassFileName}%
{headings}{twolinechapter}%
- \KOMA at kav@remove{.\KOMAClassFileName}%
+ \KOMA at kav@remove{\KOMAClassFileName}%
{headings}{onelinechapter}%
- \KOMA at kav@xadd{.\KOMAClassFileName}%
+ \KOMA at kav@xadd{\KOMAClassFileName}%
{headings}{%
\if at chapterprefix twolinechapter\else onelinechapter\fi
}%
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{headings}{onelinechapter}%
+\KOMA at kav@add{\KOMAClassFileName}{headings}{onelinechapter}%
\KOMA at DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
\IfLTXAtLeastTF{2020/10/01}{%
\KOMA at key{appendixprefix}[true]{%
\Ifstr{#1}{default}{%
- \KOMA at kav@removekey{.\KOMAClassFileName}{appendixprefix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{appendixprefix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{onelineappendix}%
\IfHookEmptyTF{\KOMAClassName/appendix}{}{%
\RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]%
}%
@@ -1086,18 +1131,18 @@
}{%
\KOMA at set@ifkey{appendixprefix}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{appendixprefix}{#1}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{onelineappendix}%
\IfHookEmptyTF{\KOMAClassName/appendix}{}{%
\RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]%
}%
\if at tempswa
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{twolineappendix}%
\AddToHook{\KOMAClassName/appendix}[appendixprefix]%
{\@chapterprefixtrue}%
\else
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{onelineappendix}%
\AddToHook{\KOMAClassName/appendix}[appendixprefix]%
{\@chapterprefixfalse}%
\fi
@@ -1108,11 +1153,11 @@
\KOMA at key{appendixprefix}[true]{%
\KOMA at set@ifkey{appendixprefix}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}{appendixprefix}{#1}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{onelineappendix}%
\if at tempswa
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{twolineappendix}%
\@ifundefined{appendixmore}{%
\def\appendixmore{\@chapterprefixtrue}%
}{%
@@ -1119,7 +1164,7 @@
\l at addto@macro\appendixmore{\@chapterprefixtrue}%
}%
\else
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{onelineappendix}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{onelineappendix}%
\@ifundefined{appendixmore}{%
\def\appendixmore{\@chapterprefixfalse}%
}{%
@@ -1154,11 +1199,11 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax% big
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{big}%
\renewcommand*{\scr at chapter@beforeskip}{-3.3\baselineskip-\parskip}%
\renewcommand*{\scr at chapter@afterskip}{%
1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip
@@ -1166,8 +1211,9 @@
\renewcommand*{\scr at chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa
- \else\vskip\@tempskipa\fi
+ \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa\else
+ \vskip\@tempskipa
+ \fi
}%
\renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\setkomafont{part}{\Huge}%
@@ -1180,11 +1226,11 @@
\setkomafont{paragraph}{\normalsize}%
\setkomafont{subparagraph}{\normalsize}%
\or % normal
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{normal}%
\renewcommand*{\scr at chapter@beforeskip}{-3\baselineskip-\parskip}%
\renewcommand*{\scr at chapter@afterskip}{%
1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip
@@ -1192,8 +1238,9 @@
\renewcommand*{\scr at chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa
- \else\vskip\@tempskipa\fi
+ \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa\else
+ \vskip\@tempskipa
+ \fi
}%
\renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\setkomafont{part}{\huge}%
@@ -1206,11 +1253,11 @@
\setkomafont{paragraph}{\normalsize}%
\setkomafont{subparagraph}{\normalsize}%
\or % small
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{small}%
\renewcommand*{\scr at chapter@beforeskip}{-2.8\baselineskip-\parskip}%
\renewcommand*{\scr at chapter@afterskip}{%
1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip
@@ -1218,8 +1265,9 @@
\renewcommand*{\scr at chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa
- \else\vskip\@tempskipa\fi
+ \expandafter\ifnum\scr at v@is at lt{3.15}\vspace\@tempskipa\else
+ \vskip\@tempskipa
+ \fi
}%
\renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\setkomafont{part}{\LARGE}%
@@ -1246,29 +1294,29 @@
\or % onelineappendix
\KOMAoptions{appendixprefix=false}%
\or % optiontotocandhead
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontotocandhead}%
\scr at activate@xsection{3}%
\or % optiontotoc
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontotoc}%
\scr at activate@xsection{2}%
\or % optiontohead
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{optiontohead}%
\scr at activate@xsection{1}%
\or % standardclasses
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{big}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{normal}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{small}%
- \KOMA at kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
- \KOMA at kav@add{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{big}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{normal}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{small}%
+ \KOMA at kav@remove{\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA at kav@add{\KOMAClassFileName}{headings}{standardclasses}%
\renewcommand*{\scr at chapter@beforeskip}{-50\p@}%
\renewcommand*{\scr at chapter@afterskip}{40\p@}%
\renewcommand*{\scr at chapter@innerskip}{20\p@}%
@@ -1289,18 +1337,18 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{headings}{big}
-\KOMA at kav@add{.\KOMAClassFileName}{headings}{onelinechapter}
+\KOMA at kav@add{\KOMAClassFileName}{headings}{big}
+\KOMA at kav@add{\KOMAClassFileName}{headings}{onelinechapter}
\KOMA at DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA at DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA at DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: option)
\KOMA at ifkey{headsepline}{@hsl}%
-\KOMA at kav@add{.\KOMAClassFileName}{headsepline}{false}
+\KOMA at kav@add{\KOMAClassFileName}{headsepline}{false}
\KOMA at DeclareDeprecatedOption{headnosepline}{headsepline=false}
\KOMA at ifkey{footsepline}{@fsl}%
-\KOMA at kav@add{.\KOMAClassFileName}{footsepline}{false}
+\KOMA at kav@add{\KOMAClassFileName}{footsepline}{false}
\KOMA at DeclareDeprecatedOption{footnosepline}{footsepline=false}
\KOMA at key{cleardoublepage}{%
\begingroup
@@ -1315,7 +1363,7 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{cleardoublepage}{current}%
}%
@@ -1326,7 +1374,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
\KOMAClassFileName
}{cleardoublepage}{#1}%
}%
@@ -1339,7 +1387,7 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.\KOMAClassFileName}%
+ \KOMA at kav@xreplacevalue{\KOMAClassFileName}%
{cleardoublepage}{#1}%
}%
}{}%
@@ -1367,16 +1415,18 @@
\newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}}
\newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}
\renewcommand*{\cleardoublepage}{%
- \expandafter\ifnum \@nameuse{scr at v@2.98c}<\scr at compatibility\relax
+ \expandafter\ifnum \scr at v@is at gt{2.98c}%
\cleardoubleemptypage
\else
\cleardoublestandardpage
\fi
}
-\KOMA at kav@add{.%
+\KOMA at kav@add{%
\KOMAClassFileName
}{cleardoublepage}{%
- \expandafter\ifnum \scr at v@is at gt{2.98c}empty\else current\fi
+ \expandafter\ifnum \scr at v@is at gt{2.98c}
+ empty%
+ \else current\fi
}
\AtEndOfClass{%
\KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
@@ -1383,10 +1433,10 @@
{%
\KOMAClassFileName
}{cleardoublepage}%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{cleardoublepage}%
- \KOMA at kav@xadd{.%
+ \KOMA at kav@xadd{%
\KOMAClassFileName
}{cleardoublepage}{\@tempa}%
}
@@ -1399,7 +1449,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 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
%%% (run: option)
\newif\if at captionabove\@captionabovefalse
\newif\if at tablecaptionabove\@tablecaptionabovefalse
@@ -1433,101 +1483,101 @@
\@tablecaptionabovetrue
\@figurecaptionabovetrue
\@captionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{heading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{signature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{heading}%
\or % signature
\@tablecaptionabovefalse
\@figurecaptionabovefalse
\@captionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{heading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{signature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{heading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{signature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{signature}%
\or % tableheading
\@tablecaptionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{tableheading}%
\or % tablesignature
\@tablecaptionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{tablesignature}%
\or % figureheading
\@figurecaptionabovetrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{figureheading}%
\or % figuresignature
\@figurecaptionabovefalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{figuresignature}%
\or % oneline
\onelinecaptionstrue
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{oneline}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{oneline}%
\or % nooneline
\onelinecaptionsfalse
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{oneline}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{oneline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{nooneline}%
\or % rightbeside
\renewcommand*{\scap at pos}{r}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{rightbeside}%
\or % leftbeside
\renewcommand*{\scap at pos}{l}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{leftbeside}%
\or % innerbeside
\renewcommand*{\scap at pos}{i}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{innerbeside}%
\or % outerbeside
\renewcommand*{\scap at pos}{o}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{outerbeside}%
\or % topbeside
\renewcommand*{\scap at valign}{t}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{topbeside}%
\or % centeredbeside
\renewcommand*{\scap at valign}{c}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{centeredbeside}%
\or % bottombeside
\renewcommand*{\scap at valign}{b}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
- \KOMA at kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
- \KOMA at kav@add{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA at kav@remove{\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA at kav@add{\KOMAClassFileName}{captions}{bottombeside}%
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{signature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{tablesignature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{figuresignature}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{oneline}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{rightbeside}
-\KOMA at kav@add{.\KOMAClassFileName}{captions}{bottombeside}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{signature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{tablesignature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{figuresignature}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{oneline}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{rightbeside}
+\KOMA at kav@add{\KOMAClassFileName}{captions}{bottombeside}
\KOMA at DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading}
\KOMA at DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature}
\newif\if at komalongtable\@komalongtabletrue
@@ -1534,7 +1584,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA at DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA at DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\KOMA at key{footnotes}{%
\ifx\@footnotemark\scr at saved@footnotemark
@@ -1554,7 +1604,7 @@
\def\FN at mf@prepare{\scr at mf@prepare}%
\def\scr at footmisc@options{multiple}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{footnotes}{multiple}%
}{%
@@ -1563,7 +1613,7 @@
\let\FN at mf@prepare\relax
\let\scr at footmisc@options\@empty
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
\KOMAClassFileName
}{footnotes}{nomultiple}%
}{%
@@ -1573,17 +1623,17 @@
}
\AtBeginDocument{%
\ifx\@footnotemark\scr at saved@footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{footnotes}{nomultiple}%
\else\ifx\@footnotemark\scr at footnotemark
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{footnotes}%
- \KOMA at kav@add{.%
+ \KOMA at kav@add{%
\KOMAClassFileName
}{footnotes}{multiple}%
\fi\fi
@@ -1605,7 +1655,7 @@
\csname FN at mf@prepare\endcsname
\ifhmode\spacefactor\@x at sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
%%% (run: option)
\newif\if at tocleft
\KOMA at key{toc}{%
@@ -1648,24 +1698,24 @@
\or % bibliographynumbered
\KOMAoptions{bibliography=totocnumbered}%
\or % flat
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{flat}%
\@toclefttrue
\or % graduated
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{graduated}%
\@tocleftfalse
\or % indenttextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{indenttextentries}%
\expandafter\setuptoc\expandafter{\ext at toc}{numberline}%
\or % leftaligntextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{leftaligntextentries}%
\expandafter\unsettoc\expandafter{\ext at toc}{numberline}%
\or % chapterentrywithdots/sectionentrywithdots
\KOMAoptions{chapterentrydots=true}%
@@ -1700,14 +1750,14 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax % notoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{notoc}%
\renewcommand*{\float@@listhead}{%
\chapter*
}%
@@ -1720,14 +1770,14 @@
\unsettoc{\@currext}{totoc}%
}%
\or% totoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{totoc}%
\renewcommand*{\float@@listhead}{%
\addchap
}%
@@ -1740,14 +1790,14 @@
\setuptoc{\@currext}{totoc}%
}%
\or% numbered
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listof}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{listofnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listof}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{numbered}%
\renewcommand*{\float@@listhead}{%
\chapter
}%
@@ -1760,18 +1810,18 @@
\setuptoc{\@currext}{totoc}%
}%
\or% flat
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{flat}%
\@dynlisttrue
\or% graduated
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{flat}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{graduated}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{flat}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{graduated}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{graduated}%
\@dynlistfalse
\or% leveldown
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{leveldown}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
@@ -1779,8 +1829,8 @@
\setuptoc{\@currext}{leveldown}%
}%
\or% standardlevel
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leveldown}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{standardlevel}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{leveldown}%
}%
@@ -1788,7 +1838,7 @@
\unsettoc{\@currext}{leveldown}%
}%
\or% entryprefix
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{entryprefix}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{entryprefix}%
\@dynlisttrue
\doforeachtocfile[float]{%
\BeforeStartingTOC[\@currext]{%
@@ -1809,9 +1859,9 @@
}%
}%
\or% indenttextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{indenttextentries}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{numberline}%
}%
@@ -1819,9 +1869,9 @@
\setuptoc{\@currext}{numberline}%
}
\or% leftaligntextentries
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{numberline}%
}%
@@ -1839,10 +1889,10 @@
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{toc}{nolistof}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{notoc}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{graduated}
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}
+\KOMA at kav@add{\KOMAClassFileName}{toc}{nolistof}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{notoc}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{graduated}
+\KOMA at kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}
\KOMA at DeclareDeprecatedOption{liststotoc}{listof=totoc}
\KOMA at DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA at DeclareDeprecatedOption{listsleft}{listof=flat}
@@ -1851,29 +1901,29 @@
\newif\if at chaptertolists\@chaptertolistsfalse
\KOMA at key{chapteratlists}[entry]{%
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chapterentry}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chaptergap}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chaptergapsmall}%
- \KOMA at kav@remove{.\KOMAClassFileName}{listof}{chaptergapline}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chapterentry}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chaptergap}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chaptergapsmall}%
+ \KOMA at kav@remove{\KOMAClassFileName}{listof}{chaptergapline}%
\Ifstr{#1}{entry}{%
\@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}%
- \KOMA at kav@replacevalue{.\KOMAClassFileName}{chapteratlists}{entry}%
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chapterentry}%
+ \KOMA at kav@replacevalue{\KOMAClassFileName}{chapteratlists}{entry}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chapterentry}%
}{%
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
- \KOMA at kav@replacevalue{.\KOMAClassFileName}{chapteratlists}%
+ \KOMA at kav@replacevalue{\KOMAClassFileName}{chapteratlists}%
{\@chapterlistsgap}%
\def\reserved at a{\z@}%
\ifx\@chapterlistsgap\reserved at a
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergap}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergap}%
\else
\def\reserved at a{10\p@}%
\ifx\@chapterlistsgap\reserved at a
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergapsmall}%
\else
\def\reserved at a{\baselineskip}%
\ifx\@chapterlistsgap\reserved at a
- \KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergapline}%
+ \KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergapline}%
\fi
\fi
\fi
@@ -1880,9 +1930,9 @@
}%
}
\BeforeTOCHead{\@chaptertolistsfalse}
-\KOMA at kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
-\KOMA at kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
-%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $
+\KOMA at kav@add{\KOMAClassFileName}{chapteratlists}{10\p@}%
+\KOMA at kav@add{\KOMAClassFileName}{listof}{chaptergapsmall}%
+%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $
%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr at ifundefinedorrelax{scr at bibstyle@#2}{%
@@ -1905,13 +1955,13 @@
\@ifundefined{scr at current@bibstyle}{}{%
\Ifstr{\scr at current@bibstyle}{}{}{%
\edef\reserved at a{%
- \noexpand\KOMA at kav@remove{.\KOMAClassFileName}{bibliography}%
+ \noexpand\KOMA at kav@remove{\KOMAClassFileName}{bibliography}%
{\scr at current@bibstyle}%
}\reserved at a
}%
}%
\def\scr at current@bibstyle{#2}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{bibliography}{#2}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{bibliography}{#2}%
\csname scr at bibstyle@#1\endcsname
#3%
}%
@@ -1973,14 +2023,14 @@
{standardlevel}{4}%
}{#1}%
\ifcase \@tempa\relax % notoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{notoc}%
\renewcommand*{\bibliography at heading}[1]{%
\ifbib at leveldown
\section*{##1}%
@@ -1991,14 +2041,14 @@
\fi
}%
\or% totoc
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{totoc}%
\renewcommand*{\bibliography at heading}[1]{%
\ifbib at leveldown
\addsec{##1}%
@@ -2012,14 +2062,14 @@
\fi
}%
\or% numbered
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{bibliographynumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{numbered}%
\renewcommand*{\bibliography at heading}[1]{%
\ifbib at leveldown
\section{##1}%
@@ -2033,20 +2083,20 @@
\fi
}
\or% leveldown
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{leveldown}%
\bib at leveldowntrue
\or% standardlevel
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{bibliography}{standardlevel}%
\bib at leveldownfalse
\fi
}{%
\FamilyKeyStateProcessed
\edef\reserved at a{%
- \noexpand\KOMA at kav@remove{.\KOMAClassFileName}{bibliography}%
+ \noexpand\KOMA at kav@remove{\KOMAClassFileName}{bibliography}%
{\scr at current@bibstyle}%
}\reserved at a
\csname scr at bibstyle@#1\endcsname
@@ -2055,7 +2105,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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx at leveldown
@@ -2076,14 +2126,14 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{notoc}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
\expandafter\section
@@ -2092,14 +2142,14 @@
\fi*%
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{toc}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
\expandafter\addsec
@@ -2108,14 +2158,14 @@
\fi
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{noindex}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{toc}{index}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{notoc}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{numbered}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{toc}%
- \KOMA at kav@add{.\KOMAClassFileName}{toc}{indexnumbered}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{toc}{index}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{notoc}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{numbered}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{toc}%
+ \KOMA at kav@add{\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{numbered}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
\expandafter\section
@@ -2124,29 +2174,29 @@
\fi
}%
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{leveldown}%
\idx at leveldowntrue
\or
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{leveldown}%
- \KOMA at kav@remove{.\KOMAClassFileName}{index}{standardlevel}%
- \KOMA at kav@add{.\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
+ \KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA at kav@add{\KOMAClassFileName}{index}{standardlevel}%
\idx at leveldownfalse
\fi
\fi
}
-\KOMA at kav@add{.\KOMAClassFileName}{toc}{noindex}
-\KOMA at kav@add{.\KOMAClassFileName}{index}{notoc}
-\KOMA at kav@add{.\KOMAClassFileName}{index}{standardlevel}
+\KOMA at kav@add{\KOMAClassFileName}{toc}{noindex}
+\KOMA at kav@add{\KOMAClassFileName}{index}{notoc}
+\KOMA at kav@add{\KOMAClassFileName}{index}{standardlevel}
\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openany}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
@@ -2153,7 +2203,7 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\AtBeginDocument{%
\begingroup
@@ -2202,7 +2252,7 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\newcommand*\scr at setlength[4]{%
\expandafter\ifnum\scr at v@is at lt{3.12}\relax
@@ -2240,7 +2290,7 @@
\fi
}
\providecommand*{\simple at changefontsizes}[2][1.2\@tempdima]{%
- \KOMA at kav@removekey{.%
+ \KOMA at kav@removekey{%
\KOMAClassFileName
}{fontsize}%
\@defaultunits\@tempdima#2pt\relax\@nnil
@@ -2389,7 +2439,9 @@
\let\Huge\@undefined
\expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved at a}%
\normalsize
- \expandafter\ifnum\scr at v@is at ge{3.17}\@nameuse{par at updaterelative}\fi
+ \expandafter\ifnum\scr at v@is at ge{3.17}
+ \@nameuse{par at updaterelative}%
+ \fi
\expandafter\ifnum\scr at v@is at lt{3.12}\relax
\setlength{\footnotesep}{.7\@tempdimc}%
\setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
@@ -2589,25 +2641,25 @@
\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}%
}{%
\InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak
file `\@fontsizefilebase\@tempa.clo' to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb pt}%
}{%
\InputIfFileExists{size\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `size\@tempb.clo' used to setup font sizes}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{fontsize}%
- \KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{fontsize}%
+ \KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
\edef\@tempa{%
\noexpand\changefontsizes{\@tempa}%
- \noexpand\KOMA at kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ \noexpand\KOMA at kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}%
}\@tempa
}%
}%
@@ -2701,13 +2753,13 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $
%%% (run: body)
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2754,7 +2806,7 @@
\fi
}%
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
%%% (run: body)
\newcommand*{\par at updaterelative}{%
\begingroup
@@ -2930,7 +2982,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $
%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -2981,8 +3033,7 @@
\next at tpage\if at twoside \ifodd\value{page}\else\null\next at tpage\fi\fi
}
\newcommand*\maketitle[1][1]{%
- \expandafter\ifnum \csname scr at v@3.12\endcsname>\scr at compatibility\relax
- \else
+ \expandafter\ifnum \scr at v@is at ge{3.12}%
\def\and{%
\end{tabular}%
\hskip 1em \@plus.17fil%
@@ -3078,8 +3129,7 @@
\vfill\null
\if at twoside
\@tempswatrue
- \expandafter\ifnum \@nameuse{scr at v@3.12}>\scr at compatibility\relax
- \else
+ \expandafter\ifnum \scr at v@is at ge{3.12}%
\ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
\@tempswafalse
\fi\fi
@@ -3097,7 +3147,8 @@
\fi
\else
\ifx\@uppertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\uppertitleback\space ignored
by \string\maketitle\MessageBreak
in `twoside=false' mode%
@@ -3104,7 +3155,8 @@
}%
\fi
\ifx\@lowertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\lowertitleback\space ignored
by \string\maketitle\MessageBreak
in `twoside=false' mode%
@@ -3126,13 +3178,15 @@
\@tempcnta=%
#1%
\relax\ifnum\@tempcnta=1\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
Optional argument of \string\maketitle\space ignored\MessageBreak
in `titlepage=false' mode%
}%
\fi
\ifx\@uppertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\uppertitleback\space ignored
by \string\maketitle\MessageBreak
in `titlepage=false' mode%
@@ -3139,7 +3193,8 @@
}%
\fi
\ifx\@lowertitleback\@empty\else
- \ClassWarning{\KOMAClassName}{%
+ \ClassWarning{\KOMAClassName}%
+ {%
non empty \string\lowertitleback\space ignored
by \string\maketitle\MessageBreak
in `titlepage=false' mode%
@@ -3201,7 +3256,7 @@
\endgroup
\fi
\setcounter{footnote}{0}%
- \expandafter\ifnum \csname scr at v@3.12\endcsname>\scr at compatibility\relax
+ \expandafter\ifnum \scr at v@is at lt{3.12}%
\let\thanks\relax
\let\maketitle\relax
\let\@maketitle\relax
@@ -3298,9 +3353,6 @@
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \if at compatibility
- \setcounter{page}{0}%
- \fi
}{%
\if at restonecol\twocolumn \else \newpage \fi
}%
@@ -3350,10 +3402,10 @@
\newcommand*\abstractname{Abstract}
\providecaptionname{american,australian,british,canadian,english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: body)
\let\numberline\scr at numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -3367,7 +3419,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -3387,7 +3439,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
@@ -3394,10 +3446,10 @@
\expandafter\providecommand%
\csname scr at tso@#1 at linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $
%%% (run: body)
\BeforeClosingMainAux{%
\if at autodot\if at filesw\immediate\write\@mainaux{%
@@ -3766,7 +3818,7 @@
\z@
\fi
\let\@svsec\@empty
- \expandafter\ifnum\scr at v@is at lt{3.31}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.31}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
@@ -3924,7 +3976,7 @@
This could result in several error messages}%
\def\scr at s@ct@@nn at m@{\string\scr at s@ct@@nn at m@}%
}{%
- \expandafter\ifnum\scr at v@is at lt{3.31}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.31}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@\scr at s@ct@@nn at m@\endcsname
@@ -5259,7 +5311,7 @@
{\@currenttocentry}%
\fi
}{%
- \expandafter\ifnum\scr at v@is at lt{3.18}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.18}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
@@ -5467,7 +5519,7 @@
{\@currenttocentry}%
\fi
\else
- \expandafter\ifnum\scr at v@is at lt{3.15}\relax\else
+ \expandafter\ifnum\scr at v@is at ge{3.15}\relax
\begingroup
\let\@elt\@stpelt
\csname cl@#1\endcsname
@@ -5590,7 +5642,9 @@
\csname scr@#1 at afterindent\endcsname
{\@afterindenttrue}{\@afterindentfalse}{%
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else
- \expandafter\ifnum\scr at v@is at ge{3.22}\@afterindenttrue\fi
+ \expandafter\ifnum\scr at v@is at ge{3.22}
+ \@afterindenttrue
+ \fi
\fi
}%
\chapterheadstartvskip
@@ -5651,7 +5705,9 @@
\csname scr@#1 at afterindent\endcsname
{\@afterindenttrue}{\@afterindentfalse}{%
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else
- \expandafter\ifnum\scr at v@is at ge{3.22}\@afterindenttrue\fi
+ \expandafter\ifnum\scr at v@is at ge{3.22}
+ \@afterindenttrue
+ \fi
\fi
}%
\chapterheadstartvskip
@@ -5838,7 +5894,8 @@
\fi
{\parindent \z@
\expandafter\ifnum\scr at v@is at gt{2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+ \fi
\raggedsection\normalfont\sectfont\nobreak
\usekomafont{minisec}{\nobreak\interlinepenalty \@M #1\par\nobreak}%
}\nobreak
@@ -5968,7 +6025,7 @@
\fi
\newcommand*{\scr at fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\@addtoreset{equation}{chapter}
\renewcommand*{\theequation}{%
@@ -5996,7 +6053,7 @@
\newcommand*{\dictumauthorformat}[1]{(#1)}
\newcommand*{\raggeddictumtext}{\raggedright}
\newcommand*{\raggeddictumauthor}{\raggedleft}
-\newkomafont{dictum}{\normalfont\normalcolor\@gr at gsffamily\small}
+\newkomafont{dictum}{\normalfont\normalcolor\maybesffamily\small}
\newkomafont{dictumauthor}{\itshape}
\aliaskomafont{dictumtext}{dictum}
\setlength{\skip\@mpfootins}{\skip\footins}
@@ -6064,7 +6121,7 @@
\fi
}
\newcommand\marginline[1]{%
- \marginpar[\raggedleft{#1}]{\raggedright #1}%
+ \marginpar[{\raggedleft #1}]{\raggedright #1}%
}
\scr at ifundefinedorrelax{textsubscript}{%
\DeclareRobustCommand*\textsubscript[1]{%
@@ -6283,7 +6340,7 @@
\let\scr at mt@saved at sect\relax
\fi
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $
%%% (run: body)
\newcommand*{\set at tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -6382,7 +6439,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
+%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\providecommand*{\@mkleft}{%
\IfActiveMkBoth{\markleft}{\@gobble}%
@@ -6393,7 +6450,7 @@
\providecommand{\@mkdouble}[1]{%
\@mkboth{#1}{#1}%
}
-%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $
%%% (run: body)
\newlength{\abovecaptionskip}
\newlength{\belowcaptionskip}
@@ -7158,7 +7215,7 @@
\expandafter\ifnum\scr at v@is at le{2.97d}%
\renewcommand*\thetable{\thechapter.\@arabic\c at table}
\fi
-%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn at rule@test at values
@@ -7320,7 +7377,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $
%%% (run: body)
\g at addto@macro{\numberline at numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -7470,7 +7527,7 @@
UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables}
\renewcommand*\listoflotname{\listtablename}
\renewcommand*\listoflotentryname{\tablename}
-%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $
%%% (run: body)
\newcommand*\bibname{Bibliography}
\providecaptionname{american,australian,british,canadian,english,newzealand,%
@@ -7558,7 +7615,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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $
%%% (run: body)
\newcommand*{\index at preamble}{}
\let\index at preamble=\relax
@@ -7601,7 +7658,7 @@
\newcommand*\indexname{Index}
\providecaptionname{american,australian,british,canadian,english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\if at twocolumn
\setlength{\leftmargini}{2em}
@@ -7752,7 +7809,7 @@
\fi
\item\is at thispageodd@setlabel\nobreak\ignorespaces
}
-\newcommand*\descfont{\@gr at gsffamily\bfseries}
+\newcommand*\descfont{\maybesffamily\bfseries}
\newcommand*{\scr at fnt@descriptionlabel}{\descfont}
\newcommand*{\labelitemfont}{\normalfont}
\newcommand*\scr at fnt@itemizelabel{\labelitemfont}
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: 10pt)
\ProvidesFile{%
scrsize10pt.clo%
@@ -160,9 +160,11 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
\@ifundefined{@list at extra}{}{%
- \expandafter\ifnum\scr at v@is at ge{3.17}\par at updaterelative\fi
+ \scr at ifundefinedorrelax{scr at v@is at ge}{\par at updaterelative}{%
+ \expandafter\ifnum\scr at v@is at ge{3.17}\par at updaterelative\fi
+ }%
\l at addto@macro{\@listi}{\@list at extra}%
\let\@listI=\@listi
\l at addto@macro{\@listii}{\@list at extra}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: 11pt)
%%% (run: 12pt)
\ProvidesFile{%
@@ -161,9 +161,11 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
\@ifundefined{@list at extra}{}{%
- \expandafter\ifnum\scr at v@is at ge{3.17}\par at updaterelative\fi
+ \scr at ifundefinedorrelax{scr at v@is at ge}{\par at updaterelative}{%
+ \expandafter\ifnum\scr at v@is at ge{3.17}\par at updaterelative\fi
+ }%
\l at addto@macro{\@listi}{\@list at extra}%
\let\@listI=\@listi
\l at addto@macro{\@listii}{\@list at extra}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $
\ProvidesFile{%
scrsize12pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -162,9 +162,11 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $
\@ifundefined{@list at extra}{}{%
- \expandafter\ifnum\scr at v@is at ge{3.17}\par at updaterelative\fi
+ \scr at ifundefinedorrelax{scr at v@is at ge}{\par at updaterelative}{%
+ \expandafter\ifnum\scr at v@is at ge{3.17}\par at updaterelative\fi
+ }%
\l at addto@macro{\@listi}{\@list at extra}%
\let\@listI=\@listi
\l at addto@macro{\@listii}{\@list at extra}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrtime.sty 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrtime.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,28 +65,30 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package
(time of LaTeX run)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $
\newif\if at Hxii
\KOMA at ifkey{12h}{@Hxii}
-\KOMA at DeclareDeprecatedOption[scrtime]{24h}{12h=false}
+\@ifundefined{KOMA at DeclareDeprecatedOption}{}{%
+ \KOMA at DeclareDeprecatedOption[scrtime]{24h}{12h=false}%
+}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $
\def\thistime{%
\kernel at ifstar
{\let\@tempif\iffalse\@thistime}
Deleted: trunk/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -1,268 +0,0 @@
-%%
-%% This is file `scrwfile.sty',
-%% generated with the docstrip utility, extended by scrdocstrip.
-%%
-%% The original source files were:
-%%
-%% scrwfile.dtx (with options: `package,scrwfile,identify,option,body')
-%% scrlogo.dtx (with options: `logo')
-%%
-%% Copyright (c) 2010-2022 Markus Kohm [komascript at gmx info]
-%%
-%% This file was generated from file(s) of the KOMA-Script bundle.
-%% ---------------------------------------------------------------
-%%
-%% It may be distributed under the conditions of the
-%% LaTeX Project Public License in the version distributed together
-%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
-%%
-%% This file may only be distributed together with a copy of the
-%% KOMA-Script bundle. You may however distribute the
-%% KOMA-Script bundle without all such generated files. See also
-%% `lppl.txt' or `lppl-de.txt' for additional information.
-%%
-%% The list of files belonging to KOMA-Script distribution is given in
-%% the file `MANIFEST.md'. See also `lppl.txt' or `lppl-de.txt' for
-%% additional information.
-%%
-%% If this file is a beta version, you may not be allowed to distribute
-%% it. Look at the comments below to see if this is the case.
-%%
-%% English and German manuals are part of KOMA-Script bundle.
-%% ----------------------------------------------------------
-%%
-%% See `README'.
-%%
-%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You can
-%% find a complete unmodified copy of LaTeX2e at
-%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
-%%
-%%% From File: $Id: scrwfile.dtx 3955 2022-10-06 08:13:32Z kohm $
-\NeedsTeXFormat{LaTeX2e}[1995/06/01]
-\ProvidesPackage{scrwfile}
- [2022/10/06 v0.1.11 KOMA-Script package (write and clone files)]
-\PackageWarningNoLine{scrwfile}{%
- THIS IS AN EXPERIMENTAL PACKAGE!\MessageBreak
- USAGE OF THIS PACKAGE IS ON YOUR OWN RISK!\MessageBreak
- EVERYTHING MAY HAPPEN!\MessageBreak
- EVERYTHING MAY CHANGE IN FUTURE!\MessageBreak
- THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!\MessageBreak
- Maybe, it would be better not to load this package%
-}
-\RequirePackage{scrbase}[2010/09/17]
-\RequirePackage{scrlfile}[2010/09/30]
-\RequirePackage{iftex}
-\ifluatex
- \PackageWarningNoLine{scrwfile}{LuaLaTeX detected.\MessageBreak
- With LuaLaTeX you should never get an error message:\MessageBreak
- \space\space`No room for a new \string\write'.\MessageBreak
- So scrwfile could make much more harm than benefit\MessageBreak
- and using it is not recommended}%
-\fi
-\newcommand*{\scrwfile at if@only}[1]{%
- \begingroup
- \scr at ifundefinedorrelax{scrwfile at only}{\@tempswatrue}{%
- \@tempswafalse
- \edef\reserved at b{#1}%
- \@for\reserved at a:=\scrwfile at only\do
- {\ifx\reserved at a\reserved at b\@tempswatrue\fi}%
- }%
- \if at tempswa
- \scr at ifundefinedorrelax{scrwfile at never}{}{%
- \edef\reserved at b{#1}%
- \@for\reserved at a:=\scrwfile at never\do
- {\ifx\reserved at a\reserved at b\@tempswafalse\fi}%
- }%
- \fi
- \expandafter\endgroup
- \if at tempswa
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
-}
-\newcommand*{\scrwfile at starttoc}[1]{%
- \scrwfile at if@only{#1}{\scrwfile@@starttoc}{\scrwfile at saved@starttoc}{#1}%
-}
-\newcommand*{\scrwfile@@starttoc}[1]{%
- \begingroup
- \if at filesw
- \xdef\scrwfile at writefilelist{\scrwfile at writefilelist,#1}%
- \fi
- \@fileswfalse
- \scrwfile at saved@starttoc{#1}%
- \endgroup
-}
-\newcommand*{\scrwfile at writefile}[1]{%
- \scrwfile at if@only{#1}{\scrwfile@@writefile}{\scrwfile at saved@writefile}{#1}%
-}
-\newcommand{\scrwfile@@writefile}[2]{%
- \ifnum\scrwfile at wrtout>0
- \begingroup
- \@temptokena{#2}%
- \immediate\write\scrwfile at wrtout{%
- \string\@writefile{#1}{\the\@temptokena}%
- }%
- \scrwfile at process@clones{#1}%
- \endgroup
- \fi
-}
-\chardef\scrwfile at wrtout\z@
-\newcommand*{\scrwfile at writefilelist}{}
-\newcommand*{\scrwfile at saved@writefile}{}
-\BeforeClosingMainAux{%
- \ifx\scrwfile at writefilelist\@empty\else
- \let\scrwfile at saved@writefile\@writefile
- \let\scrwfile at wrtout\@partaux
- \immediate\openout\scrwfile at wrtout \jobname.wrt
- \let\@writefile\scrwfile at writefile
- \fi
-}
-\AfterReadingMainAux{%
- \ifx\scrwfile at writefilelist\@empty\else
- \immediate\closeout\scrwfile at wrtout
- \chardef\scrwfile at wrtout\z@
- \begingroup
- \let\@writefile\scrwfile at saved@writefile
- \@for\@currext:=\scrwfile at writefilelist\do{%
- \begingroup
- \ifx\@currext\@empty\else
- \scr at ifundefinedorrelax{tf@\@currext}{%
- \immediate\openout\@partaux \jobname.\@currext
- \expandafter\let\csname tf@\@currext\endcsname\@partaux
- \@input@{\jobname.wrt}%
- \immediate\closeout\@partaux
- }{}%
- \fi
- \endgroup
- }%
- \endgroup
- \fi
-}
-\IfLTXAtLeastTF{2020/10/01}{%
- \DeclareHookRule{enddocument/afteraux}%
- {scrwfile}{before}{scrlayer-notecolumn}%
-}{%
- \@ifpackageloaded{scrlayer-notecolumn}{%
- \PackageWarningNoLine{scrwfile}{%
- Dangerous package order detected!\MessageBreak
- As a general rule, you should load scrwfile as soon\MessageBreak
- as possible, maybe even before `\string\documentclass'\MessageBreak
- (using `\string\RequirePackage' instead of
- `\string\usepackage').\MessageBreak
- Following packages should be loaded after scrwfile:\MessageBreak
- \space - scrlayer-notecolumn}%
- }{}%
-}
-\newcommand*{\scrwfile at saved@starttoc}{}
-\AtBeginDocument{%
- \begingroup
- \@ifpackageloaded{hyperref}{%
- \scr at ifundefinedorrelax{Hy at AtBeginDocument}{%
- \PackageInfo{scrwfile}{%
- Using immediate redefinition of `\string\@starttoc'%
- }%
- \aftergroup\@firstofone
- }{%
- \ifx\Hy at AtBeginDocumentHook\@undefined
- \PackageInfo{scrwfile}{%
- Using immediate redefinition of `\string\@starttoc'%
- }%
- \aftergroup\@firstofone
- \else
- \@ifpackagelater{hyperref}{2022/02/22}{% newer than v7.00n
- \PackageInfo{scrwfile}{%
- Using immediate redefinition of `\string\@starttoc'%
- }%
- \aftergroup\@firstofone
- }{%
- \PackageWarning{scrwfile}{%
- Outdated package `hyperref' detected.\MessageBreak
- Using `\string\Hy at AtBeginDocument' for redefinition of
- `\string\@starttoc'.\MessageBreak
- We recommend to update `hyperref'
- }%
- \aftergroup\Hy at AtBeginDocument
- }%
- \fi
- }%
- }{%
- \PackageInfo{scrwfile}{%
- Using immediate redefinition of `\string\@starttoc'%
- }%
- \aftergroup\@firstofone
- }%
- \endgroup
- {%
- \PackageInfo{scrwfile}{%
- Extending `\string\@starttoc`
- }%
- \let\scrwfile at saved@starttoc\@starttoc
- \let\@starttoc\scrwfile at starttoc
- }%
-}
-\newcommand*{\scrwfile at process@clones}[1]{%
- \scr at ifundefinedorrelax{scrwfile at clone@#1}{}{%
- \begingroup
- \let\@@protect\protect\let\protect\@empty\afterassignment\restore at protect
- \edef\reserved at b{\csname scrwfile at clone@#1\endcsname}%
- \edef\reserved at c{,#1}%
- \@for \reserved at a:=\reserved at b\do {%
- \@tempswatrue
- \@for \reserved at d:=\reserved at c\do {%
- \ifx\reserved at d\reserved at a\@tempswafalse\fi
- }%
- \if at tempswa
- \immediate\write\scrwfile at wrtout{%
- \string\@writefile{\reserved at a}{\the\@temptokena}%
- }%
- \edef\reserved at c{\reserved at c,\reserved at a}%
- \fi
- }%
- \endgroup
- }%
-}%
-\newcommand*{\TOCclone}[3][]{%
- \RequirePackage{tocbasic}%
- \scr at ifundefinedorrelax{scrwfile at clone@#2}{%
- \expandafter\protected at edef\csname scrwfile at clone@#2\endcsname{%
- #3,\protect\csname scrwfile at clone@#3\endcsname
- }%
- }{%
- \edef\reserved at b{\csname scrwfile at clone@#2\endcsname}%
- \expandafter\protected at edef\csname scrwfile at clone@#2\endcsname{%
- \csname scrwfile at clone@#2\endcsname,%
- #3,%
- \protect\csname scrwfile at clone@#3\endcsname
- }%
- }%
- \scr at ifundefinedorrelax{scrwfile at clone@#3}{%
- \expandafter\let\csname scrwfile at clone@#3\endcsname\@empty
- }{}%
- \Ifattoclist{#3}{%
- \PackageWarning{scrwfile}{`#3' already under control of
- tocbasic.\MessageBreak
- Nevertheless features will be set%
- }%
- }{%
- \addtotoclist[TOCclone]{#3}%
- }%
- \setuptoc{#3}{nobabel}%
- \Ifstr{#1}{}{%
- }{%
- \@namedef{listof#3name}{#1}%
- \@namedef{listof#3}{\listoftoc{#3}}%
- \Iftocfeature{#2}{leveldown}{\setuptoc{#3}{leveldown}}{}%
- \Iftocfeature{#2}{numbered}{\setuptoc{#3}{numbered}}{}%
- \Iftocfeature{#2}{onecolumn}{\setuptoc{#3}{leveldownonecolumn}}{}%
- \Iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}%
- }%
-}
-\@onlypreamble\TOCClone
-%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $
-\RequirePackage{scrlogo}
-\endinput
-%%
-%% End of file `scrwfile.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/setspace.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/setspace.hak 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/setspace.hak 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\ProvidesFile{setspace.hak}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
scrhack part
(hacking package
setspace)%
]
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\scr at ifexpected{\onehalfspacing}{%
\long\def\onehalfspacing{%
\setstretch{1.25}% default
@@ -90,9 +90,30 @@
\expandafter\setstretch\expandafter{\strip at pt\@tempdima}%
}%
}{%
- \PackageWarning{scrhack}{unknown \string\onehalfspacing\space
- definition found!\MessageBreak
- Maybe you are using a unsupported setpace version}%
+ \scr at ifexpected{\onehalfspacing}{%
+ \long\def\onehalfspacing{%
+ \setstretch{1.25}% default
+ \ifx\@ptsize\@undefined\else
+ \ifcase \@ptsize \relax % 10pt
+ \setstretch {1.25}%
+ \or % 11pt
+ \setstretch {1.213}%
+ \or % 12pt
+ \setstretch {1.241}%
+ \fi
+ \fi
+ }%
+ }{%
+ \renewcommand*{\onehalfspacing}{%
+ \@tempdima=\dimexpr (\f at size pt)*1500/
+ (\dimexpr \f at baselineskip\relax)*\p@/1000\relax
+ \expandafter\setstretch\expandafter{\strip at pt\@tempdima}%
+ }%
+ }{%
+ \PackageWarning{scrhack}{unknown \string\onehalfspacing\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported setpace version}%
+ }%
}
\scr at ifexpected{\doublespacing}{%
\long\def\doublespacing{%
@@ -112,9 +133,30 @@
\expandafter\setstretch\expandafter{\strip at pt\@tempdima}%
}%
}{%
- \PackageWarning{scrhack}{unknown \string\doublespacing\space
- definition found!\MessageBreak
- Maybe you are using a unsupported setpace version}%
+ \scr at ifexpected{\doublespacing}{%
+ \long\def\doublespacing{%
+ \setstretch {1.667}% default
+ \ifx\@ptsize\@undefined\else
+ \ifcase \@ptsize \relax % 10pt
+ \setstretch {1.667}%
+ \or % 11pt
+ \setstretch {1.618}%
+ \or % 12pt
+ \setstretch {1.655}%
+ \fi
+ \fi
+ }%
+ }{%
+ \renewcommand*{\doublespacing}{%
+ \@tempdima=\dimexpr (\f at size pt)*2000/
+ (\dimexpr \f at baselineskip\relax)*\p@/1000\relax
+ \expandafter\setstretch\expandafter{\strip at pt\@tempdima}%
+ }%
+ }{%
+ \PackageWarning{scrhack}{unknown \string\doublespacing\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported setpace version}%
+ }%
}
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/standardsections.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/standardsections.hak 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/standardsections.hak 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,15 +62,15 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\ProvidesFile{standardsections.hak}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
scrhack part
(defining standard LaTeX class section headings)%
]
-%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $
\PackageWarningNoLine{scrhack}{%
You are loosing every kind of support because of\MessageBreak
using the dangerous standard classes sections hack!\MessageBreak
@@ -600,7 +600,7 @@
because of loading standard classes sections hack%
}%
\RelaxFamilyKey[.\KOMAClassFileName]{KOMA}{headings}%
- \KOMA at kav@removekey{.\KOMAClassFileName}{headings}%
+ \KOMA at kav@removekey{\KOMAClassFileName}{headings}%
}
\def\scr at class@titlesec at warning{%
\PackageWarning{scrhack}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -57,18 +57,18 @@
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package
(handling toc-files)%
]
%%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: prepare)
%%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $
%%% (run: option)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: option)
%%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $
%%% (run: body)
@@ -1095,7 +1095,7 @@
}%
}
\newcommand*{\tb at nt@autofloattype}{16}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: body)
\newcommand*{\scr at numberline}[1]{%
\numberline at box{%
@@ -1666,7 +1666,8 @@
\aftergroup\@tempswatrue
\def\do##1##2##3##4{%
\scr at ifundefinedorrelax{##1#3##2}{%
- \PackageError{tocbasic}{toc style `#2' needs ##4}{%
+ \PackageError{tocbasic}{toc style `#2' needs ##4\MessageBreak
+ of `#3'}{%
Usually the ##4 is defined using option `##3'.\MessageBreak
In some cases it may be set defining command
`\expandafter\string\csname ##1#3##2\endcsname'.\MessageBreak
@@ -1746,10 +1747,10 @@
\providecommand*\@pnumwidth{1.55em}
\providecommand*\@tocrmarg {2.55em}
\providecommand*\@dotsep {4.5}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: style,gobble)
\DeclareTOCEntryStyle{gobble}{}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: style,dottedtocline)
\DeclareTOCEntryStyle{dottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1766,8 +1767,10 @@
\Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
\Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
\Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
- \expandafter\let\csname #1tocdepth\expandafter\endcsname
- \csname #1numdepth\endcsname
+ \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
}%
}%
}%
@@ -1778,41 +1781,47 @@
}%
}%
}{}%
+ \@ifundefined{#1tocdepth}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname toclevel@#1\endcsname
+ }{}%
\@ifundefined{scr at tso@#1 at indent}{%
\@ifundefined{scr@#1 at tocindent}{%
\Ifstr{#1}{figure}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
\Ifstr{#1}{table}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \scr at ifundefinedorrelax{l at chapter}{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{3.8em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{7em}%
+ \Ifstr{#1}{lstlisting}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \scr at ifundefinedorrelax{l at chapter}{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{3.8em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{7em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ }%
}%
}%
}%
}%
- }%
- }{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{7.0em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{7.0em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{12em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{12em}%
+ }{%
+ }%
}%
}%
}%
@@ -1831,36 +1840,38 @@
\@ifundefined{scr@#1 at tocnumwidth}{%
\Ifstr{#1}{figure}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
\Ifstr{#1}{table}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
- \scr at ifundefinedorrelax{chapter}{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at numwidth}{3.2em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at numwidth}{4.1em}%
+ \Ifstr{#1}{lstlisting}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
+ \scr at ifundefinedorrelax{chapter}{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at numwidth}{3.2em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at numwidth}{5m}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{4.1em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{5m}%
+ }{%
+ }%
}%
}%
}%
}%
- }%
- }{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{3.2em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at numwidth}{3.1em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at numwidth}{5em}%
+ }{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{3.2em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at numwidth}{3.1em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at numwidth}{6em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{5em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{6em}%
+ }{%
+ }%
}%
}%
}%
@@ -1883,7 +1894,7 @@
{\@nameuse{scr at tso@#1 at numwidth}}{##1}{##2}%
}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: style,undottedtocline)
\DeclareTOCEntryStyle{undottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1900,8 +1911,10 @@
\Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
\Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
\Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
- \expandafter\let\csname #1tocdepth\expandafter\endcsname
- \csname #1numdepth\endcsname
+ \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
}%
}%
}%
@@ -1912,41 +1925,47 @@
}%
}%
}{}%
+ \@ifundefined{#1tocdepth}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname toclevel@#1\endcsname
+ }{}%
\@ifundefined{scr at tso@#1 at indent}{%
\@ifundefined{scr@#1 at tocindent}{%
\Ifstr{#1}{figure}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
\Ifstr{#1}{table}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \scr at ifundefinedorrelax{l at chapter}{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{3.8em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{7em}%
+ \Ifstr{#1}{lstlisting}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \scr at ifundefinedorrelax{l at chapter}{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{3.8em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{7em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ }%
}%
}%
}%
}%
- }%
- }{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{7.0em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{7.0em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{12em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{12em}%
+ }{%
+ }%
}%
}%
}%
@@ -1965,36 +1984,38 @@
\@ifundefined{scr@#1 at tocnumwidth}{%
\Ifstr{#1}{figure}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
\Ifstr{#1}{table}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
- \scr at ifundefinedorrelax{chapter}{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at numwidth}{3.2em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at numwidth}{4.1em}%
+ \Ifstr{#1}{lstlisting}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
+ \scr at ifundefinedorrelax{chapter}{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at numwidth}{3.2em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at numwidth}{5m}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{4.1em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{5m}%
+ }{%
+ }%
}%
}%
}%
}%
- }%
- }{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{3.2em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at numwidth}{3.1em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at numwidth}{5em}%
+ }{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{3.2em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at numwidth}{3.1em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at numwidth}{6em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{5em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{6em}%
+ }{%
+ }%
}%
}%
}%
@@ -2043,7 +2064,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: style, largetocline)
\DeclareTOCEntryStyle{largetocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -2058,8 +2079,10 @@
\Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
\Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
\Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
- \expandafter\let\csname #1tocdepth\expandafter\endcsname
- \csname #1numdepth\endcsname
+ \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
}%
}%
}%
@@ -2070,41 +2093,47 @@
}%
}%
}{}%
+ \@ifundefined{#1tocdepth}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname toclevel@#1\endcsname
+ }{}%
\@ifundefined{scr at tso@#1 at indent}{%
\@ifundefined{scr@#1 at tocindent}{%
\Ifstr{#1}{figure}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
\Ifstr{#1}{table}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \scr at ifundefinedorrelax{l at chapter}{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{3.8em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{7em}%
+ \Ifstr{#1}{lstlisting}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \scr at ifundefinedorrelax{l at chapter}{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{3.8em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{7em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ }%
}%
}%
}%
}%
- }%
- }{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{7.0em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{7.0em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{12em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{12em}%
+ }{%
+ }%
}%
}%
}%
@@ -2156,7 +2185,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: style,tocline)
\DeclareTOCEntryStyle{tocline}[{%
\DefineTOCEntryLengthOption{beforeskip}%
@@ -2228,8 +2257,10 @@
\Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
\Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
\Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
- \expandafter\let\csname #1tocdepth\expandafter\endcsname
- \csname #1numdepth\endcsname
+ \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
}%
}%
}%
@@ -2240,6 +2271,10 @@
}%
}%
}{}%
+ \@ifundefined{#1tocdepth}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname toclevel@#1\endcsname
+ }{}%
\scr at ifundefinedorrelax{scr at tso@#1 at indent}{%
\@ifundefined{scr@#1 at tocindent}{%
\Ifstrstart{#1}{sub}{%
@@ -2298,37 +2333,39 @@
\@ifundefined{scr at tso@#1 at indent}{%
\Ifstr{#1}{figure}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
\Ifstr{#1}{table}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \scr at ifundefinedorrelax{l at chapter}{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{3.8em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{7em}%
+ \Ifstr{#1}{lstlisting}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \scr at ifundefinedorrelax{l at chapter}{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{3.8em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{7em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ }%
}%
}%
}%
}%
- }%
- }{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{7.0em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{7.0em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{12em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{12em}%
+ }{%
+ }%
}%
}%
}%
@@ -2358,36 +2395,38 @@
\@ifundefined{scr at tso@#1 at numwidth}{%
\Ifstr{#1}{figure}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
\Ifstr{#1}{table}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
- \scr at ifundefinedorrelax{chapter}{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at numwidth}{3.2em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at numwidth}{4.1em}%
+ \Ifstr{#1}{lstlisting}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
+ \scr at ifundefinedorrelax{chapter}{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{1.5em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at numwidth}{3.2em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at numwidth}{5m}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{4.1em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{5m}%
+ }{%
+ }%
}%
}%
}%
}%
- }%
- }{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{3.2em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at numwidth}{3.1em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at numwidth}{5em}%
+ }{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at numwidth}{2.3em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at numwidth}{3.2em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at numwidth}{3.1em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at numwidth}{6em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{5em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at numwidth}{6em}%
+ }{%
+ }%
}%
}%
}%
@@ -2687,7 +2726,7 @@
\mkern \@dotsep mu\hbox{#1}\mkern \@dotsep
mu$}\hfill
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: style,toctext)
\DeclareTOCEntryStyle{toctext}[{%
\DefineTOCEntryLengthOption{beforeskip}%
@@ -2737,8 +2776,10 @@
\Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
\Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
\Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
- \expandafter\let\csname #1tocdepth\expandafter\endcsname
- \csname #1numdepth\endcsname
+ \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
}%
}%
}%
@@ -2749,6 +2790,10 @@
}%
}%
}{}%
+ \@ifundefined{#1tocdepth}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname toclevel@#1\endcsname
+ }{}%
\scr at ifundefinedorrelax{scr at tso@#1 at indent}{%
\@ifundefined{scr@#1 at tocindent}{%
\Ifstrstart{#1}{sub}{%
@@ -2794,37 +2839,39 @@
\@ifundefined{scr at tso@#1 at indent}{%
\Ifstr{#1}{figure}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
\Ifstr{#1}{table}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
- \scr at ifundefinedorrelax{l at chapter}{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{3.8em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{7em}%
+ \Ifstr{#1}{lstlisting}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{part}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \Ifstr{#1}{chapter}{\@namedef{scr at tso@#1 at indent}{0em}}{%
+ \scr at ifundefinedorrelax{l at chapter}{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{0pt}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{3.8em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{7em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ }%
}%
}%
}%
}%
- }%
- }{%
- \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
- \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
- \Ifstr{#1}{subsubsection}{%
- \@namedef{scr at tso@#1 at indent}{7.0em}%
- }{%
- \Ifstr{#1}{paragraph}{%
- \@namedef{scr at tso@#1 at indent}{10em}%
+ }{%
+ \Ifstr{#1}{section}{\@namedef{scr at tso@#1 at indent}{1.5em}}{%
+ \Ifstr{#1}{subsection}{\@namedef{scr at tso@#1 at indent}{3.8em}}{%
+ \Ifstr{#1}{subsubsection}{%
+ \@namedef{scr at tso@#1 at indent}{7.0em}%
}{%
- \Ifstr{#1}{subparagraph}{%
- \@namedef{scr at tso@#1 at indent}{12em}%
+ \Ifstr{#1}{paragraph}{%
+ \@namedef{scr at tso@#1 at indent}{10em}%
}{%
+ \Ifstr{#1}{subparagraph}{%
+ \@namedef{scr at tso@#1 at indent}{12em}%
+ }{%
+ }%
}%
}%
}%
@@ -2931,7 +2978,7 @@
\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 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $
%%% (run: style,dottedtocline)
\CloneTOCEntryStyle{dottedtocline}{default}
%%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/typearea.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/typearea.sty 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/typearea.sty 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -70,23 +70,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2022/10/12 v3.38 KOMA-Script
+ 2023/04/17 v3.39 KOMA-Script
package
(type area)]
-%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: init)
\providecommand*
{\scr at compatibility}{\scr at v@last}
@@ -173,13 +173,14 @@
\@namedef{scr at v@3.36}{20}
\@namedef{scr at v@3.37}{20}
\@namedef{scr at v@3.38}{20}
+\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@last}{20}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z 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 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: option)
\KOMA at key{version}[last]{%
\scr at ifundefinedorrelax{scr at v@#1}{%
@@ -192,7 +193,7 @@
Because of this, version was set to `first'%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.%
+ \KOMA at kav@replacevalue{%
typearea.\scr at pkgextension
}{version}{first}%
}{%
@@ -203,7 +204,7 @@
}%
\edef\scr at ta@compatibility{\@nameuse{scr at v@#1}}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
+ \KOMA at kav@xreplacevalue{%
typearea.\scr at pkgextension
}{version}{#1}%
\ifnum\scr at compatibility<\scr at v@last
@@ -252,7 +253,7 @@
\newcommand*{\scr at ta@v at is@ge}[1]{%
\numexpr\scr at ta@compatibility+\@ne >\@nameuse{scr at v@#1}
}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: options)
\providecommand*{\PaperNameToSize}[2][warning]{%
\Ifstr{#2}{letter}{%
@@ -344,9 +345,7 @@
}%
}
\ProvideUnknownPaperSizeError{warning}{%
- \PackageWarning{%
- typearea%
- }{%
+ \PackageWarning{typearea}{%
\string\paperwidth\space and \string\paperheight\space stay
unchanged, because\MessageBreak
of unknown paper size #1%
@@ -353,9 +352,7 @@
}%
}
\ProvideUnknownPaperSizeError{info}{%
- \PackageInfo{%
- typearea
- }{%
+ \PackageInfo{typearea}{%
\string\paperwidth\space and \string\paperheight\space stay
unchanged, because\MessageBreak
of unknown paper size #1%
@@ -380,10 +377,10 @@
\if at landscape\else\scr at switchpapersizes\@landscapetrue\fi
\fi
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{landscape}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{portrait}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{seascape}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{seascape}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{landscape}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{portrait}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{seascape}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{seascape}%
}{%
\Ifstr{#1}{landscape}{%
\@seascapefalse
@@ -394,10 +391,10 @@
\if at landscape\else\scr at switchpapersizes\@landscapetrue\fi
\fi
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{landscape}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{portrait}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{seascape}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{landscape}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{landscape}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{portrait}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{seascape}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{landscape}%
}{%
\Ifstr{#1}{portrait}{%
\expandafter\ifnum\scr at ta@v at is@ge{3.22}\relax
@@ -407,10 +404,10 @@
\if at landscape\scr at switchpapersizes\@landscapefalse\fi
\fi
\FamilyKeyStateProcessed
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{landscape}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{portrait}%
- \KOMA at kav@remove{.typearea.\scr at pkgextension}{paper}{seascape}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{portrait}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{landscape}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{portrait}%
+ \KOMA at kav@remove{typearea.\scr at pkgextension}{paper}{seascape}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{portrait}%
}{%
\Ifstr{#1}{letter}{%
\if at landscape
@@ -421,9 +418,9 @@
\setlength\paperwidth {8.5in}%
\fi
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{paper}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{letter}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{paper}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{letter}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\if at seascape seascape\else
\if at landscape landscape\else portrait\fi\fi
}%
@@ -437,9 +434,9 @@
\setlength\paperwidth {8.5in}%
\fi
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{paper}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{legal}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{paper}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{legal}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\if at seascape seascape\else
\if at landscape landscape\else portrait\fi\fi
}%
@@ -453,9 +450,9 @@
\setlength\paperwidth {7.25in}%
\fi
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{paper}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{paper}{executive}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{paper}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{paper}{executive}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\if at seascape seascape\else
\if at landscape landscape\else portrait\fi\fi
}%
@@ -463,9 +460,9 @@
\iso at paper{#1}%
\if at tempswa
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{paper}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{#1}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{paper}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{#1}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\if at seascape seascape\else
\if at landscape landscape\else portrait\fi\fi
}%
@@ -473,7 +470,7 @@
\expandafter\maybe at pair#1::\@nil
\if at tempswa
\FamilyKeyStateProcessed
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{paper}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{paper}%
\expandafter\ifnum \scr at ta@v at is@lt{3.01b}\relax
\PackageWarningNoLine{typearea}{%
You may have to exchange height and width!\MessageBreak
@@ -490,16 +487,16 @@
\fi
\expandafter\ifnum \scr at ta@v at is@lt{3.22}\relax
\if at landscape
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{\@tempa:\@tempb}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{\@tempa:\@tempb}%
\else
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{\@tempb:\@tempa}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{\@tempb:\@tempa}%
\fi
\else
\scr at setpaperorientation
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\the\paperwidth:\the\paperheight}%
\fi
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{paper}{%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{paper}{%
\if at seascape seascape\else
\if at landscape landscape\else portrait\fi\fi
}%
@@ -565,13 +562,13 @@
\else
\edef\@pagesizelast{false}%
\fi
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}%
+ \KOMA at kav@xreplacevalue{typearea.\scr at pkgextension}%
{pagesize}{\@pagesizelast}%
\fi
}
\newcommand\@pagesizelast{auto}
\AtBeginDocument{%
- \KOMAExecuteOptions[.typearea.\scr at pkgextension]{pagesize=\@pagesizelast}%
+ \KOMAExecuteOptions[typearea.\scr at pkgextension]{pagesize=\@pagesizelast}%
\expandafter\ifnum\scr at ta@v at is@gt{3.02b}\relax
\renewcommand*{\set at dvipspagesize}{%
\begingroup
@@ -736,9 +733,9 @@
}{#1}%
}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.%
- typearea.\scr at pkgextension
- }{twoside}{#1}%
+ \KOMA at kav@xreplacevalue
+ {typearea.\scr at pkgextension}%
+ {twoside}{#1}%
\if at twoside
\if at semitwoside
\@mparswitchfalse
@@ -751,7 +748,7 @@
\csname recalctypearea\endcsname
\fi
}
-\KOMA at kav@xadd{.typearea.\scr at pkgextension}{twoside}{%
+\KOMA at kav@xadd{typearea.\scr at pkgextension}{twoside}{%
\if at twoside true\else false\fi
}
\KOMA at DeclareStandardOption%
@@ -761,13 +758,13 @@
\if at atdocument\clearpage\fi
\KOMA at set@ifkey{twocolumn}{@twocolumn}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.%
- typearea.\scr at pkgextension
- }{twocolumn}{@twocolumn}%
+ \KOMA at kav@replacebool
+ {typearea.\scr at pkgextension}%
+ {twocolumn}{@twocolumn}%
\csname recalctypearea\endcsname
\fi
}
-\KOMA at kav@xadd{.typearea.\scr at pkgextension}{twocolumn}{%
+\KOMA at kav@xadd{typearea.\scr at pkgextension}{twocolumn}{%
\if at twocolumn true\else false\fi
}
\KOMA at DeclareStandardOption%
@@ -779,8 +776,8 @@
\endgroup
\def\ta at hh{#1\baselineskip}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{headlines}{#1}%
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{headheight}{#1\baselineskip}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{headlines}{#1}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{headheight}{#1\baselineskip}%
}
\KOMA at key{footlines}{%
\begingroup
@@ -788,8 +785,8 @@
\endgroup
\def\ta at fh{#1\baselineskip}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{footlines}{#1}%
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{footheight}{#1\baselineskip}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{footlines}{#1}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{footheight}{#1\baselineskip}%
}
\KOMA at key{headheight}{%
\begingroup
@@ -797,8 +794,8 @@
\endgroup
\def\ta at hh{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{headheight}{#1}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{headlines}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{headheight}{#1}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{headlines}%
}
\KOMA at key{footheight}{%
\begingroup
@@ -806,8 +803,8 @@
\endgroup
\def\ta at fh{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@replacevalue{.typearea.\scr at pkgextension}{footheight}{#1}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{footlines}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{footheight}{#1}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{footlines}%
}
\newif\if at hincl\@ifundefined{if at hsl}{}{\let\if at hincl\if at hsl}
\KOMA at ifkey{headinclude}{@hincl}
@@ -815,7 +812,7 @@
\KOMA at key{headsepline}[true]{%
\KOMA at set@ifkey{headinclude}{@hincl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.typearea.\scr at pkgextension}{headinclude}{@hincl}%
+ \KOMA at kav@replacebool{typearea.\scr at pkgextension}{headinclude}{@hincl}%
\fi
}
\newif\if at fincl\@ifundefined{if at fsl}{}{\let\if at fincl\if at fsl}
@@ -824,7 +821,7 @@
\KOMA at key{footsepline}[true]{%
\KOMA at set@ifkey{footinclude}{@fincl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA at kav@replacebool{.typearea.\scr at pkgextension}{footinclude}{@fincl}%
+ \KOMA at kav@replacebool{typearea.\scr at pkgextension}{footinclude}{@fincl}%
\fi
}
\KOMA at ifkey{mpinclude}{@mincl}
@@ -836,13 +833,13 @@
\setlength{\ta at bcor}{#1}%
}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{BCOR}{#1}%
+ \KOMA at kav@xreplacevalue{typearea.\scr at pkgextension}{BCOR}{#1}%
}
\AtEndOfPackage{%
\KOMA at key{BCOR}{%
\typearea[{#1}]{last}
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{BCOR}{#1}%
+ \KOMA at kav@xreplacevalue{typearea.\scr at pkgextension}{BCOR}{#1}%
}%
}
\def\movet at reserved@a at to@nnil#1\@nnil{\def\reserved at a{#1}}%
@@ -872,7 +869,7 @@
\FamilyKeyStateUnknownValue
\else
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{DIV}{\@tempa}%
+ \KOMA at kav@xreplacevalue{typearea.\scr at pkgextension}{DIV}{\@tempa}%
\fi
}
\AtEndOfPackage{%
@@ -879,9 +876,34 @@
\KOMA at key{DIV}{%
\typearea[current]{#1}%
\FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{DIV}{#1}%
+ \KOMA at kav@xreplacevalue{typearea.\scr at pkgextension}{DIV}{#1}%
}%
}
+\newcommand*{\ta at warnlimit}{\numexpr 15\relax}
+\newcommand*{\ta at infolimit}{\numexpr 15\relax}
+\KOMA at key{typeareawarnlimit}{%
+ \FamilySetCounterMacro{KOMA}{typeareawarnlimit}{\ta at warnlimit}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{typeareawarninfolimit}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{typeareawarnlimit}{#1}%
+ \fi
+}
+\KOMA at key{typeareainfolimit}{%
+ \FamilySetCounterMacro{KOMA}{typeareainfolimit}{\ta at infolimit}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{typeareawarninfolimit}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{typeareainfolimit}{#1}%
+ \fi
+}
+\KOMA at key{typeareawarninfolimit}{%
+ \FamilySetCounterMacro{KOMA}{typeareawarninfolimit}{\ta at warnlimit}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \let\ta at infolimit\ta at warnlimit
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{typeareawarninfolimit}{#1}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{typeareawarnlimit}{#1}%
+ \KOMA at kav@replacevalue{typearea.\scr at pkgextension}{typeareainfolimit}{#1}%
+ \fi
+}
\KOMA at ifkey{areasetadvanced}{@areasetadvanced}
\KOMA at DeclareDeprecatedOption[typearea]{DIVcalc}{DIV=calc}
\KOMA at DeclareDeprecatedOption[typearea]{DIVclassic}{DIV=classic}
@@ -940,7 +962,9 @@
\Ifdimen{#2}{%
\KOMA at UseDeprecatedOption{%
\PackageWarningNoLine{typearea}}{BCOR#2}{BCOR=#2}%
- }{\scr at pti@nerr at r}%
+ }{%
+ \scr at pti@nerr at r
+ }%
}{\scr at pti@nerr at r}%
}{\scr at pti@nerr at r}%
}
@@ -952,7 +976,9 @@
\Ifnumber{#2}{%
\KOMA at UseDeprecatedOption{%
\PackageWarningNoLine{typearea}}{DIV#2}{DIV=#2}%
- }{\scr at pti@nerr at r}%
+ }{%
+ \scr at pti@nerr at r
+ }%
\else\scr at pti@nerr at r\fi
\else\@BCOR\fi
}
@@ -1017,9 +1043,9 @@
\KOMAExecuteOptions{twoside=false}
\fi
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: body)
\newcommand*{\ta at divfor}[1]{%
\ta at div=\z@
@@ -1460,23 +1486,26 @@
\else
\advance\@tempcnta by-4
\fi
- \ifnum\@tempcnta <-15
- \@tempcnta=-\@tempcnta
- \PackageWarningNoLine{typearea}{%
- Bad type area settings!\MessageBreak
- The detected line width is about
- \the\@tempcnta\@percentchar\MessageBreak
- larger than the heuristically estimated maximum\MessageBreak
- limit of typographical good line width.\MessageBreak
- You should e.g.
- \ifnum\ta at div >6 decrease DIV, \fi
- \ifdim\f at size\p@<\@xiipt\p@ increase fontsize\else
- (increase fontsize)\fi\MessageBreak
- or change papersize%
- }%
- \@tempcnta=-\@tempcnta
- \else
- \ifnum\@tempcnta>15
+ \ifnum \ta at warnlimit<\z@\else
+ \ifnum\@tempcnta <-\numexpr \ta at warnlimit\relax
+ \@tempcnta=-\@tempcnta
+ \PackageWarningNoLine{typearea}{%
+ Bad type area settings!\MessageBreak
+ The detected line width is about
+ \the\@tempcnta\@percentchar\MessageBreak
+ larger than the heuristically estimated maximum\MessageBreak
+ limit of typographical good line width.\MessageBreak
+ You should e.g.
+ \ifnum\ta at div >6 decrease DIV, \fi
+ \ifdim\f at size\p@<\@xiipt\p@ increase fontsize\else
+ (increase fontsize)\fi\MessageBreak
+ or change papersize%
+ }%
+ \@tempcnta=-\@tempcnta
+ \fi
+ \fi
+ \ifnum \ta at infolimit<\z@\else
+ \ifnum\@tempcnta>\numexpr \ta at infolimit\relax
\PackageInfoNoLine{typearea}{%
Maybe no optimal type area settings!\MessageBreak
The detected line width is about
@@ -1487,7 +1516,8 @@
\ifdim\f at size\p@>\@xpt\p@, decrease fontsize\fi\MessageBreak
or change the papersize%
}%
- \fi\fi
+ \fi
+ \fi
\ifnum\ta at div <6
\PackageWarningNoLine{typearea}{%
Very low DIV value!\MessageBreak
@@ -1498,10 +1528,10 @@
}
\fi
\ta at layoutinfo{\number\ta at div}{\the\@tempcnta}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{DIV}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{DIV}{\@lastdiv}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{BCOR}%
- \KOMA at kav@xadd{.typearea.\scr at pkgextension}{BCOR}{\the\ta at bcor}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{DIV}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{DIV}{\@lastdiv}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{BCOR}%
+ \KOMA at kav@xadd{typearea.\scr at pkgextension}{BCOR}{\the\ta at bcor}%
\@typearea at end
\activateareas
\ifdim \dimexpr 1in+\topmargin
@@ -1637,10 +1667,10 @@
\setlength{\textwidth}{#2}%
\setlength{\textheight}{#3}%
\def\@lastdiv{areaset}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{DIV}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{DIV}{areaset}%
- \KOMA at kav@removekey{.typearea.\scr at pkgextension}{BCOR}%
- \KOMA at kav@add{.typearea.\scr at pkgextension}{BCOR}{\the\ta at bcor}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{DIV}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{DIV}{areaset}%
+ \KOMA at kav@removekey{typearea.\scr at pkgextension}{BCOR}%
+ \KOMA at kav@add{typearea.\scr at pkgextension}{BCOR}{\the\ta at bcor}%
\ta at hblk=\paperwidth
\advance\ta at hblk by-\ta at bcor
\advance\ta at hblk by-\textwidth
@@ -1762,7 +1792,7 @@
\kernel at ifstar \l at addto@macro \g at addto@macro \@areaset at end
}
\newcommand*{\@areaset at end}{}
-%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $
%%% (run: final)
\typearea[current]{current}
%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/visualize.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/visualize.lco 2023-04-17 19:56:14 UTC (rev 66869)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/visualize.lco 2023-04-17 19:57:41 UTC (rev 66870)
@@ -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 3962 2022-10-12 06:33:06Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: head)
\ProvidesFile{%
visualize%
@@ -80,7 +80,7 @@
Letter configuration option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $
%%% (run: body)
\RequirePackage{eso-pic}
\newcommand*{\showfields}[1]{%
@@ -577,7 +577,7 @@
\newcommand*{\showUScheck}{%
\showenvelope(8.625in,3.625in)%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $
%%% (run: body)
\endinput
%%
More information about the tex-live-commits
mailing list.