texlive[54825] Master/texmf-dist: koma-script (21apr20)
commits+karl at tug.org
commits+karl at tug.org
Tue Apr 21 23:21:24 CEST 2020
Revision: 54825
http://tug.org/svn/texlive?view=revision&revision=54825
Author: karl
Date: 2020-04-21 23:21:23 +0200 (Tue, 21 Apr 2020)
Log Message:
-----------
koma-script (21apr20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/koma-script/README
trunk/Master/texmf-dist/doc/latex/koma-script/manifest.txt
trunk/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/scrlayer-fancyhdr.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf
trunk/Master/texmf-dist/source/latex/koma-script/Makefile
trunk/Master/texmf-dist/source/latex/koma-script/doc/Makefile
trunk/Master/texmf-dist/source/latex/koma-script/doc/english/common-parmarkup.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-parmarkup.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf
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/scrkernel-basics.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.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-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-sections.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrmain.ins
trunk/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx
trunk/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco
trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco
trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco
trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
trunk/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NF.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
trunk/Master/texmf-dist/tex/latex/koma-script/SN.lco
trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
trunk/Master/texmf-dist/tex/latex/koma-script/float.hak
trunk/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
trunk/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
trunk/Master/texmf-dist/tex/latex/koma-script/listings.hak
trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak
trunk/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
trunk/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls
trunk/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-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.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/scrwfile.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/scrpage2.pdf
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrpage2.tex
trunk/Master/texmf-dist/source/latex/koma-script/scrpage.dtx
trunk/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/koma-script/README 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/doc/latex/koma-script/README 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,5 +1,5 @@
-KOMA-Script 2020/01/24 v3.29
+KOMA-Script 2020/04/19 v3.30
Copyright (c) Markus Kohm <komascript(at)gmx.info>, 1994-2020
This material is subject to the LaTeX Project Public License. See
@@ -24,33 +24,6 @@
Classes and Packages:
==============================================================================
-komamarks - providing extra marks commands similar to the LaTeX mark commands
-------------------------------------------------------------------------------
-Maintainer: Markus Kohm
-E-Mail: komascript at gmx info
-Abstract: komamarks is a LaTeX package of the KOMA-Script bundle.
- Sometimes the LaTeX mark commands \markboth, \markright,
- \leftmark, \rightmark are not enough to generate the running
- heads for a wanted layout. Even KOMA-Script package scrlayer's
- extra commands \lefttopmark, \leftbotmark, \leftfirstmark,
- \righttopmark, \rightbotmark and \rightfirstmark are maybe
- not enough, e.g., if you want not only the chapter and
- section in the heading, but maybe also the number of the
- subsection.
-
- Package komamarks provides commands to handle the extra marks
- of ε-TeX with commands similar to the usual LaTeX commands and
- the scrlayer extension. And it provides commands to extend
- these two part marks (left and right one) to multi part marks.
-
- The package is fully compatible with scrlayer and
- scrlayer-scrpage.
-
-Requires: scrbase.sty
-License: LPPL 1.3c or later
-State: Author maintained, beta
-Version: 2018/05/03 v0.3199
-==============================================================================
scraddr - Package to provide data from scrlttr2's adr-files
------------------------------------------------------------------------------
Maintainer: Markus Kohm
@@ -85,7 +58,7 @@
Recommended: scrlayer-scrpage - KOMA-Script package
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrarticle - wrapper class to scrartcl
------------------------------------------------------------------------------
@@ -100,7 +73,7 @@
Requires: scrartcl.cls - KOMA-Script class
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrbase - basic features for KOMA-Script, e.g. conditionals and key=value
------------------------------------------------------------------------------
@@ -139,7 +112,7 @@
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrbook - versatile class may be used as a drop-in replacement of book
------------------------------------------------------------------------------
@@ -159,7 +132,7 @@
typearea - KOMA-Script package
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrdate - calender date operations, e.g. calculation of the day of the week
------------------------------------------------------------------------------
@@ -178,7 +151,7 @@
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrdoc - internal source documentation class of KOMA-Script
------------------------------------------------------------------------------
@@ -207,7 +180,7 @@
etoolbox - tool-box for LaTeX programming using e-TeX
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrfontsizes - package to generate a KOMA-Script font size file
------------------------------------------------------------------------------
@@ -219,7 +192,7 @@
Requires: scrextend - some KOMA-Script features for other classes
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrhack - patch some isues with other packages
------------------------------------------------------------------------------
@@ -237,7 +210,7 @@
xpatch - extending etoolbox patching commands
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrjura - contract environment for advocates and scholary persons in law
------------------------------------------------------------------------------
@@ -253,7 +226,7 @@
tocbasic - features for helper files and float environments
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrkbase - internal basic features for KOMA-Script classes and packages
------------------------------------------------------------------------------
@@ -268,7 +241,7 @@
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrlayer-fancyhdr - combining scrlayer with fancyhdr
------------------------------------------------------------------------------
@@ -328,7 +301,7 @@
Requires: scrlayer.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrlayer - defining layers and controlling page headers and footers
------------------------------------------------------------------------------
@@ -353,7 +326,7 @@
Requires: scrkbase.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrletter - wrapper class to scrlttr2
------------------------------------------------------------------------------
@@ -368,7 +341,7 @@
Requires: scrlttr2.cls - KOMA-Script class
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrletter - letter extention to KOMA-Script classes
------------------------------------------------------------------------------
@@ -383,7 +356,7 @@
Recommended: marvosym - package by Martin Vogel providing symbols
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrlfile - control of package dependencies
------------------------------------------------------------------------------
@@ -401,7 +374,7 @@
Requires:
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrlttr2 - versatile letter class with separation of text area and note paper
------------------------------------------------------------------------------
@@ -434,33 +407,8 @@
Recommended: marvosym - package by Martin Vogel providing symbols
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
-scrpage2 - control of page headers and footers
-------------------------------------------------------------------------------
-Maintainer: Markus Kohm
-E-Mail: komascript at gmx info
-Abstract: scrpage2 is a LaTeX package of the KOMA-Script bundle. It
- provides facilities for changing the contents of headers and
- footers. You can configure a predefined pair of page styles
- similar to headings and plain or myheadings and plain, use a
- simple user interface to define completely new page styles, or
- take advantage of a more complex expert interface to have more
- effective degrees of freedom in defining new page styles.
-
- scrpage2 also provides simple options and commands to
- decide, e.g., whether or not the running heads should be
- done automatically, which headings levels should generate
- automatic running heads, whether or not there should be
- horizontal lines above or below the headers and footers, what
- colours or fonts should be used for the headers, footers, and
- separation lines, and more.
-Requires:
-Successor: scrlayer-scrpage
-License: LPPL 1.3c or later
-State: Author maintained, obsolete
-Version: 2020/01/24 v3.29
-==============================================================================
scrreport - wrapper class to scrreprt
------------------------------------------------------------------------------
Maintainer: Markus Kohm
@@ -474,7 +422,7 @@
Requires: scrreprt.cls - KOMA-Script class
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrreprt - versatile class may be used as a drop-in replacement of report
------------------------------------------------------------------------------
@@ -494,7 +442,7 @@
typearea - KOMA-Script package
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrtime - show the time of the LaTeX run
------------------------------------------------------------------------------
@@ -506,7 +454,7 @@
Requires: scrkbase - internal package with some basics of KOMA-Script
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
scrwfile - Spare write handles for helper files to avoid `No room' messages
------------------------------------------------------------------------------
@@ -560,7 +508,7 @@
Requires: scrbase - KOMA-Script package for some basic features.
License: LPPL 1.3c or later
State: Author maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
tocstyle - Control layout of table of contents, list of figures etc.
------------------------------------------------------------------------------
@@ -601,5 +549,5 @@
Requires: scrkbase - internal basic features for KOMA-Script packages
License: LPPL 1.3c or later
State: Autor maintained
-Version: 2020/01/24 v3.29
+Version: 2020/04/19 v3.30
==============================================================================
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/manifest.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/koma-script/manifest.txt 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/doc/latex/koma-script/manifest.txt 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,6 +1,6 @@
% ======================================================================
% manifest.txt
-% Copyright (c) Markus Kohm, 2005-2019
+% Copyright (c) Markus Kohm, 2005-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% manifest.txt
-% Copyright (c) Markus Kohm, 2005-2019
+% Copyright (c) Markus Kohm, 2005-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -35,7 +35,7 @@
% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien.
% ======================================================================
%
-% CONTENTS OF THE KOMA-SCRIPT RELEASE 2020/01/24 v3.29
+% CONTENTS OF THE KOMA-SCRIPT RELEASE 2020/04/19 v3.30
% ------------------------------------------------------
%
%
@@ -88,9 +88,6 @@
% tocbasic.html - Wrapper to the user guides
% typearea.html - Wrapper to the user guides
%
-% scrpage2.tex - Source of the manual of obsolete package scrpage2
-% scrpage2.pdf - Manual of obsolete package scrpage2
-%
% scrguien.pdf - English user guide
% scrguien.html - HTML index of the English user guide
%
@@ -305,8 +302,6 @@
%
% tocbasic.dtx - KOMA-Script toc-file package
%
-% scrpage.dtx - KOMA-Script page style packages
-%
% scrlfile.dtx - KOMA-Script load file package
%
% scrwfile.dtx - KOMA-Script write file package
@@ -375,8 +370,6 @@
doc/scrwfile.html
doc/scrlttr2.html
doc/scrletter.html
-doc/scrpage2.tex
-doc/scrpage2.pdf
doc/scrreprt.html
doc/scrtime.html
doc/typearea.html
@@ -513,8 +506,6 @@
tocbasic.dtx
-scrpage.dtx
-
scrlfile.dtx
scrwfile.dtx
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/scrguien.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/scrlayer-fancyhdr.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/koma-script/scrpage2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/koma-script/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/Makefile 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/Makefile 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,6 +1,6 @@
# ======================================================================
# Makefile
-# Copyright (c) Markus Kohm, 2002-2019
+# Copyright (c) Markus Kohm, 2002-2020
#
# This file is part of the LaTeX2e KOMA-Script bundle.
#
@@ -18,7 +18,7 @@
# This work consists of all files listed in manifest.txt.
# ----------------------------------------------------------------------
# Makefile
-# Copyright (c) Markus Kohm, 2002-2019
+# Copyright (c) Markus Kohm, 2002-2020
#
# Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
# Version 1.3c, verteilt und/oder veraendert werden.
@@ -101,7 +101,6 @@
scrbase.sty \
scrkbase.sty \
scraddr.sty \
- scrpage2.sty \
scrtime.sty \
scrdate.sty \
scrjura.sty \
@@ -139,7 +138,6 @@
scrlayer-scrpage.sty \
scrlayer-notecolumn.sty \
scrlayer-fancyhdr.sty
-# komamarks.sty
CLS_MAIN_DTX = scrkernel-basics.dtx \
scrkernel-bibliography.dtx \
@@ -168,7 +166,6 @@
scrlfile.dtx \
scrwfile.dtx \
scraddr.dtx \
- scrpage.dtx \
scrtime.dtx \
scrlogo.dtx \
scrextend.dtx \
@@ -180,7 +177,6 @@
scrlayer-scrpage.dtx \
scrlayer-notecolumn.dtx \
scrlayer-fancyhdr.dtx
-# komamarks.dtx
STATIC_DOC = README \
INSTALL.txt \
@@ -197,10 +193,8 @@
CLS_MAIN_SUBINS = scrstrip.inc scrstrop.inc scrdocstrip.tex
ALPHA_INS = tocstyle.dtx scrlayer-fancyhdr.dtx
-# komamarks.dtx
ALPHA_DOC = tocstyle.pdf scrlayer-fancyhdr.pdf
-# komamarks.pdf
ALPHA_DTX = $(subst .pdf,.dtx,$(ALPHA_DOC))
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/Makefile 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/Makefile 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,6 +1,6 @@
# ======================================================================
# Makefile
-# Copyright (c) Markus Kohm, 2002-2014
+# Copyright (c) Markus Kohm, 2002-2020
#
# This file is part of the LaTeX2e KOMA-Script bundle.
#
@@ -18,7 +18,7 @@
# This work consists of all files listed in manifest.txt.
# ----------------------------------------------------------------------
# Makefile
-# Copyright (c) Markus Kohm, 2002-2014
+# Copyright (c) Markus Kohm, 2002-2020
#
# Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
# Version 1.3c, verteilt und/oder veraendert werden.
@@ -108,10 +108,9 @@
DOC_SRC = scrguide.cls scrguide.ist scrguide.gst \
guide.tex guide.bib plength.dtx \
- linkalias.tex \
- scrpage2.tex
+ linkalias.tex
-DOC_FILES = scrpage2.pdf
+DOC_FILES =
DOC_DIR = doc
@@ -136,11 +135,6 @@
default_local: $(STATIC_DOC) $(DOC_FILES)
$(make_recursive)
-scrpage2.pdf: $(DOC_SRC)
- $(LATEX) $(NONSTOPMODE) $(PDFOUTPUT) scrpage2.tex
- $(LATEX) $(NONSTOPMODE) $(PDFOUTPUT) scrpage2.tex
- $(LATEX) $(NONSTOPMODE) $(PDFOUTPUT) scrpage2.tex
-
$(STATIC_DOC_LINKS): $(STATIC_DOC_SRC)
$(SYMLINK) $< $@
@@ -203,7 +197,7 @@
$(MKDIR) $(DISTDIR)/$(BIN_DIR)
$(CP) $(DIST_FILES) $(DISTDIR)
$(CP) $(BIN_FILES) $(DISTDIR)/$(BIN_DIR)
- $(CP) $(DOC_FILES) $(DISTDIR)/$(DOC_DIR)
+# $(CP) $(DOC_FILES) $(DISTDIR)/$(DOC_DIR)
$(make_recursive)
maintain_local:
@@ -215,12 +209,10 @@
$(make_recursive)
distclean_local:
- $(SRM) scrpage2-ngerman.tex scrpage2-english.tex
$(make_recursive)
maintainclean_local:
- $(SRM) ChangeLog.svn ChangeLog.bak $(STATIC_DOC_LINKS) $(DOC_FILES) \
- scrpage2-ngerman.tex scrpage2-english.tex
+ $(SRM) ChangeLog.svn ChangeLog.bak $(STATIC_DOC_LINKS) $(DOC_FILES)
$(make_recursive)
edit:
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/english/common-parmarkup.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/english/common-parmarkup.tex 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/english/common-parmarkup.tex 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,6 +1,6 @@
% ======================================================================
% common-parmarkup.tex
-% Copyright (c) Markus Kohm, 2001-2019
+% Copyright (c) Markus Kohm, 2001-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% common-parmarkup.tex
-% Copyright (c) Markus Kohm, 2001-2019
+% Copyright (c) Markus Kohm, 2001-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,12 +46,12 @@
% ======================================================================
\KOMAProvidesFile{common-parmarkup.tex}
- [$Date: 2019-11-11 08:22:00 +0100 (Mon, 11 Nov 2019) $
+ [$Date: 2020-03-12 08:27:32 +0100 (Thu, 12 Mar 2020) $
KOMA-Script guide (common paragraph: Paragraph Markup)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and
Karl Hagen}
-% Date of the translated German file: 2019-11-11
+% Date of the translated German file: 2020-03-12
\section{Marking Paragraphs}
\seclabel{parmarkup}%
@@ -187,41 +187,45 @@
% \begin{desctabular}
\entry{\PValue{false}, \PValue{off}, \PValue{no}%
\IndexOption{parskip~=\textKValue{false}}}{%
- paragraph indentation instead of vertical space; the last line of a
- paragraph can be arbitrarily filled}%
+ Paragraphs are identified by indentation of the first line by 1em.
+ There is no spacing requirement at the end of the last line
+ of a paragraph.}%
\entry{\PValue{full}, \PValue{true}, \PValue{on}, \PValue{yes}%
\IndexOption{parskip~=\textKValue{full}}%
}{%
- one line vertical space between paragraphs; there must be at least
- 1\Unit{em} free space in the last line of a paragraph}%
+ Paragraphs are identified by a vertical space of one line between
+ paragraphs. There must be at least 1\Unit{em} of free space at the
+ end of the last line of the paragraph.}%
\pventry{full-}{%
- one line vertical space between paragraphs; the last line of a paragraph
- can be arbitrarily filled\IndexOption{parskip~=\textKValue{full-}}}%
+ Paragraphs are identified by a vertical space of one line between
+ paragraphs. There is no spacing requirement at the end of the last line
+ of a paragraph.\IndexOption{parskip~=\textKValue{full-}}}%
\pventry{full+}{%
- one line vertical space between paragraphs; there must be at least a third
- of a line of free space at the end of a
- paragraph\IndexOption{parskip~=\textKValue{full+}}}%
+ Paragraphs are identified by a vertical space of one line between
+ paragraphs. There must be at least a third of a line of free space at the
+ end of a paragraph.\IndexOption{parskip~=\textKValue{full+}}}%
\pventry{full*}{%
- one line vertical space between paragraphs; there must be at least a
- quarter of a line of free space at the end of a
- paragraph\IndexOption{parskip~=\textKValue{full*}}}%
+ Paragraphs are identified by a vertical space of one line between
+ paragraphs. There must be at least a quarter of a line of free space at
+ the end of a paragraph.\IndexOption{parskip~=\textKValue{full*}}}%
\pventry{half}{%
- half a line vertical space between paragraphs; there must be at least
- 1\Unit{em} free space in the last line of a
- paragraph\IndexOption{parskip~=\textKValue{half}}}%
+ Paragraphs are identified by a vertical space of half a line between
+ paragraphs. There must be at least 1\Unit{em} free space at the end of the
+ last line of a paragraph.\IndexOption{parskip~=\textKValue{half}}}%
\pventry{half-}{%
- one line vertical space between
- paragraphs\IndexOption{parskip~=\textKValue{half-}}}%
+ Paragraphs are identified by a vertical space of half a line between
+ paragraphs. There is no spacing requirement at the end of the last line
+ of a paragraph.\IndexOption{parskip~=\textKValue{half-}}}%
\pventry{half+}{%
- half a line vertical space between paragraphs; there must be at least a
- third of a line of free space at the end of a
- paragraph\IndexOption{parskip~=\textKValue{half+}}}%
+ Paragraphs are identified by a vertical space of half a line between
+ paragraphs. There must be at least a third of a line of free space at the
+ end of a paragraph.\IndexOption{parskip~=\textKValue{half+}}}%
\pventry{half*}{%
- half a line vertical space between paragraphs; there must be at least a
- quarter of a line of free space at the end of a
- paragraph\IndexOption{parskip~=\textKValue{half*}}}%
+ Paragraphs are identified by a vertical space of half a line between
+ paragraphs. There must be at least a quarter of a line of free space at
+ the end of a paragraph.\IndexOption{parskip~=\textKValue{half*}}}%
\pventry{never}{%
- there%
+ No%
\IfThisCommonLabelBase{maincls}{%
\ChangedAt{v3.08}{\Class{scrbook}\and \Class{scrreprt}\and
\Class{scrartcl}}%
@@ -230,9 +234,9 @@
\ChangedAt{v3.08}{\Class{scrlttr2}}%
}{}%
} %
- will be no inter-paragraph spacing even if additional vertical spacing is
- needed for the vertical adjustment with
- \Macro{flushbottom}\IndexCmd{flushbottom}%
+ inter-paragraph spacing will be inserted even if additional vertical
+ spacing is needed for vertical adjustment with
+ \Macro{flushbottom}.\IndexCmd{flushbottom}%
\IndexOption{parskip~=\textKValue{never}}}%
% \end{desctabular}
% \end{table}%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-parmarkup.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-parmarkup.tex 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/ngerman/common-parmarkup.tex 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,6 +1,6 @@
% ======================================================================
% common-parmarkup.tex
-% Copyright (c) Markus Kohm, 2001-2019
+% Copyright (c) Markus Kohm, 2001-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% common-parmarkup.tex
-% Copyright (c) Markus Kohm, 2001-2019
+% Copyright (c) Markus Kohm, 2001-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -46,7 +46,7 @@
% ======================================================================
\KOMAProvidesFile{common-parmarkup.tex}
- [$Date: 2019-11-11 08:22:00 +0100 (Mon, 11 Nov 2019) $
+ [$Date: 2020-03-12 08:27:32 +0100 (Thu, 12 Mar 2020) $
KOMA-Script guide (common paragraphs)]
\section{Absatzauszeichnung}
@@ -190,8 +190,8 @@
\entry{\PValue{false}, \PValue{off}, \PValue{no}%
\IndexOption{parskip~=\textKValue{false}}}{%
Absätze werden durch einen Einzug der ersten Zeilen von einem Geviert
- (1\Unit{em}) gekennzeichnet. Der erste Absatz eines Abschnitts wird nicht
- eingezogen.}%
+ (1\Unit{em}) gekennzeichnet. Absatzenden werden nicht
+ gekennzeichnet.}%
\entry{\PValue{full}, \PValue{true}, \PValue{on}, \PValue{yes}%
\IndexOption{parskip~=\textKValue{full}}%
}{%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,6 +1,6 @@
% ======================================================================
% scrguide.cls
-% Copyright (c) Markus Kohm, 2005-2019
+% Copyright (c) Markus Kohm, 2005-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrguide.cls
-% Copyright (c) Markus Kohm, 2005-2019
+% Copyright (c) Markus Kohm, 2005-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -38,7 +38,7 @@
% \section{Identification}
%
% \begin{macrocode}
-\ProvidesClass{scrguide}[2019/12/06 v1.22d internal KOMA-Script guide class]
+\ProvidesClass{scrguide}[2020/03/17 v1.23 internal KOMA-Script guide class]
% \end{macrocode}
%
%
@@ -163,7 +163,6 @@
\newif\ifshortversion\shortversionfalse
\InputIfFileExists{scrnonfree.tex}{}{%
\RequirePackage[svgnames]{xcolor}%
- \RequirePackage{tocstyle}% hyperref needs xcolor with tocstyle
\RequirePackage{tikz}%
\usetikzlibrary{calc}%
\RequirePackage[\uselanguage]{hyperref}%
@@ -2230,19 +2229,24 @@
% We have large page numbers, so better setup the needed width. And we like
% other dot seperation.
% \begin{macrocode}
-\usetocstyle{classic}
+\RedeclareSectionCommand[%
+ tocdynnumwidth,%
+ tocbreakafternumber=true,%
+ tocentrynumberformat=\partnumberwithprefix,%
+ tocpagenumberformat=\@firstofone
+]{part}%
+\newcommand*{\partnumberwithprefix}[1]{\let\autodot:\partname~#1}%
+\RedeclareSectionCommand[%
+ tocnumwidth=21pt,%
+ tocpagenumberformat=\@firstofone,%
+ tocraggedentrytext=true%
+]{chapter}%
+\RedeclareSectionCommand[tocindent=21pt,tocnumwidth=34pt]{section}%
+\RedeclareSectionCommand[tocindent=55pt,tocnumwidth=36pt]{subsection}%
+\DeclareTOCStyleEntries[dynnumwidth]{default}{figure,table}%
\renewcommand*{\@pnumwidth}{1.8em}% 1.67
\renewcommand*\@tocrmarg {2.70em}% 2.55em
-\renewcommand*\@dotsep{2.5}
-\settocfeature[toc][-1]{entryhook}{%
- \let\sg at numberline\numberline
- \renewcommand*{\numberline}[1]{%
- \sg at numberline{\partname~##1}%
- ~\linebreak\nopagebreak\hspace*{-\@tempdima}%
- }%
- \def\autodot{: }%
- \sectfont
-}
+\renewcommand*\@dotsep{2.5}%
% \end{macrocode}
%
% \section{Part}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrpage2.tex
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrextend.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrextend.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrextend.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,8 +1,8 @@
-% \CheckSum{75}
+% \CheckSum{74}
% \iffalse meta-comment
% ======================================================================
% scrextend.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrextend.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $
%<preidentify>%%% (run: preidentify)
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
@@ -63,7 +63,7 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-10-10 10:25:29 +0200 (Thu, 10 Oct 2019) $
+ \filedate$Date: 2020-02-25 08:33:30 +0100 (Tue, 25 Feb 2020) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
\filerevision$Revision: 1962 $
\endgroup
@@ -111,15 +111,17 @@
%<*preidentify>
% \fi
%
+% \changes{v3.30}{2020/02/25}{\cs{PackageWarningNoLine} statt
+% \cs{PackageWarning} mit angehängtem \cs{@gobble}}%^^A
% \begin{macrocode}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname KOMAClassName\endcsname\relax\else
- \PackageWarning{scrextend}{%
+ \PackageWarningNoLine{scrextend}{%
This package was made to extend other classes but\MessageBreak
KOMA-Script classes by some features of the\MessageBreak
KOMA-Script classes.\MessageBreak
It should never be used with a KOMA-Script class.\MessageBreak
- Loading of the package will be aborted\@gobble%
+ Loading of the package will be aborted%
}%
\expandafter\endinput
\fi
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrhack.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrhack.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrhack.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,8 +1,8 @@
-% \CheckSum{1855}
+% \CheckSum{1877}
% \iffalse meta-comment
% ======================================================================
% scrhack.dtx
-% Copyright (c) Markus Kohm, 2008-2019
+% Copyright (c) Markus Kohm, 2008-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -23,7 +23,7 @@
% of TeX would generate the implementation documentation.
% ----------------------------------------------------------------------
% scrhack.dtx
-% Copyright (c) Markus Kohm, 2008-2019
+% Copyright (c) Markus Kohm, 2008-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -62,7 +62,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
%<package&identify>%%% using: package,identify
%<package&option>%%% using: package,option
%<package&body>%%% using: package,body
@@ -71,7 +71,7 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-11-19 10:37:46 +0100 (Tue, 19 Nov 2019) $
+ \filedate$Date: 2020-04-08 11:34:56 +0200 (Wed, 08 Apr 2020) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
\filerevision$Revision: 1962 $
\endgroup
@@ -861,6 +861,21 @@
}%
}%
}%
+% \end{macrocode}
+% \changes{v3.30}{2020/04/01}{setzen von \cs{@captype} ergänzt}%^^A
+% Ab Version~3.30 wird zusätzlich \cs{lst at makecaption} um das Setzen von
+% \cs{@captype} auf \texttt{lstlisting} ergänzt. Dadurch wird auch die
+% Verwendung von \cs{raggedlstlistingcaption} ermöglicht, falls dieses
+% definiert wird. Die Umdefinierung erfolgt in Form einer Erweiterung der
+% Definition aus \textsf{listings}. Das sollte so lange funktionieren, solange
+% die Anweisung in \textsf{listings} keine Argumente hat.
+% \begin{macrocode}
+ \expandafter\def\expandafter\lst at makecaption\expandafter{%
+ \expandafter\def\expandafter\@captype\expandafter{%
+ \expandafter l\expandafter s\expandafter t\expandafter l%
+ \expandafter i\expandafter s\expandafter t\expandafter i%
+ \expandafter n\expandafter g\expandafter}\lst at makecaption
+ }%
\let\scr at do@hack at listings\relax
}
\scr at ifexpected{\lstlistoflistings}{%
@@ -1016,6 +1031,7 @@
}{%
% \end{macrocode}
% \changes{v3.25}{2019/01/23}{emergency patch added}%^^A
+% \changes{v3.30}{2020/02/25}{spurious space in warning message removed}%^^A
% If this also does not work, we try an emergency patch, that could break
% things.
% \begin{macrocode}
@@ -1031,7 +1047,7 @@
release of package `nomencl'.\MessageBreak
Mostly this patch does work too, but it also could\MessageBreak
break `nomencl`. If this happens, please deactivate\MessageBreak
- the `nomencl` hack of `scrhack`
+ the `nomencl` hack of `scrhack`%
}%
}{%
\PackageWarning{scrhack}{%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,8 +1,8 @@
-% \CheckSum{4335}
+% \CheckSum{4366}
% \iffalse meta-comment
% ======================================================================
% scrkernel-basics.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkernel-basics.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
%<body>%%% (run: body)
@@ -65,7 +65,7 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
- \filedate$Date: 2020-01-17 15:56:41 +0100 (Fri, 17 Jan 2020) $
+ \filedate$Date: 2020-03-07 11:23:56 +0100 (Sat, 07 Mar 2020) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
\filerevision$Revision: 1638 $
\xdef\fileinfo{\filedate\space\filerevision\space}
@@ -244,6 +244,38 @@
% \end{macrocode}
% \end{macro}%^^A \kernel at ifstar
%
+% \selectlanguage{english}
+%
+% \subsection{Improved \LaTeX{} kernel commands}
+% The \LaTeX{} kernel already provides some useful commands, but some can be
+% improved.
+%
+% \begin{macro}{\rloop}
+% \changes{v3.30}{2020/03/07}{new}
+% The \cs{loop} \dots \cs{repeat} of the \LaTeX{} kernel cannot be used inside
+% a \cs{loop} \dots \cs{repeat} without extra code for preserving
+% \cs{iterate}. So here is a re-entrant version that is also long. This
+% version can be used even inside a \cs{loop} \dots \cs{repeat}. However you
+% should not use \cs{loop} \dots \cs{repeat} inside \cs{rloop} \dots
+% \cs{repeat}.
+% \begin{macrocode}
+%<*base>
+\newcommand{\rloop}[1]{}
+\long\def\rloop#1\repeat{%
+ \ifdefined\iterate
+ \edef\iterate{\unexpanded{#1\relax\expandafter\iterate\fi\def\iterate}%
+ {\unexpanded\expandafter{\iterate}}}%
+ \else
+ \def\iterate{#1\relax\expandafter\iterate\fi\let\iterate\relax}%
+ \fi
+ \iterate
+}
+%</base>
+% \end{macrocode}
+% \end{macro}
+% \selectlanguage{ngerman}
+%
+%
% \subsection{Test von Anweisungen}
%
% \begin{macro}{\scr at ifundefinedorrelax}
@@ -2761,10 +2793,12 @@
% \changes{v3.28}{2019/11/18}{entfernt}%^^A
% \begin{macro}{\scr at ifpdftex}
% \changes{v2.95}{2002/08/19}{neu (intern)}%^^A
+% \changes{v3.30}{2020/03/06}{veralteten Befehl \cs{ifnotundefined} durch
+% \cs{Ifnotundefined} ersetzt}%^^A
% If-then-else-Konstrukt, um zu testen, ob pdf\TeX{} verwendet wird.
% \begin{macrocode}
%<*base>
-\newcommand{\scr at ifpdftex}{\ifnotundefined{pdftexversion}}
+\newcommand{\scr at ifpdftex}{\Ifnotundefined{pdftexversion}}
%</base>
% \end{macrocode}
% \end{macro}
@@ -2772,10 +2806,12 @@
%
% \begin{macro}{\scr at ifluatex}
% \changes{v3.21}{2016/05/27}{neu (intern)}%^^A
+% \changes{v3.30}{2020/03/06}{veralteten Befehl \cs{ifnotundefined} durch
+% \cs{Ifnotundefined} ersetzt}%^^A
% If-the-else-Konstrukt, um zu testen, ob lua\TeX{} verwendet wird.
% \begin{macrocode}
%<*base>
-\newcommand{\scr at ifluatex}{\ifnotundefined{luatexversion}}
+\newcommand{\scr at ifluatex}{\Ifnotundefined{luatexversion}}
%</base>
% \end{macrocode}
% \end{macro}
@@ -2800,10 +2836,12 @@
% \begin{macro}{\scr at ifVTeX}
% \changes{v2.95}{2002/08/19}{neu}%^^A
% \changes{v2.97c}{2007/06/20}{umdefiniert von \cs{scr at ifvtex}}
+% \changes{v3.30}{2020/03/06}{veralteten Befehl \cs{ifnotundefined} durch
+% \cs{Ifnotundefined} ersetzt}%^^A
% If-then-else-Konstrukt, um zu testen, ob V\TeX{} verwendet wird.
% \begin{macrocode}
%<*base>
-\newcommand{\scr at ifVTeX}{\ifnotundefined{VTeXversion}}
+\newcommand{\scr at ifVTeX}{\Ifnotundefined{VTeXversion}}
%</base>
% \end{macrocode}
% \end{macro}
@@ -2880,12 +2918,14 @@
% \begin{macro}{\scr at ifpsoutput}
% \changes{v2.95}{2002/08/21}{neu (intern)}%^^A
% \changes{v2.95}{2004/07/20}{Expandierbarkeit verbessert}%^^A
+% \changes{v3.30}{2020/03/06}{veralteten Befehl \cs{ifnotundefined} durch
+% \cs{Ifnotundefined} ersetzt}%^^A
% If-then-else-Konstrukt, um abhängig davon, ob früher oder später
% \texttt{ps} ausgegeben wird oder nicht, Befehle auszuführen.
% \begin{macrocode}
%<*base>
\newcommand*{\scr at ifpsoutput}{%
- \ifnotundefined{if at dvips}{%
+ \Ifnotundefined{if at dvips}{%
\if at dvips
\expandafter\@firstoftwo
\else
@@ -2892,7 +2932,7 @@
\expandafter\@secondoftwo
\fi
}{%
- \ifnotundefined{OpMode}{%
+ \Ifnotundefined{OpMode}{%
\ifnum\OpMode=2
\expandafter\@firstoftwo
\else
@@ -4105,8 +4145,9 @@
% \begin{macro}{\FamilyUnknownKeyValue}
% \changes{v3.10}{2011/09/12}{no error while processing global options}%^^A
% \changes{v3.11a}{2012/05/28}{prevent remove from list of unused global
-% options globally}%^^A
+% options globally}%^^A
% \changes{v3.14}{2014/10/17}{\cs{long}}%^^A
+% \changes{v3.30}{2020/02/25}{spurious space in warning message removed}%^^A
% Dieses Makro berichtet über Fehler wegen unbekannter Wertübergabe an einen
% Schlüssel. Das erste Argument ist die Familie, das zweite der Schlüssel,
% das dritte der Wert und das vierte die Liste der möglichen Werte.
@@ -4120,7 +4161,7 @@
Setting this command to a non empty\MessageBreak
value for option `#2' of\MessageBreak
family `#1' is deprecated,\MessageBreak
- but has been found
+ but has been found%
}%
\fi
}
@@ -5108,6 +5149,8 @@
% \begin{macro}{\ForDoHook}
% \changes{v3.27}{2019/02/05}{New}%^^A
% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
+% \changes{v3.30}{2020/03/07}{\cs{loop}\dots\cs{repeat} inside group}%^^A
+% \changes{v3.30}{2020/03/07}{using \cs{rloop} instead of \cs{loop}}%^^A
% Arguments:
% \begin{description}
% \item[\meta{specificator}:]
@@ -5129,18 +5172,20 @@
but do-hook specificators must not be empty.%
}%
}{%
- \let\scr at hookname\relax
- \edef\scr at hookargument{#1}%
- \loop
- \scr at hooksplit@specificator\scr at hookname\scr at hookargument
- \scr at hookargument
- \begingroup\edef\reserved at a{%
- \unexpanded{\endgroup #2}{\scr at hookname}{\scr at hookargument}%
- }\reserved at a
- \ifx\scr at hookargument\@empty\else
- \repeat
- \let\scr at hookname\relax
- \let\scr at hookargument\relax
+ \begingroup
+ \def\scr at hookrun{\endgroup}%
+ \let\scr at hookname\relax
+ \edef\scr at hookargument{#1}%
+ \rloop
+ \scr at hooksplit@specificator\scr at hookname\scr at hookargument
+ \scr at hookargument
+ \edef\scr at hookrun{%
+ \unexpanded\expandafter{\scr at hookrun}%
+ \unexpanded{#2}{\scr at hookname}{\scr at hookargument}%
+ }%
+ \ifx\scr at hookargument\@empty\else
+ \repeat
+ \scr at hookrun
}%
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,4 +1,4 @@
-% \CheckSum{222}
+% \CheckSum{223}
% \iffalse meta-comment
% ======================================================================
% scrkernel-compatibility.dtx
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<option>%%% (run: option)
@@ -65,7 +65,7 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
- \filedate$Date: 2020-01-06 17:31:11 +0100 (Mon, 06 Jan 2020) $
+ \filedate$Date: 2020-02-24 17:22:41 +0100 (Mon, 24 Feb 2020) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
\filerevision$Revision: 1638 $
\edef\reserved at a{%
@@ -428,6 +428,8 @@
% \changes{v3.28}{2019/11/20}{Neues Macro}
% \begin{macro}{\scr at v@3.29}
% \changes{v3.29}{2020/01/06}{Neues Macro}
+% \begin{macro}{\scr at v@3.30}
+% \changes{v3.30}{2020/02/24}{Neues Macro}
% \begin{macro}{\scr at v@last}
% \changes{v2.9u}{2005/03/05}{Neues Macro}%^^A
% Nun die unterschiedlichen möglichen Werte (|\scr at v@last| ist jeweils die
@@ -506,6 +508,7 @@
\@namedef{scr at v@3.27a}{17}
\@namedef{scr at v@3.28}{17}
\@namedef{scr at v@3.29}{17}
+\@namedef{scr at v@3.30}{17}
\@namedef{scr at v@last}{17}
% \end{macrocode}
% \end{macro}
@@ -558,6 +561,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-language.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,8 +1,8 @@
-% \CheckSum{2229}
+% \CheckSum{2247}
% \iffalse meta-comment
% ======================================================================
% scrkernel-language.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkernel-language.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
@@ -63,9 +63,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-10-13 19:58:25 +0200 (Sun, 13 Oct 2019) $
+ \filedate$Date: 2020-04-13 11:39:03 +0200 (Mon, 13 Apr 2020) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3265 $
+ \filerevision$Revision: 3480 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-language.dtx}
@@ -563,6 +563,15 @@
% \begin{macrocode}
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
+% \end{macrocode}
+% \changes{v3.30}{2020/04/13}{\cs{renewcommand} workaround}%^^A
+% Unfortunately some users use \cs{renewcommand} to change a name even if the
+% language has not been loaded and the command has not been defined. This
+% would result in an error message. So a this point we let \cs{renewcommand}
+% be \cs{providecommand}, because we know that currently the command is
+% \cs{relax}.
+% \begin{macrocode}
+ \let\renewcommand\providecommand
\csname extras\scr at reserved@a\endcsname
\csname captions\scr at reserved@a\endcsname
\ifx #2\relax \aftergroup\@firstofone
@@ -642,8 +651,14 @@
% \cs{extras\meta{language}} would result in an error. As a workaround for
% this issue, make sure, that \cs{abx at extras@\meta{language}} is defined here
% locally.
-% \selectlanguage{ngerman}%^^A
+% \changes{v3.30}{2020/04/13}{\cs{renewcommand} workaround}%^^A
+% Unfortunately some users use \cs{renewcommand} to change a name even if the
+% language has not been loaded and the command has not been defined. This
+% would result in an error message. So a this point we let \cs{renewcommand}
+% be \cs{providecommand}, because we know that currently the command is
+% \cs{relax}.
% \begin{macrocode}
+ \let\renewcommand\providecommand
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
\csname captions\scr at reserved@a\endcsname
@@ -682,6 +697,7 @@
% \end{macrocode}
% \end{macro}%^^A \scr at provide@captionname
% \end{macro}%^^A \providecaptionname
+% \selectlanguage{ngerman}
%
% \begin{macro}{\newcaptionname}
% \changes{v2.8q}{2001/11/08}{neu}%^^A
@@ -748,8 +764,14 @@
% \cs{extras\meta{language}} would result in an error. As a workaround for
% this issue, make sure, that \cs{abx at extras@\meta{language}} is defined here
% locally.
-% \selectlanguage{ngerman}%^^A
+% \changes{v3.30}{2020/04/13}{\cs{renewcommand} workaround}%^^A
+% Unfortunately some users use \cs{renewcommand} to change a name even if the
+% language has not been loaded and the command has not been defined. This
+% would result in an error message. So a this point we let \cs{renewcommand}
+% be \cs{providecommand}, because we know that currently the command is
+% \cs{relax}.
% \begin{macrocode}
+ \let\renewcommand\providecommand
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
\csname captions\scr at reserved@a\endcsname
@@ -783,6 +805,7 @@
}
% \end{macrocode}
% \end{macro}%^^A \scr at new@scaptionname
+% \selectlanguage{ngerman}%^^A
% \begin{macro}{\scr at new@captionname}
% \changes{v3.12}{2013/07/30}{neu (intern)}%^^A
% \changes{v3.26}{2018/08/29}{diverse \cs{expandafter} eingespart}%^^A
@@ -824,8 +847,14 @@
% \cs{extras\meta{language}} would result in an error. As a workaround for
% this issue, make sure, that \cs{abx at extras@\meta{language}} is defined here
% locally.
-% \selectlanguage{ngerman}%^^A
+% \changes{v3.30}{2020/04/13}{\cs{renewcommand} workaround}%^^A
+% Unfortunately some users use \cs{renewcommand} to change a name even if the
+% language has not been loaded and the command has not been defined. This
+% would result in an error message. So a this point we let \cs{renewcommand}
+% be \cs{providecommand}, because we know that currently the command is
+% \cs{relax}.
% \begin{macrocode}
+ \let\renewcommand\providecommand
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
\csname captions\scr at reserved@a\endcsname
@@ -860,6 +889,7 @@
% \end{macrocode}
% \end{macro}%^^A \scr at new@captionname
% \end{macro}%^^A \newcaptionname
+% \selectlanguage{ngerman}%^^A
%
% \begin{macro}{\renewcaptionname}
% \changes{v2.8q}{2001/11/08}{neu}%^^A
@@ -929,8 +959,14 @@
% \cs{extras\meta{language}} would result in an error. As a workaround for
% this issue, make sure, that \cs{abx at extras@\meta{language}} is defined here
% locally.
-% \selectlanguage{ngerman}%^^A
+% \changes{v3.30}{2020/04/13}{\cs{renewcommand} workaround}%^^A
+% Unfortunately some users use \cs{renewcommand} to change a name even if the
+% language has not been loaded and the command has not been defined. This
+% would result in an error message. So a this point we let \cs{renewcommand}
+% be \cs{providecommand}, because we know that currently the command is
+% \cs{relax}.
% \begin{macrocode}
+ \let\renewcommand\providecommand
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
\csname captions\scr at reserved@a\endcsname
@@ -963,6 +999,7 @@
}
% \end{macrocode}
% \end{macro}%^^A \scr at renew@scaptionname
+% \selectlanguage{ngerman}%^^A
% \begin{macro}{\scr at renew@captionname}
% \changes{v3.12}{2013/07/30}{neu (intern)}%^^A
% \changes{v3.26}{2018/08/29}{diverse \cs{expandafter} eingespart}%^^A
@@ -1006,8 +1043,14 @@
% \cs{extras\meta{language}} would result in an error. As a workaround for
% this issue, make sure, that \cs{abx at extras@\meta{language}} is defined here
% locally.
-% \selectlanguage{ngerman}%^^A
+% \changes{v3.30}{2020/04/13}{\cs{renewcommand} workaround}%^^A
+% Unfortunately some users use \cs{renewcommand} to change a name even if the
+% language has not been loaded and the command has not been defined. This
+% would result in an error message. So a this point we let \cs{renewcommand}
+% be \cs{providecommand}, because we know that currently the command is
+% \cs{relax}.
% \begin{macrocode}
+ \let\renewcommand\providecommand
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
\csname extras\scr at reserved@a\endcsname
@@ -1049,6 +1092,7 @@
% \end{macrocode}
% \end{macro}%^^A \scr at renew@captionname
% \end{macro}%^^A \renewcaptionname
+% \selectlanguage{ngerman}%^^A
%
% \iffalse
%</package&base>
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -2,7 +2,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-letterclassoptions.dtx
-% Copyright (c) Markus Kohm, 2006-2019
+% Copyright (c) Markus Kohm, 2006-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkernel-letterclassoptions.dtx
-% Copyright (c) Markus Kohm, 2006-2019
+% Copyright (c) Markus Kohm, 2006-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%<option>%%% (run: option)
%<head>%%% (run: head)
%<body>%%% (run: body)
@@ -64,9 +64,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-11-24 22:50:05 +0100 (Sun, 24 Nov 2019) $
+ \filedate$Date: 2020-02-25 08:33:30 +0100 (Tue, 25 Feb 2020) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3404 $
+ \filerevision$Revision: 3453 $
\endgroup
\ProvidesFile{scrkernel-letterclassoptions.dtx}
[\filedate\space \filerevision\space
@@ -895,6 +895,8 @@
%
% Und für \texttt{DIN5008} braucht es dann noch einige zusätzliche
% Einstellungen:
+% \changes{v3.30}{2020/02/25}{unerwünschtes Leerzeichen am Ende der Warnungen
+% beseitigt}%^^A
% \begin{macrocode}
%</!5008>
%<*5008>
@@ -926,7 +928,7 @@
\space\string\areaset[5mm]{%
\the\dimexpr \paperwidth-45mm\relax}{%
\the\dimexpr 1.414\dimexpr \paperwidth-45mm\relax\relax}\MessageBreak
- to follow the norm
+ to follow the norm%
}%
\fi
\ifdim \dimexpr\parskip\relax=\dimexpr\baselineskip\relax\else
@@ -939,7 +941,7 @@
document does not conform DIN5008.\MessageBreak
You shoud use, e.g.,\MessageBreak
\space\string\KOMAoption{parskip}{full}\MessageBreak
- to follow the norm
+ to follow the norm%
}%
\fi
\endgroup
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-listsof.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -2,7 +2,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-listsof.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkernel-listsof.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
%<body>%%% (run: body)
@@ -64,9 +64,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-11-18 18:09:35 +0100 (Mon, 18 Nov 2019) $
+ \filedate$Date: 2020-04-11 09:26:26 +0200 (Sat, 11 Apr 2020) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3390 $
+ \filerevision$Revision: 3477 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-listsof.dtx}%
@@ -299,7 +299,7 @@
%
% \selectlanguage{english}%^^A
% \changes{v3.27}{2019/05/11}{init code moved from \texttt{tocbasic.dtx}}%^^A
-% \changes{v1.00}{auto-activation of feature \texttt{onecolumn}}
+% \changes{v1.0a}{2008/11/13}{auto-activation of feature \texttt{onecolumn}}
% Set feature \texttt{onecolumn} for every ToC file.
% \begin{macrocode}
%<*prepare&(book|report)>
@@ -508,7 +508,8 @@
% \textsf{scrbook}}%^^A
% \changes{v3.00}{2008/07/04}{Verwendung von \cs{toc at heading} ist nicht
% länger empfohlen}%^^A
-% \changes{v3.10}{2011/08/31}{\cs{MakeMarkcase} wird beachtet}%
+% \changes{v3.10}{2011/08/31}{\cs{MakeMarkcase} wird beachtet}%^^A
+% \changes{v3.30}{2020/02/24}{Leerzeichen am Ende der Warnung entfernt}%^^A
% Befehl, zum Setzen der Überschrift des Inhaltsverzeichnisses. Eigentlich
% ist das überflüssig, weil es nur einmal verwendet wird. Aus Gründen der
% Konsistenz mit den anderen Verzeichnissen machen wir das hier aber
@@ -521,7 +522,7 @@
You should use the features of package `tocbasic'\MessageBreak
instead of \string\toc at heading.\MessageBreak
Definition of \string\toc at heading\space may be removed from\MessageBreak
- KOMA-Script soon, so it should not be used
+ KOMA-Script soon, so it should not be used%
}%
%<article> \section*{\contentsname}%
%<book|report> \chapter*{\contentsname}%
@@ -1016,6 +1017,8 @@
% \changes{v3.01}{2008/11/13}{Neu (intern)}%^^A
% \changes{v3.12}{2013/09/25}{Text geändert}%^^A
% \changes{v3.12a}{2014/03/05}{Text korrigiert}%^^A
+% \changes{v3.30}{2020/02/25}{spurious space at end of warning message
+% removed}%^^A
% Die Warnung für die Verwendung von \cs{float at listhead}, dessen Definition
% irgendwann aus den Klassen verschwinden wird.
% \begin{macrocode}
@@ -1031,7 +1034,7 @@
Loading of package `scrhack' may help to\MessageBreak
avoid this warning, if you are using a\MessageBreak
a package that still implements the\MessageBreak
- deprecated \string\float at listhead\space interface
+ deprecated \string\float at listhead\space interface%
}%
}
% \end{macrocode}
@@ -1040,6 +1043,7 @@
% \changes{v3.01}{2008/11/13}{Neu (intern)}%^^A
% \changes{v3.12}{2013/09/25}{Text geändert}%^^A
% \changes{v3.12a}{2014/03/05}{Text korrigiert}%^^A
+% \changes{v3.30}{2020/02/24}{Leerzeichen am Ende der Warnung entfernt}%^^A
% Die Warnung für die Verwendung von \cs{float at addtolists}, dessen
% Unterstützung irgendwann aus den Klassen verschwinden wird.
% \begin{macrocode}
@@ -1057,7 +1061,7 @@
Loading of package `scrhack' may help to\MessageBreak
avoid this warning, if you are using a\MessageBreak
a package that still implements the\MessageBreak
- deprecated \string\float at addtolist\space interface
+ deprecated \string\float at addtolist\space interface%
}%
\global\let\scr at float@addtolists at warning\relax
}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-miscellaneous.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -2,7 +2,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-miscellaneous.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkernel-miscellaneous.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%<init>%%% (run: init)
%<option>%%% (run: option)
%<execoption>%%% (run: execoption)
@@ -65,9 +65,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-11-21 11:36:26 +0100 (Thu, 21 Nov 2019) $
+ \filedate$Date: 2020-02-25 08:33:30 +0100 (Tue, 25 Feb 2020) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3400 $
+ \filerevision$Revision: 3453 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-miscellaneous.dtx}%
@@ -1080,8 +1080,8 @@
\ifx\@sect\@tempa
% \end{macrocode}
% Note: There are several bugs in this definition (e.g. missing
-% \cs{expandafter} and orphan spaced). Nevertheless its the original one from
-% \textsf{minitoc} 61 and so I have to use it.
+% \cs{expandafter} and spurious spaced). Nevertheless its the original one
+% from \textsf{minitoc} 61 and so I have to use it.
% \begin{macrocode}
\def\@tempa#1#2#3#4#5#6[#7]#8{
\expandafter
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-notepaper.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% ======================================================================
% scrkernel-notepaper.dtx
-% Copyright (c) Markus Kohm, 2006-2019
+% Copyright (c) Markus Kohm, 2006-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -19,7 +19,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkernel-notepaper.dtx
-% Copyright (c) Markus Kohm, 2006-2019
+% Copyright (c) Markus Kohm, 2006-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -54,7 +54,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
@@ -62,7 +62,7 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-11-18 18:09:35 +0100 (Mon, 18 Nov 2019) $
+ \filedate$Date: 2020-03-27 12:01:45 +0100 (Fri, 27 Mar 2020) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
\filerevision$Revision: 1767 $
\edef\reserved at a{%
@@ -2206,6 +2206,8 @@
% \changes{v3.27}{2019/03/22}{new (internal)}%^^A
% \changes{v3.28}{2019/11/15}{\cs{ifkomavarempty} durch \cs{Ifkomavarempty}
% ersetzt}%^^A
+% \changes{v3.30}{2020/03/27}{Umdefinierung des Zeilenumbruchs
+% verschoben}%^^A
% The field with the recipience address. This should be used only on the first
% page of a letter.
% \begin{macrocode}
@@ -2215,9 +2217,13 @@
\color at begingroup
\if at baddr
\Ifkomavarempty{backaddress}{}{%
- \def\\{\usekomavar{backaddressseparator}\@ogobble}%
- \backaddr at format{\scriptsize\usekomafont{backaddress}%
- \usekomavar{backaddress}}%
+ \backaddr at format{\scriptsize
+ {%
+ \def\\{\usekomavar{backaddressseparator}\@ogobble}%
+ \usekomafont{backaddress}%
+ {\usekomavar{backaddress}}%
+ }%
+ }%
}%
\fi
\color at endgroup
@@ -3346,6 +3352,8 @@
% \changes{v3.27}{2019/03/27}{only at \textsf{scrlttr2}}%^^A
% \changes{v3.28}{2019/11/15}{\cs{ifkomavarempty} durch \cs{Ifkomavarempty}
% ersetzt}%^^A
+% \changes{v3.30}{2020/03/27}{Umdefinierung des Zeilenumbruchs
+% verschoben}%^^A
% Dasselbe gilt auch für das Adressfeld für Fensterumschläge. Die
% Rücksendeadresse und die Briefart werden dabei mit eigenen
% Formatieranweisungen gesetzt.
@@ -3391,9 +3399,12 @@
\if at baddr
\Ifkomavarempty{backaddress}{}{{%
\noindent%
- \def\\{\usekomavar{backaddressseparator}\@ogobble}%
- \backaddr at format{\scriptsize\usekomafont{backaddress}%
- \usekomavar{backaddress}}}}%
+ \backaddr at format{\scriptsize
+ {%
+ \def\\{\usekomavar{backaddressseparator}\@ogobble}%
+ \usekomafont{backaddress}%
+ {\usekomavar{backaddress}}%
+ }}}}%
\fi
}{backaddress}{backaddrheight}{\setkomavar}%
\ifcase \ltr at priority
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,8 +1,8 @@
-% \CheckSum{4850}
+% \CheckSum{4900}
% \iffalse meta-comment
% ======================================================================
% scrkernel-sections.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkernel-sections.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
% The runs of run-time file generation:
%<preidentify>%%% (run: preidentify)
% - everything that is needed before selfidentification of resulting files
@@ -78,9 +78,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-11-21 11:36:26 +0100 (Thu, 21 Nov 2019) $
+ \filedate$Date: 2020-04-08 16:42:59 +0200 (Wed, 08 Apr 2020) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3400 $
+ \filerevision$Revision: 3476 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-sections.dtx}%
@@ -981,6 +981,8 @@
% \changes{v3.19}{2015/07/17}{Verwendung von \cs{sectionlinesformat} und
% \cs{sectioncatchphraseformat}}%^^A
% \changes{v3.27}{2019/07/08}{neue Option \texttt{nonumber}}%^^A
+% \changes{v3.30}{2020/02/25}{unerwünschtes Leerzeichen am Ende der Warnung
+% entfernt}%^^A
% \begin{macro}{\scr at latex@sect}
% \changes{v3.27}{2019/07/24}{Neu (intern für \textsf{scrhack})}%^^A
% Damit auch alle mit \cs{@startsection} definierten Gliederungsebenen
@@ -1029,7 +1031,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@sect\space}%
+ of \string\@sect}%
\fi
% \end{macrocode}
% \end{macro}%^^A \scr at latex@sect
@@ -1307,6 +1309,8 @@
% der Erweiterung für die Formatieurng der Überschrift}%^^A
% \begin{macro}{\scr at latex@ssect}
% \changes{v3.27}{2019/07/24}{Neu (intern für \textsf{scrhack})}%^^A
+% \changes{v3.30}{2020/02/25}{unerwünschtes Leerzeichen am Ende der Warnung
+% entfernt}%^^A
% Das wird für Überschriften ohne Nummer verwendet. Im Prinzip machen wir hier
% dasselbe wie zuvor.
% \begin{macrocode}
@@ -1330,7 +1334,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@ssect\space}%
+ of \string\@ssect}%
\fi
% \end{macrocode}
% \end{macro}%^^A \scr at latex@ssect
@@ -1402,6 +1406,8 @@
% \end{macro}%^^A \@ssect
% \begin{macro}{\@xsect}
% \changes{v3.26}{2018/09/18}{wird umdefiniert}%^^A
+% \changes{v3.30}{2020/02/25}{unerwünschtes Leerzeichen am Ende der Warnung
+% entfernt}%^^A
% \begin{macro}{\scr at latex@xsect}
% \changes{v3.27}{2019/07/24}{Neu (intern für \textsf{scrhack})}%^^A
% Wir brauchen zum Einen in \cs{@xsect} einen Fallunterscheidung nach
@@ -1441,7 +1447,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@xsect\space}%
+ of \string\@xsect}%
\fi
% \end{macrocode}
% \end{macro}%^^A \scr at latex@xsect
@@ -1899,6 +1905,17 @@
}
%</book|report>
% \end{macrocode}
+% \begin{macro}{\scr at dsc@style at chapter@subcommands}
+% \selectlanguage{english}%^^A
+% \changes{v3.30}{2020/04/08}{new (internal)}
+% Internal name list of additional commands to be defined for style
+% \texttt{part} commands.
+% \begin{macrocode}
+\newcommand*{\scr at dsc@style at chapter@subcommands}[1]{%
+ @#1, at s#1, at make#1head, at makes#1head,@@make#1head,@@makes#1head,set#1preamble%
+}
+% \end{macrocode}
+% \end{macro}%^^A \scr at dsc@style at chapter@subcommands
% \end{macro}%^^A \scr at dsc@def at style@chapter at command
%
% \begin{macro}{\scr at dsc@style at part@options}
@@ -1972,7 +1989,7 @@
\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{prefix}
% \end{macrocode}
% \end{macro}%^^A \scr at dsc@style at part@options
-% \begin{macro}{\scr at dsc@def at style@part at command}
+% \begin{macro}{\scr at dsc@def at style@part at ommand}
% \changes{v3.18}{2015/05/23}{neue Anweisung (intern)}
% Diese Anweisung legt fest, wie ein Gliederungsbefehl für den Stil
% \texttt{part} zu definieren ist. Das einzige Argument ist dabei der
@@ -1987,6 +2004,17 @@
%<book|report> \@namedef{set#1preamble}{\set at preamble{#1}}%
}
% \end{macrocode}
+% \begin{macro}{\scr at dsc@style at part@subcommands}
+% \selectlanguage{english}%^^A
+% \changes{v3.30}{2020/04/08}{new (internal)}
+% Internal name list of additional commands to be defined for style
+% \texttt{part} commands.
+% \begin{macrocode}
+\newcommand*{\scr at dsc@style at part@subcommands}[1]{%
+ @#1, at s#1, at end#1,set#1preamble%
+}
+% \end{macrocode}
+% \end{macro}%^^A \scr at dsc@style at part@subcommands
% \end{macro}%^^A \scr at dsc@def at style@part at command
%
% \begin{macro}{\scr at dsc@style at section@neededoptionstest}
@@ -2783,6 +2811,7 @@
% \changes{v3.25}{2018/03/10}{zusätzliche Tests und Fehlermeldungen bei
% \cs{the\dots}, \cs{\dots mark}, \cs{\dots format},
% \cs{\dots markformat}}%^^A
+% \changes{v3.30}{2020/04/08}{unerwünschte Leerzeichen eliminiert}%^^A
% Basierend auf |\DeclareSectionCommand| wird eine Gliederungsanweisung
% definiert, die zuvor noch nicht existierte. Wichtig zu bemerken ist, dass
% die ganzen Hilfsanweisungen bereits existieren dürfen.
@@ -2795,9 +2824,47 @@
\expandafter\scr at ifundefinedorrelax\expandafter{\reserved at a}{}{%
\@tempswafalse
\edef\reserved at b{\expandafter\string\csname \reserved at a\endcsname}%
- }
- }
+ }%
+ }%
\if at tempswa
+% \end{macrocode}
+% \changes{v3.30}{2020/04/08}{erweiterte Neuheitsprüfung}%^^A
+% Es wird der Stil benötigt, um zu ermitteln, ob die Unterbefehle für diesen
+% Stil möglicherweise bereits definiert sind.
+% \begin{macrocode}
+ \expandafter\let\expandafter\scr at dsc@current
+ \csname scr at tso@##2 at style\endcsname
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{%
+ \edef\scr at dsc@current{##1}%
+ \FamilyKeyStateProcessed
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{style}%
+ \@tempswatrue
+% \end{macrocode}
+% Wenn der Stil definiert ist und Unterbefehle kennt, diese ebenfalls testen.
+% \begin{macrocode}
+ \@ifundefined{scr at dsc@current}{}{%
+ \scr at ifundefinedorrelax{scr at dsc@style@\scr at dsc@current @subcommands}{%
+ }{%
+ \edef\reserved at b{%
+ \csname scr at dsc@style@\scr at dsc@current @subcommands\endcsname{#2}%
+ }%
+ \expandafter\@for\expandafter\reserved at a\expandafter:\expandafter=%
+ \reserved at b\do{%
+ \expandafter\scr at ifundefinedorrelax\expandafter{\reserved at a}{}{%
+ \@tempswafalse
+ \edef\reserved at b{%
+ \expandafter\string\csname \reserved at a\endcsname}%
+ }%
+ }%
+ }
+ }%
+ \let\scr at dsc@current\relax
+ \fi
+ \if at tempswa
\DeclareSectionCommand[{#1}]{#2}%
\else
\ClassError{\KOMAClassName}{%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,8 +1,8 @@
-%\CheckSum{2882}
+% \CheckSum{2945}
% \iffalse meta-comment
% ======================================================================
% scrkernel-typearea.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkernel-typearea.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse meta-comment
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -66,9 +66,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-11-18 18:09:35 +0100 (Mon, 18 Nov 2019) $
+ \filedate$Date: 2020-03-24 13:12:02 +0100 (Tue, 24 Mar 2020) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3390 $
+ \filerevision$Revision: 3470 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-typearea.dtx}[%
@@ -1413,37 +1413,39 @@
% \begin{macrocode}
%<*class&body&!letter>
\if at scr@emulatestandardclasses
- \ifnum\@lastdiv=\z@
- \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
- \ifdim \f at size\p@<10.5\p@
- \setlength{\@tempdimb}{345\p@}
- \else\ifdim \f at size\p@<11.5\p@
- \setlength{\@tempdimb}{360\p@}
+ \Ifstr{\@lastdiv}{areaset}{}{%
+ \ifnum\@lastdiv=\z@
+ \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
+ \ifdim \f at size\p@<10.5\p@
+ \setlength{\@tempdimb}{345\p@}
+ \else\ifdim \f at size\p@<11.5\p@
+ \setlength{\@tempdimb}{360\p@}
+ \else
+ \setlength{\@tempdimb}{390\p@}
+ \fi
+ \fi
+ \if at twocolumn
+ \ifdim\@textwidth>2\@tempdimb\relax
+ \setlength{\textwidth}{2\@tempdimb}
+ \fi
\else
- \setlength{\@tempdimb}{390\p@}
+ \ifdim\textwidth>\@tempdimb
+ \setlength{\textwidth}{\@tempdimb}
+ \fi
\fi
+ \@settopoint\textwidth
+ \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
+ \divide\@tempdima\baselineskip
+ \@tempcnta=\@tempdima
+ \setlength{\textheight}{\@tempcnta\baselineskip}
+ \addtolength{\textheight}{\topskip}
+ \edef\reserved at a{%
+ \noexpand\@areasetadvancedtrue
+ \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
+ \if at areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
+ }\reserved at a
\fi
- \if at twocolumn
- \ifdim\@textwidth>2\@tempdimb\relax
- \setlength{\textwidth}{2\@tempdimb}
- \fi
- \else
- \ifdim\textwidth>\@tempdimb
- \setlength{\textwidth}{\@tempdimb}
- \fi
- \fi
- \@settopoint\textwidth
- \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
- \divide\@tempdima\baselineskip
- \@tempcnta=\@tempdima
- \setlength{\textheight}{\@tempcnta\baselineskip}
- \addtolength{\textheight}{\topskip}
- \edef\reserved at a{%
- \noexpand\@areasetadvancedtrue
- \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
- \if at areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
- }\reserved at a
- \fi
+ }%
\fi
%</class&body&!letter>
% \end{macrocode}
@@ -1701,28 +1703,51 @@
% \end{option}
%
% \begin{option}{DIV}
-% \changes{v2.2a}{1995/01/25}{neue Option}%^^A
+% \changes{v2.2a}{1995/01/25}{new option}%^^A
% \changes{v2.95}{2002/12/04}{new implementation using \textsf{keyval}}%^^A
% \changes{v3.12}{2013/03/05}{status signaling using \cs{FamilyKeyState}}%^^A
% 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.
+% \begin{macro}{\@lastdiv}
+% \changes{v3.30}{2020/03/24}{init the internal macro}%^^A
+% This internal macro stores the last value to option \texttt{DIV}. It is
+% initialized with \cs{relax}.
% \begin{macrocode}
+%<package&typearea&init>\newcommand*{\@lastdiv}{\z@}\let\@lastdiv\relax
+% \end{macrocode}
+% \end{macro}%^^A \@lastdiv
+% \begin{macrocode}
%<*package&typearea&options>
+\def\movet at reserved@a at to@nnil#1\@nnil{\def\reserved at a{#1}}%
\KOMA at key{DIV}[calc]{%
\edef\@tempa{#1}%
- \def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv\fi
+ \def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv
+ \ifx\@tempa\relax\def\@tempa{current}\fi
+ \fi
\def\@tempb{current}\ifx\@tempa\@tempb\else
\def\@tempb{default}\ifx\@tempa\@tempb\ta at div=\z@ \else
\def\@tempb{calc}\ifx\@tempa\@tempb\ta at div=\tw@ \else
\def\@tempb{classic}\ifx\@tempa\@tempb\ta at div=\thr@@ \else
- \ta at div=\@tempa
+ \expandafter\def\expandafter\@tempa\expandafter{\expandafter0\@tempa}%
+ \afterassignment\movet at reserved@a at to@nnil
+ \@tempcnta=\@tempa\relax\@nnil
+ \def\@tempb{\relax}\ifx\reserved at a\@tempb
+ \ta at div=\@tempcnta
+ \edef\@tempa{\the\ta at div}%
+ \else
+ \let\@tempa\relax
+ \fi
\fi
\fi
\fi
\fi
- \FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{DIV}{#1}%
+ \ifx\@tempa\relax
+ \FamilyKeyStateUnknownValue
+ \else
+ \FamilyKeyStateProcessed
+ \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{DIV}{\@tempa}%
+ \fi
}
% \end{macrocode}
% After loading the package we have to do a little bit more, because we need
@@ -1836,6 +1861,8 @@
% the margin notes at the outer margin. But if the typing area is to narrow
% for the margin note column, the width of margin note column will be
% reduced. This can be done easily be swapping the two lengths.
+% \changes{v3.30}{2020/02/25}{orphan line break at end of warning message
+% removed}%^^A
% \begin{macrocode}
\if at mincl
\advance\textwidth by-\marginparwidth
@@ -1846,7 +1873,7 @@
marginpar (\the\marginparwidth) while using option\MessageBreak
`mpinclude'.\MessageBreak
Because of this, I'm exchanging the values.\MessageBreak
- You should increase DIV to avoid such problems.\MessageBreak
+ You should increase DIV to avoid such problems%
}%
\@tempskipa=\marginparwidth
\marginparwidth=\textwidth
@@ -2120,8 +2147,10 @@
% \changes{v2.8q}{2001/11/06}{new symbolic value \texttt{last}}%^^A
% \changes{v2.96}{2006/08/21}{warn if \cs{typearea} is used inside a
% group}%^^A
-% \changes{v3.10}{2011/09/13}{using \cs{scr at grouplevel@test}}
+% \changes{v3.10}{2011/09/13}{using \cs{scr at grouplevel@test}}%^^A
% \changes{v3.12}{2013/03/26}{page footer height configurable}%^^A
+% \changes{v3.30}{2020/03/24}{\texttt{current} after \cs{areaset} is
+% \texttt{areaset}}%^^A
%
% The symbolic values of the obligatory argument of \cs{typearea}:
% \begin{center}\begin{tabular}{lll}
@@ -2145,14 +2174,16 @@
\fi
\edef\@tempa{#2}%
\def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv
- \ifx\csname @tempa\endcsname\relax
- \def\@tempa{current}%
- \fi
+ \ifx\@tempa\relax \def\@tempa{current}\fi
\fi
+ \Ifstr{\@tempa}{current}{%
+ \Ifstr{\@lastdiv}{areaset}{\let\@tempa\@lastdiv}{}%
+ }{}%
\def\@tempb{areaset}\ifx\@tempa\@tempb
\areaset[current]{\textwidth}{\textheight}%
\else
- \def\@tempb{current}\ifx\@tempa\@tempb\else
+ \def\@tempb{current}\ifx\@tempa\@tempb
+ \else
\def\@tempb{default}\ifx\@tempa\@tempb\ta at div=\z@ \else
\def\@tempb{calc}\ifx\@tempa\@tempb\ta at div=\tw@ \else
\def\@tempb{classic}\ifx\@tempa\@tempb\ta at div=\thr@@ \else
@@ -3096,6 +3127,8 @@
% \changes{v2.5}{1997/06/17}{Einzelzeichenscanner durch
% Mustererkennung ersetzt}%^^A
% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
+% \changes{v3.30}{2020/03/24}{avoid error message for unknown \texttt{BCOR}
+% value to \cs{documentclass}}%^^A
% Das Makro \cs{@BCOR} wird später benötigt, um die Option
% \texttt{BCOR\emph{BCOR}} zu erkennen. Die Option wird über ihr
% Muster erkannt.
@@ -3120,7 +3153,10 @@
% \changes{v3.22}{2016/07/29}{missing deprecated option warning added}%^^A
% \changes{v3.28}{2019/11/18}{\cs{ifdimen} renamed to \cs{Ifdimen}}%^^A
% \begin{macrocode}
-%<class> \PassOptionsToPackage{BCOR#2}{typearea}%
+%<*class>
+ \Ifstrstart{#2}{=}{\OptionNotUsed}{%
+ \PassOptionsToPackage{BCOR#2}{typearea}}%
+%</class>
%<*package>
\Ifdimen{#2}{%
\KOMA at UseDeprecatedOption{%
@@ -3145,6 +3181,8 @@
% Mustererkennung ersetzt}%^^A
% \changes{v3.22}{2016/07/29}{missing deprecated option warning added}%^^A
% \changes{v3.28}{2019/11/18}{\cs{ifnumber} umbenannt in \cs{Ifnumber}}%^^A
+% \changes{v3.30}{2020/03/24}{avoid error message for unknown \texttt{DIV}
+% value to \cs{documentclass}}%^^A
% Die grundsätzliche Funktion ist die gleiche wie bei \cs{@BCOR},
% \cs{@@BCOR}.
% \begin{macrocode}
@@ -3153,7 +3191,10 @@
\def\@@DIV #1DIV#2DIV#3\@@DIV{%
\edef\@tempa{#1}\ifx\@tempa\@empty
\edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb
-%<class> \PassOptionsToPackage{DIV#2}{typearea}%
+%<*class>
+ \Ifstrstart{#2}{=}{\OptionNotUsed}{%
+ \PassOptionsToPackage{DIV#2}{typearea}}%
+%</class>
%<*package>
\Ifnumber{#2}{%
\KOMA at UseDeprecatedOption{%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
% \fi
%
% \iffalse
@@ -123,7 +123,7 @@
\fi
%</ignorethis>
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
% \end{macrocode}
% \end{macro}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrmain.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrmain.ins 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrmain.ins 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,6 +1,6 @@
% ======================================================================
% scrmain.ins
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrmain.ins
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -35,7 +35,7 @@
% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien.
% ======================================================================
-% $Id: scrmain.ins 3353 2019-11-04 17:35:20Z kohm $
+% $Id: scrmain.ins 3478 2020-04-11 07:27:27Z kohm $
% ---------- KOMA-Script default docstrip declarations -----------------
@@ -157,7 +157,7 @@
\file{scrreprt.cls}{%
\from{scrkernel-version.dtx}{class,report}%
\from{scrkernel-basics.dtx}{class,load}%
- \from{scrkernel-listsof.dtx}{class,book,prepare}%
+ \from{scrkernel-listsof.dtx}{class,report,prepare}%
\from{scrkernel-tocstyle.dtx}{class,report,prepare}%
\from{scrkernel-sections.dtx}{class,report,prepare}%
\from{scrkernel-compatibility.dtx}{class,report,init}%
@@ -206,7 +206,7 @@
\file{scrartcl.cls}{%
\from{scrkernel-version.dtx}{class,article}%
\from{scrkernel-basics.dtx}{class,load}%
- \from{scrkernel-listsof.dtx}{class,book,prepare}%
+ \from{scrkernel-listsof.dtx}{class,article,prepare}%
\from{scrkernel-tocstyle.dtx}{class,article,prepare}%
\from{scrkernel-sections.dtx}{class,article,prepare}%
\from{scrkernel-compatibility.dtx}{class,article,init}%
@@ -493,7 +493,6 @@
\batchinput{scrtime.dtx}% scrtime.sty, scrdate.sty
\batchinput{scrlfile.dtx}% scrlfile.sty
\batchinput{scraddr.dtx}% scraddr.sty
-\batchinput{scrpage.dtx}% scrpage2.sty
\batchinput{tocbasic.dtx}% tocbasic.sty
\batchinput{scrlayer.dtx}% scrlayer.sty, scrlayer-scrpage.sty ...
\batchinput{scrwfile.dtx}% scrwfile.sty
Deleted: trunk/Master/texmf-dist/source/latex/koma-script/scrpage.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrpage.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrpage.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,2261 +0,0 @@
-% \CheckSum{2389}
-% \iffalse
-% ======================================================================
-% scrpage.dtx
-% Copyright (c) Markus Kohm, 1995-2019
-%
-% 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 or later 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.txt.
-% ----------------------------------------------------------------------
-% scrpage.dtx
-% Copyright (c) Markus Kohm, 1995-2019
-%
-% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
-% Version 1.3c, verteilt und/oder veraendert werden.
-% Die neuste Version dieser Lizenz ist
-% http://www.latex-project.org/lppl.txt
-% und Version 1.3c ist Teil aller Verteilungen von LaTeX
-% Version 2005/12/01 oder spaeter und dieses Werks.
-%
-% Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained"
-% (allein durch den Autor verwaltet).
-%
-% Der Aktuelle Verwalter und Autor dieses Werkes ist Markus Kohm.
-%
-% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien.
-% ======================================================================
-% \fi
-%
-% \CharacterTable
-% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-% Digits \0\1\2\3\4\5\6\7\8\9
-% Exclamation \! Double quote \" Hash (number) \#
-% Dollar \$ Percent \% Ampersand \&
-% Acute accent \' Left paren \( Right paren \)
-% Asterisk \* Plus \+ Comma \,
-% Minus \- Point \. Solidus \/
-% Colon \: Semicolon \; Less than \<
-% Equals \= Greater than \> Question mark \?
-% Commercial at \@ Left bracket \[ Backslash \\
-% Right bracket \] Circumflex \^ Underscore \_
-% Grave accent \` Left brace \{ Vertical bar \|
-% Right brace \} Tilde \~}
-%
-% \iffalse
-%%% From File: $Id: scrpage.dtx 3403 2019-11-23 15:38:36Z kohm $
-%<scrpage>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
-%<*dtx>
-\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\begingroup
- \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-11-23 16:38:36 +0100 (Sat, 23 Nov 2019) $
- \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 2631 $
- \edef\reserved at a{%
- \noexpand\endgroup
- \noexpand\ProvidesFile{scrpage.dtx}%
- [\filedate\space\filerevision\space
- KOMA-Script package source
- }%
-\reserved at a
-%</dtx>
-%<*dtx|scrpage>
-%<scrpage>\ProvidesPackage{scrpage2}[%
-%!KOMAScriptVersion
-%<scrpage> package
- (page head and foot)]
-%</dtx|scrpage>
-%<*dtx>
-\ifx\documentclass\undefined
- \input scrdocstrip.tex
- \@@input scrkernel-version.dtx
- \@@input scrstrip.inc
- \KOMAdefVariable{COPYRIGHFROM}{1995}
- \generate{\usepreamble\defaultpreamble
- \file{scrpage2.sty}{%
- \from{scrpage.dtx}{scrpage}%
- \from{scrlogo.dtx}{logo}%
- }%
- }
- \@@input scrstrop.inc
-\else
- \let\endbatchfile\relax
-\fi
-\endbatchfile
-\documentclass{scrdoc}
-\usepackage[ngerman,english]{babel}
-\CodelineIndex
-\RecordChanges
-\GetFileInfo{scrpage.dtx}
-\title{\KOMAScript{} \partname\ \texttt{\filename}\thanks{This file has
- revision number \fileversion, last revised \filedate.}}
-\date{\filedate}
-\author{Markus Kohm}
-\begin{document}
- \maketitle
- \tableofcontents
- \DocInput{\filename}
-\end{document}
-%</dtx>
-% \fi
-%
-% \section{Page Layout Package}
-%
-% This is the \KOMAScript{} package \textsf{scrpage2}. You may find the user
-% documentation of this package in the English \KOMAScript{} guide,
-% \texttt{scrguien.pdf}, and in the German \KOMAScript{} guide,
-% \texttt{scrguide.pdf}.
-%
-% \StopEventually{\PrintIndex\PrintChanges}
-%
-% \section{Implementation}
-%
-% Currently this package doesn't share any code but the \KOMAScript{} logo
-% with other packages. So all the code of this package but the implementation
-% of the \KOMAScript{} logo is at this file and their is nor more code at this
-% file.
-%
-% \changes{v3.24}{2017/05/08}{warning about obsolete package added}
-% \begin{macrocode}
-%<*scrpage>
-\PackageWarning{scrpage2}{usage of obsolete package!\MessageBreak
- Package `scrpage2' is obsolete.\MessageBreak
- You should not longer use package `scrpage2'.\MessageBreak
- You should replace usage of package `scrpage2'\MessageBreak
- by `scrlayer-scrpage'}
-% \end{macrocode}
-% \changes{v1.1}{1995/06/27}{\cs{hbox to} changed into \cs{hb at xt@}.}
-% \changes{v2.2c}{2007/07/23}{a lot of \% added and removed}
-%
-% \subsection{Options}
-% \begin{option}{headinclude}
-% \changes{v2.3}{2008/12/08}{obsolete}%
-% \begin{option}{headexclude}
-% \changes{v2.3}{2008/12/08}{obsolete}%
-% \begin{option}{footinclude}
-% \changes{v2.3}{2008/12/08}{obsolete}%
-% \begin{option}{footexclude}
-% \changes{v2.3}{2008/12/08}{obsolete}%
-% \texttt{scrpage} has known some options. They are similar to the
-% old \KOMAScript{} classes. To work with and without the \KOMAScript{}
-% classes their definitions are not quite simple.
-% \begin{macrocode}
-\newcommand*{\@Pass at Obsolete@Option at To@Typearea}[1]{%
- \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
- \ifin@
- \PackageWarningNoLine{scrpage2}{%
- deprecated passing option `\CurrentOption' to scrpage2.\MessageBreak
- If you are using package typearea or\MessageBreak
- a KOMA-Script class since version 3.00\MessageBreak
- you may use `\string\KOMAoptions{#1}' and\MessageBreak
- remove passing `\CurrentOption' to scrpage2%
- }%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname KOMAoptions\endcsname\relax
- \PassOptionsToPackage{#1}{typearea}%
- \else
- \KOMAoptions{#1}\csname relcalctypearea\endcsname
- \fi
- \fi
-}
-\DeclareOption{headinclude}{%
- \@Pass at Obsolete@Option at To@Typearea{headinclude}%
-}
-\DeclareOption{headexclude}{%
- \@Pass at Obsolete@Option at To@Typearea{headinclude=false}%
-}
-\DeclareOption{footinclude}{%
- \@Pass at Obsolete@Option at To@Typearea{footinclude}%
-}
-\DeclareOption{footexclude}{%
- \@Pass at Obsolete@Option at To@Typearea{footinclude=false}%
-}
-% \end{macrocode}
-% We do so, because we want so set |headinclude|, |footinclude| by
-% default at old version (see below)!
-% \end{option}
-% \end{option}
-% \end{option}
-% \end{option}
-%
-% We have additional options designed for the additional interface.
-% \begin{option}{mpinclude}
-% \changes{v2.8q}{2002/03/28}{New option}
-% \begin{option}{mpexclude}
-% \changes{v2.8q}{2002/03/28}{New option}
-% There are documents where the head and foot should span not only the
-% text but also the marginpar. We have an option to do this at
-% initialization. This option corresponds with the option of package
-% \texttt{typearea} and the classes.
-% \begin{macro}{\if at mincl}
-% \begin{macro}{\@mincltrue}
-% \begin{macro}{\@minclfalse}
-% \changes{v2.2g}{2008/11/19}{Test fixed}
-% \begin{macrocode}
-\@ifundefined{@mincltrue}{\newif\if at mincl}{}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macrocode}
-\DeclareOption{mpinclude}{\@mincltrue}
-\DeclareOption{mpexclude}{\@minclfalse}
-% \end{macrocode}
-% \end{option}
-% \end{option}
-%
-% Other new options redefine macros, so we have to define them first.
-% \begin{macro}{\scr at headabove@linethickness}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scr at headbelow@linethickness}
-% \changes{v2.0}{2001/03/30}{New}
-% \begin{macro}{\scr at footabove@linethickness}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scr at footbelow@linethickness}
-% \changes{v2.0}{2001/04/20}{New}
-% These macros define the thickness of the line above and below the head
-% and the foot.
-% \begin{macrocode}
-\newcommand*{\scr at headabove@linethickness}{0pt}
-\newcommand*{\scr at headbelow@linethickness}{0pt}
-\newcommand*{\scr at footabove@linethickness}{0pt}
-\newcommand*{\scr at footbelow@linethickness}{0pt}
-% \end{macrocode}
-% \begin{macro}{\scr at headabove@linelength}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scr at headbelow@linelength}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scr at footabove@linelength}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scr at footbelow@linelength}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at headabove@linelength}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at headbelow@linelength}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at footabove@linelength}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at footbelow@linelength}
-% \changes{v2.0}{2001/04/20}{New}
-% Because we want to have the ``line definitions'' at one place, we
-% also define the length of the lines here. We have own length at to
-% be used at pagestyle \texttt{scrplain}.
-% \begin{macrocode}
-\newcommand*{\scr at headabove@linelength}{\@headwidth}
-\newcommand*{\scr at headbelow@linelength}{\@headwidth}
-\newcommand*{\scr at footabove@linelength}{\@footwidth}
-\newcommand*{\scr at footbelow@linelength}{\@footwidth}
-\newcommand*{\scrplain at headabove@linelength}{0pt}
-\newcommand*{\scrplain at headbelow@linelength}{0pt}
-\newcommand*{\scrplain at footabove@linelength}{0pt}
-\newcommand*{\scrplain at footbelow@linelength}{0pt}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{option}{headtopline}
-% \changes{v2.0}{2001/04/20}{New option}
-% \begin{option}{headsepline}
-% \changes{v2.0}{2001/04/20}{New option}
-% \begin{option}{footsepline}
-% \changes{v2.0}{2001/04/20}{New option}
-% \begin{option}{footbotline}
-% \changes{v2.0}{2001/04/20}{New option}
-% \begin{option}{plainheadtopline}
-% \changes{v2.0}{2001/04/20}{New option}
-% \begin{option}{plainheadsepline}
-% \changes{v2.0}{2001/04/20}{New option}
-% \begin{option}{plainfootsepline}
-% \changes{v2.0}{2001/04/20}{New option}
-% \begin{option}{plainfootbotline}
-% \changes{v2.0}{2001/04/20}{New option}
-% The thickness can be set by four simple options:
-% \begin{macrocode}
-\DeclareOption{headtopline}{%
- \renewcommand*{\scr at headabove@linethickness}{.4pt}
- \PassOptionsToPackage{headinclude}{typearea}}
-\DeclareOption{headsepline}{%
- \renewcommand*{\scr at headbelow@linethickness}{.4pt}
- \PassOptionsToPackage{headinclude}{typearea}}
-\DeclareOption{footsepline}{%
- \renewcommand*{\scr at footabove@linethickness}{.4pt}
- \PassOptionsToPackage{footinclude}{typearea}}
-\DeclareOption{footbotline}{
- \renewcommand*{\scr at footbelow@linethickness}{.4pt}
- \PassOptionsToPackage{footinclude}{typearea}}
-\DeclareOption{plainheadtopline}{%
- \renewcommand*{\scrplain at headabove@linelength}{\scr at headabove@linelength}
- \PassOptionsToPackage{headinclude}{typearea}}
-\DeclareOption{plainheadsepline}{%
- \renewcommand*{\scrplain at headbelow@linelength}{\scr at headbelow@linelength}
- \PassOptionsToPackage{headinclude}{typearea}}
-\DeclareOption{plainfootsepline}{%
- \renewcommand*{\scrplain at footabove@linelength}{\scr at footabove@linelength}
- \PassOptionsToPackage{footinclude}{typearea}}
-\DeclareOption{plainfootbotline}{
- \renewcommand*{\scrplain at footbelow@linelength}{\scr at footbelow@linelength}
- \PassOptionsToPackage{footinclude}{typearea}}
-% \end{macrocode}
-% \end{option}
-% \end{option}
-% \end{option}
-% \end{option}
-% \end{option}
-% \end{option}
-% \end{option}
-% \end{option}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\hfline at adjust}
-% \changes{v2.0f}{2001/06/23}{New}
-% \begin{option}{ilines}
-% \changes{v2.0f}{2001/06/23}{New}
-% \begin{option}{clines}
-% \changes{v2.0f}{2001/06/23}{New}
-% \begin{option}{olines}
-% \changes{v2.0f}{2001/06/23}{New}
-% At Version 2 lines may be inner adjusted (0), centered (1) or outer
-% adjusted (2):
-% \begin{macrocode}
-\newcommand*{\hfline at adjust}{1}
-\DeclareOption{ilines}{\renewcommand*{\hfline at adjust}{0}}
-\DeclareOption{clines}{\renewcommand*{\hfline at adjust}{1}}
-\DeclareOption{olines}{\renewcommand*{\hfline at adjust}{2}}
-% \end{macrocode}
-% \end{option}
-% \end{option}
-% \end{option}
-% \end{macro}
-%
-% \begin{option}{automark}
-% \changes{v2.0b}{2001/05/31}{use \cs{AtEndOfPackage} to run not yet
-% defined macro}
-% \begin{option}{manualmark}
-% \changes{v2.0b}{2001/05/31}{use \cs{AtEndOfPackage} to run not yet
-% defined macro}
-% \changes{v2.0i}{2001/08/17}{don't ignore oneside any longer}
-% At version 2 we want to distinguish between running headline and
-% static headline not only using different pagestyles. We do this with
-% options and commands. But here only the options are defined.
-% \begin{macrocode}
-\DeclareOption{automark}{%
- \AtEndOfPackage{\if at twoside%
- \if at chapter\automark[section]{chapter}%
- \else\automark[subsection]{section}\fi%
- \else%
- \if at chapter\automark{chapter}\else\automark{section}\fi%
- \fi}}
-\DeclareOption{manualmark}{\AtEndOfPackage{\manualmark}}
-% \end{macrocode}
-% \end{option}
-% \end{option}
-%
-% \begin{option}{autoonesize}
-% \changes{v2.0i}{2001/08/17}{New}
-% \begin{macro}{\if at autooneside}
-% \changes{v2.0i}{2001/08/17}{New}
-% If the optional argument of \cs{automark} should be irgnored at
-% onside mode, use this option:
-% \begin{macrocode}
-\newif\if at autooneside\@autoonesidefalse
-\DeclareOption{autooneside}{\@autoonesidetrue}
-% \end{macrocode}
-% \end{macro}
-% \end{option}
-%
-% \begin{option}{markuppercase}
-% \changes{v2.0c}{2001/06/07}{New}
-% \begin{option}{markusedcase}
-% \changes{v2.0c}{2001/06/07}{New}
-% For use of running headlines there are also options to say ``class
-% uses upper case at the automatic marks'' or ``class use same case at
-% the automatic marks like used writing the heading''.
-% \begin{macrocode}
-\DeclareOption{markuppercase}{\let\MakeMarkcase\MakeUppercase}
-\DeclareOption{markusedcase}{\let\MakeMarkcase\@empty}
-% \end{macrocode}
-% \end{option}
-% \end{option}
-%
-% \begin{macro}{\scr at nouppercase}
-% \changes{v2.0j}{2001/08/18}{New}
-% \begin{option}{nouppercase}
-% \changes{v2.0j}{2001/08/18}{New}
-% Sometimes scrpage may be used with a class, which uses
-% \cs{uppercase} or \cs{MakeUppercase} at \cs{markboth} or
-% \cs{markright}. But the author does not want upper case at the
-% headlines. So we define an option, that simply deaktivates
-% \cs{uppercase} and \cs{MakeUppercase} at all heads and foots,
-% defined by scrpage2.
-% \begin{macrocode}
-\newcommand*{\scr at nouppercase}{}
-\DeclareOption{nouppercase}{\renewcommand*{\scr at nouppercase}{%
- \let\uppercase\relax\let\MakeUppercase\relax
- \expandafter\let\csname MakeUppercase \endcsname\relax}
- \ifx\MakeMarkcase\MakeUppercase
- \PackageWarning{scrpage2}{%
- Option 'markuppercase' will be ignored.\MessageBreak%
- You shouldn't use option 'markuppercase' together\MessageBreak%
- with option 'nouppercase'}
- \let\MakeMarkcase\@empty
- \fi}
-% \end{macrocode}
-% \end{option}
-% \end{macro}
-%
-% \begin{option}{komastyle}
-% \begin{option}{standardstyle}
-% At version 2 there is an predefined pagestyle ``scrheadings''. With
-% the two options you may decide, wether it has to behave like
-% ``headings'' at the standard classes or the KOMA-Script classes.
-% The macro saves the name of the style.
-% \begin{macrocode}
-\DeclareOption{komastyle}{\def\scrheadings at style{koma}
- \@ifundefined{MakeMarkcase}{\let\MakeMarkcase\relax}{}}
-\DeclareOption{standardstyle}{\def\scrheadings at style{standard}
- \@ifundefined{MakeMarkcase}{\let\MakeMarkcase\MakeUppercase}{}}
-% \end{macrocode}
-% \end{option}
-% \end{option}
-%
-%
-% We don't need default options.
-% \begin{macrocode}
-\ExecuteOptions{}
-% \end{macrocode}
-% But you may set other Options:
-% \begin{macrocode}
-\ProcessOptions\relax
-% \end{macrocode}
-%
-%
-% \subsection{Some Initialisation}
-%
-% For easier handling of the differences between article-, report- and
-% book-classes we define some more switches.
-%
-% \begin{macro}{\if at chapter}
-% \changes{v2.1b}{2003/05/31}{more save test}
-% First distinguish between article and others.
-% \begin{macrocode}
-\newif\if at chapter
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname chapter\endcsname\relax
- \@chapterfalse
-\else
- \@chaptertrue
-\fi
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\if at mainmatter}
-% \changes{v1.2}{1995/07/08}{Definition changed}
-% \changes{v2.1b}{2003/05/31}{more save test}
-% \changes{v2.2d}{2007/03/13}{additional \cs{if at mainmatter} test}
-% \changes{v2.2g}{2008/11/19}{usage of \cs{if at mainmatter} at message
-% removed}
-% Next distinguish between matter- and nomatter-classes.
-% \begin{macrocode}
-\def\@tempa{\newif\if at mainmatter\@mainmattertrue}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname mainmatter\endcsname\relax
-\else
- \@ifundefined{@mainmattertrue}{%
- \PackageWarningNoLine{scrpage2}{%
- \string\mainmatter\space defined without
- \expandafter\string\csname if at mainmatter\endcsname!\MessageBreak
- This switch is obligatory for scrpage2 to omit\MessageBreak
- running head chapter numbers in front and\MessageBreak
- back matter and will be defined now%
- }%
- }{%
- \let\@tempa\relax
- }%
-\fi
-\@tempa
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \subsection{Predefinitions}
-% There are some commands, you can use at pagestyle-definition.
-%
-% \begin{macro}{\headmark}
-% This macro is |\rightmark| or |\leftmark|. But outside
-% pagestyle-definition it's nothing.
-% \begin{macrocode}
-\let\headmark\relax
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\pagemark}
-% This macro is the number of the page at the pagenumberfont:
-% \begin{macrocode}
-\DeclareRobustCommand\pagemark{{\pnumfont\thepage}}
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \subsection{Expert-Pagestyle-Definition-Interface}
-% The pagestyle-definition-interface for experts is not as easy as the
-% simple interface we'll define later. But it's more flexible. We'll
-% later use it to define the pagestyle-definition-interface for users.
-%
-% \begin{macro}{\if at automark}
-% \changes{v2.1}{2002/10/30}{New switch}
-% \begin{macro}{\@automarktrue}
-% \begin{macro}{\@automarkfalse}
-% We need this switch to decide to switch on or off \cs{@mkboth} at the
-% pagestyles.
-% \begin{macrocode}
-\newif\if at automark\@automarkfalse
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\defpagestyle}
-% First we define the simple definition-interface. There's no test, if
-% the pagestyle's defined twice.
-%
-% First there has to be the definition of head and foot.
-% \begin{macrocode}
-\def\defpagestyle{%
-% \end{macrocode}
-% We have to decide, whether it is a my-version or not:
-% \begin{macrocode}
- \@ifstar
- {\@defpagestyle[-]}%
- {\@defpagestyle[+]}}
-% \end{macrocode}
-% \begin{macro}{\@defpagestyle}
-% Now the we can define the head and the foot.
-% \changes{v1.0b}{1995/05/25}{Dot deleted after number at
-% chapter- and sectionmark}
-% \changes{v1.0b}{1995/05/25}{Use CJK at \cs{chaptermark},
-% \cs{sectionmark} and \cs{subsectionmark}}
-% \changes{v1.3e}{2008/02/29}{usage of \cs{if at mainmatter} fixed}
-% \changes{v2.0}{2001/04/20}{Version 2 uses \cs{automark} and
-% \cs{manualmark}, so star and non-star version are same}
-% \changes{v2.1a}{2002/10/30}{Use \cs{if at automark}}
-% \changes{v2.2d}{2007/06/14}{Support of article-classes with
-% \cs{if at mainmatter}}
-% \changes{v2.5}{2010/04/22}{moved \cs{if at twoside} inside of definition}
-% Before version 2.5 we have distinguished one- and two-side definitions while
-% loading the package and have had all the definitions of \cs{@mkboth},
-% \cs{chaptermark}, \cs{sectionmark}, and \cs{subsectionmark} at the
-% definition of the page style.
-% Since version~2.5 the difference of one- and two-side is made at the
-% definition of the heads and foots themself and \cs{chaptermark},
-% \cs{sectionmark}, and \cs{subsectionmark} are defined by \cs{automark} and
-% \cs{manualmark}. So the code is much easier.
-% \begin{macrocode}
-\def\@defpagestyle[#1]#2#3#4{%
- \expandafter\def\csname ps@#2\endcsname{%
- \if at automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
- \def at head#3
- \def at foot#4
- }%
-}
-% \end{macrocode}
-%
-% \begin{macro}{\def at head}
-% \changes{v2.5}{2010/04/22}{new (internal)}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\def@@head}
-% \changes{v2.0}{2001/04/20}{Thickness and length of the lines are
-% optional}
-% \changes{v2.0j}{2001/08/18}{Use of \cs{scr at nouppercase}}
-% \changes{v2.5}{2010/04/22}{new (internal)}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% This was real simple, but we already have to do the real definition
-% of the heads and foots. First the head:
-% \begin{macrocode}
-\def\def at head{%
- \kernel at ifnextchar(%)
- {\def@@head}%
- {\def@@head(\scr at headabove@linelength,%
- \scr at headabove@linethickness)}}
-\def\def@@head(#1,#2)#3#4#5{%
- \kernel at ifnextchar(%)
- {\def@@@head({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@head({#1},{#2}){#3}{#4}{#5}%
- (\scr at headbelow@linelength,%
- \scr at headbelow@linethickness)}}
-\def\def@@@head(#1,#2)#3#4#5(#6,#7){%
- \def\@evenhead{%
- \if at twoside
- \let\headmark\leftmark%
- \hss\hskip\@evenheadshift\vbox{\hsize=\@headwidth\relax%
- \hf at rule{#1}{#2}{\@headwidth}{headabove}%
- \vskip#2
- \vskip\baselineskip
- \hb at xt@\@headwidth{{%
- \scr at nouppercase
- \headfont\strut #3}}%
- \hf at rule{#6}{#7}{\@headwidth}{headbelow}%
- }\hskip\@oddheadshift\hss
- \fi
- }%
- \def\@oddhead{\let\headmark\rightmark
- \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
- \hf at rule{#1}{#2}{\@headwidth}{headabove}%
- \vskip#2%
- \vskip\baselineskip
- \hb at xt@\@headwidth{{%
- \scr at nouppercase
- \headfont\strut \if at twoside #4\else #5\fi}}%
- \hf at rule{#6}{#7}{\@headwidth}{headbelow}%
- }\hskip\@evenheadshift\hss}%
-}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\def at foot}
-% \changes{v2.0}{2001/04/20}{Thickness and length of the lines are
-% optional}
-% \changes{v1.3}{2001/03/30}{Use of \cmd\@footwidth instead of
-% \cs{textwidth}}
-% \changes{v2.5}{2010/04/22}{new (internal)}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\def@@foot}
-% \changes{v2.5}{2010/04/22}{new (internal)}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\def@@@foot}
-% \changes{v2.0j}{2001/08/18}{Use of \cs{scr at nouppercase}}
-% \changes{v2.2f}{2008/02/14}{Use of \cs{footfont}}
-% \changes{v2.5}{2010/04/22}{new (internal)}
-% And last twosided and onesided foot:
-% \begin{macrocode}
-\def\def at foot{%
- \kernel at ifnextchar(%)
- {\def@@foot}
- {\def@@foot(\scr at footabove@linelength,%
- \scr at footabove@linethickness)}}
-\def\def@@foot(#1,#2)#3#4#5{%
- \kernel at ifnextchar(%)
- {\def@@@foot({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@foot({#1},{#2}){#3}{#4}{#5}%
- (\scr at footbelow@linelength,%
- \scr at footbelow@linethickness)}}
-\def\def@@@foot(#1,#2)#3#4#5(#6,#7){%
- \def\@evenfoot{%
- \if at twoside
- \let\headmark\leftmark
- \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot at rule{#1}{#2}\hb at xt@\@footwidth{{%
- \scr at nouppercase
- \headfont\footfont\strut #3}}%
- \botfoot at rule{#6}{#7}}\hskip\@oddfootshift\hss
- \fi
- }%
- \def\@oddfoot{\let\headmark\rightmark
- \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot at rule{#1}{#2}\hb at xt@\@footwidth{{%
- \scr at nouppercase
- \headfont\footfont\strut \if at twoside #4\else #5\fi}}%
- \botfoot at rule{#6}{#7}}\hskip\@evenfootshift\hss}%
-}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% We now define the rules used at head and foot.
-% \begin{macro}{\topfoot at rule}
-% \begin{macrocode}
-\newcommand\topfoot at rule[2]{%
- \@tempdima\baselineskip\advance\@tempdima by-.7\normalbaselineskip
- \advance\@tempdima by -#2
- \vskip\@tempdima\hf at rule{#1}{#2}{\@footwidth}{footabove}%
- \vskip-\@tempdima}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\botfoot at rule}
-% \begin{macrocode}
-\newcommand\botfoot at rule[2]{%
- \@tempdima-\baselineskip\advance\@tempdima by .3\normalbaselineskip
- \advance\@tempdima by #2
- \vskip\@tempdima\hf at rule{#1}{#2}{\@footwidth}{footbelow}%
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\hf at rule}
-% \changes{v1.3}{2001/03/30}{New, third parameter ``boxwidth''}
-% \changes{v2.0f}{2001/06/23}{Rule can be adjusted at inner margine,
-% centered or adjusted at outer margine}
-% \changes{v2.2}{2004/07/05}{Last parameter of the rule tells, if it is a
-% headabove, headbelow, footabove or footbelow rule}
-% \changes{v2.2}{2005/07/05}{Precommands before the rules are allowed}
-% \changes{v2.2}{2005/07/05}{Macro is not longer long}
-% \changes{v2.2b}{2005/08/31}{No even alignment at oneside}
-% \begin{macrocode}
-\newcommand*{\hf at rule}[4]{%
- \setlength{\@tempdimb}{#1}
- \begingroup
- \csname scr at pre@#4 at line\endcsname
- \if at twoside
- \ifodd\c at page
- \edef\@tempa{\hfline at adjust}%
- \else
- \@tempcnta=2\advance\@tempcnta -\hfline at adjust
- \edef\@tempa{\the\@tempcnta}%
- \fi
- \else
- \edef\@tempa{\hfline at adjust}%
- \fi
- \ifnum\@tempa=1
- \setlength{\@tempdimb}{.5\@tempdimb}%
- \fi
- \hb at xt@#3{%
- \ifnum\@tempa>0
- \hfill%
- \llap{\vrule\@depth#2\@height\z@\@width\@tempdimb}%
- \fi
- \ifnum\@tempa<2
- \rlap{\vrule\@depth#2\@height\z@\@width\@tempdimb}%
- \hfill%
- \fi
- }%
- \endgroup
-}
-% \end{macrocode}
-% \begin{macro}{\scr at pre@headabove at line}
-% \changes{v2.2}{2004/07/05}{New internal}
-% \begin{macro}{\scr at fnt@headtopline}
-% \changes{v2.2}{2004/07/05}{New KOMA-Script font command}
-% \begin{macro}{\scr at pre@headbelow at line}
-% \changes{v2.2}{2004/07/05}{New internal}
-% \begin{macro}{\scr at fnt@headsepline}
-% \changes{v2.2}{2004/07/05}{New KOMA-Script font command}
-% \begin{macro}{\scr at pre@footabove at line}
-% \changes{v2.2}{2004/07/05}{New internal}
-% \begin{macro}{\scr at fnt@footsepline}
-% \changes{v2.2}{2004/07/05}{New KOMA-Script font command}
-% \begin{macro}{\scr at pre@footbelow at line}
-% \changes{v2.2}{2004/07/05}{New internal}
-% \begin{macro}{\scr at fnt@footbottomrule}
-% \changes{v2.2}{2004/07/05}{New KOMA-Script font command}
-% \begin{macro}{\scr at fnt@instead at footbotline}
-% \changes{v2.2}{2004/07/05}{New KOMA-Script font command}
-% \begin{macrocode}
-\newcommand*{\scr at pre@headabove at line}{}
-\newcommand*{\scr at fnt@headtopline}{\scr at pre@headabove at line}
-\newcommand*{\scr at pre@headbelow at line}{}
-\newcommand*{\scr at fnt@headsepline}{\scr at pre@headbelow at line}
-\newcommand*{\scr at pre@footabove at line}{}
-\newcommand*{\scr at fnt@footsepline}{\scr at pre@footabove at line}
-\newcommand*{\scr at pre@footbelow at line}{}
-\newcommand*{\scr at fnt@footbottomline}{\scr at pre@footbelow at line}
-\newcommand*{\scr at fnt@instead at footbotline}{footbottomline}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% Using these definitions, we can define the testing macros.
-%
-% \begin{macro}{\newpagestyle}
-% First the simple star/starless-selection:
-% \begin{macrocode}
-\def\newpagestyle{%
-% \end{macrocode}
-% We have to decide, whether it is a my-version or not:
-% \begin{macrocode}
- \@ifstar
- {\@newpagestyle[-]}%
- {\@newpagestyle[+]}}
-% \end{macrocode}
-% \begin{macro}{\@newpagestyle}
-% There we have to distinguish, whether the pagestyle is already
-% defined or not.
-% \begin{macrocode}
-\def\@newpagestyle[#1]#2#3#4{%
- \expandafter\ifx\csname ps@#2\endcsname\relax
-% \end{macrocode}
-% Then we can use the already defined |\@defpagestyle|.
-% \begin{macrocode}
- \@defpagestyle[#1]{#2}{#3}{#4}%
- \else
- \PackageError
- {scrpage2}%
- {Your command was ignored}%
- {There is already a pagestyle named ``#1''.\MessageBreak%
- Use \protect\defpagestyle\space, \protect\renewpagestyle or
- \protect\providepagestyle.}%
- \fi
-}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\renewpagestyle}
-% First the simple star/starless-selection:
-% \begin{macrocode}
-\def\renewpagestyle{%
-% \end{macrocode}
-% We have to decide, whether it is a my-version or not:
-% \begin{macrocode}
- \@ifstar
- {\@renewpagestyle[-]}%
- {\@renewpagestyle[+]}}
-% \end{macrocode}
-% \begin{macro}{\@renewpagestyle}
-% \changes{v1.2a}{1996/12/07}{Avoid to define pagestyle as \cs{relax}
-% if it wasn't defined (Thanks to Bernd).}
-% There we have to distinguish, whether the pagestyle is already
-% defined or not.
-% \begin{macrocode}
-\def\@renewpagestyle[#1]#2#3#4{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname ps@#2\endcsname\relax
- \PackageError
- {scrpage2}%
- {Your command was ignored}%
- {There is no pagestyle named ``#1''.\MessageBreak%
- Use \protect\defpagestyle, \protect\newpagestyle or
- \protect\providepagestyle.}%
- \else
-% \end{macrocode}
-% Then we can use the already defined |\@defpagestyle|.
-% \begin{macrocode}
- \@defpagestyle[#1]{#2}{#3}{#4}%
- \fi
-}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\providepagestyle}
-% First the simple star/starless-selection:
-% \begin{macrocode}
-\def\providepagestyle{%
-% \end{macrocode}
-% We have to decide, whether it is a my-version or not:
-% \begin{macrocode}
- \@ifstar
- {\@providepagestyle[-]}%
- {\@providepagestyle[+]}}
-% \end{macrocode}
-% \begin{macro}{\@providepagestyle}
-% There we have to distinguish, whether the pagestyle is already
-% defined or not.
-% \begin{macrocode}
-\def\@providepagestyle[#1]#2#3#4{%
- \expandafter\ifx\csname ps@#2\endcsname\relax
-% \end{macrocode}
-% Then we can use the already defined |\@defpagestyle|.
-% \begin{macrocode}
- \@defpagestyle[#1]{#2}{#3}{#4}%
- \else
- \PackageInfo
- {scrpage2}%
- {\protect\providepagestyle\protect{#1\protect} ignored.}%
- \fi
-}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-%
-% \subsection{User-Pagestyle-Definition-Interface}
-% The pagestyle-definition-interface for users is much easier than the
-% expert-version. Using the expert-macros, the definition is easy, too.
-%
-% \begin{macro}{\deftripstyle}
-% \begin{macrocode}
-% \end{macrocode}
-% At version 1 we define the selection of star- or starless-version first:
-% \begin{macrocode}
-\def\deftripstyle{%
- \@ifstar
- {\@deftripstyle[-]}%
- {\@deftripstyle[+]}}
-% \end{macrocode}
-% \end{macro}
-% Next we check, if there is an optional argument:
-% \begin{macro}{\@deftripstyle}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macrocode}
-\def\@deftripstyle[#1]#2{%
- \kernel at ifnextchar[%]
- {\@@deftripstyle[#1]{#2}}%
- {\@@deftripstyle[#1]{#2}[\z@]}}
-% \end{macrocode}
-% \end{macro}
-% or perhaps two optional arguments:
-% \begin{macro}{\@@deftripstyle}
-% \begin{macrocode}
-\def\@@deftripstyle[#1]#2[#3]{%
-% \end{macrocode}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% Ok, now we have the problem, that there can be only 9 arguments. So we
-% have to distinguish the star-versions by a macro:
-% \begin{macrocode}
- \def\@tempa{#1}%
- \kernel at ifnextchar[%]
- {\@@@deftripstyle#2[#3]}%
- {\@@@deftripstyle#2[\z@][#3]}}
-% \end{macrocode}
-% \end{macro}
-% Now the main-definition:
-% \begin{macro}{\@@@deftripstyle}
-% \begin{macrocode}
-\def\@@@deftripstyle#1[#2][#3]#4#5#6#7#8#9{%
- \def\@tempb{+}%
- \ifx\@tempa\@tempb
- \defpagestyle{#1}%
- {(\@headwidth,#2)%
- {\rlap{#6}\hfill{#5}\hfill\llap{#4}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- (\@headwidth,#3)}%
- {(\@footwidth,#3)%
- {\rlap{#9}\hfill{#8}\hfill\llap{#7}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- (\@footwidth,#2)}%
- \else
- \defpagestyle*{#1}%
- {(\@headwidth,#2)%
- {\rlap{#6}\hfill{#5}\hfill\llap{#4}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- (\@headwidth,#3)}%
- {(\@footwidth,#3)%
- {\rlap{#9}\hfill{#8}\hfill\llap{#7}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- (\@footwidth,#2)}%
- \fi
-}
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \subsection{Automark or not}
-% This is new since version 2.
-% \begin{macro}{\automark}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0c}{2001/06/07}{Use of \cs{MakeMarkcase}}
-% \changes{v2.0g}{2001/06/25}{Use of \cs{manualmark}}
-% \changes{v2.0i}{2001/08/17}{Warning, if arguments are mixed up}
-% \changes{v2.0i}{2001/08/17}{\cs{markboth} behavior fixed}
-% \changes{v2.0i}{2001/08/17}{Use of \cs{if at autooneside}}
-% \changes{v2.1a}{2002/10/30}{Switch on \cs{if at automark}}
-% This macro activates automatic mark. Is has two arguments. The
-% first, optional argument is the sectioning level name of the mark at
-% left pages, the second, not optional argument is the same at right
-% pages. At oneside mode all pages are right.
-% \begin{macro}{\@iflevelok}
-% \changes{v2.0i}{2001/08/17}{New}
-% \begin{macro}{\markleft}
-% \changes{v2.0i}{2001/08/17}{New}
-% \begin{macro}{\@markleft}
-% \changes{v2.0i}{2001/08/17}{New}
-% To define \cs{automark} we also need these three makros. The first
-% one decides, if level of second parameter is less than level of
-% first parameter and does then third or fourth parameter.
-% \cs{markleft} and \cs{@markleft} are similar to \cs{markright} and
-% \cs{@markright} at \LaTeX{} kernel.
-% \begin{macrocode}
-\newcommand*{\@iflevelok}[4]{%
- \begingroup
- \edef\@tempa{#1}\ifx\@tempa\@empty\def\@tempa{\endgroup #3}\else
- \def\@tempa{\csname #1level\endcsname}%
- \def\@tempb{\csname #2level\endcsname}%
- \ifnum \@tempa>\@tempb
- \def\@tempa{\endgroup#3}%
- \else
- \def\@tempa{\endgroup#4}%
- \fi\fi\@tempa}
-\providecommand{\markleft}[1]{%
- \begingroup
- \let\label\relax \let\index\relax \let\glossary\relax
- \expandafter\@markleft\@themark {#1}%
- \@temptokena \expandafter{\@themark}%
- \mark{\the\@temptokena}%
- \endgroup
- \if at nobreak\ifvmode\nobreak\fi\fi}
-\providecommand{\@markleft}[3]{\@temptokena {#2}%
- \unrestored at protected@xdef\@themark{{#3}{\the\@temptokena}}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \changes{v2.2a}{2004/09/05}{all changes of helper macros and switches are
-% local to fix e.g.\ twocolumn problem with \cs{part}}
-% \begin{macrocode}
-\newcommand*{\automark}[2][\@empty]{%
- \manualmark
- \@automarktrue
- \begingroup
- \edef\@tempa{#2}\ifx\@tempa\@empty
- \endgroup
- \PackageWarning{scrpage2}%
- {\string\automark\space with empty obligatory argument}%
- \else
- \endgroup
- \expandafter\def\csname #2mark\endcsname##1{%
- \begingroup
- \def\@tempa{\csname #2level\endcsname}%
- \@tempswafalse
- \ifnum \c at secnumdepth <\@tempa\else\if at mainmatter
- \@tempswatrue
- \fi\fi
- \edef\@tempa{#1}%
- \if at twoside\edef\@tempb{#2}\else\let\@tempb\@tempa\fi
- \ifx\@tempa\@tempb
- \if at tempswa
- \@mkboth{\MakeMarkcase{\csname #2markformat\endcsname ##1}}%
- {\MakeMarkcase{\csname #2markformat\endcsname ##1}}%
- \else%
- \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
- \fi
- \else
- \if at tempswa
- \@iflevelok{#1}{#2}{%
- \@mkboth{\MakeMarkcase{\csname #2markformat\endcsname
- ##1}}{}}{%
- \ifx\@mkboth\markboth\markleft{\MakeMarkcase{\csname
- #2markformat\endcsname ##1}}%
- \fi}
- \else
- \@iflevelok{#1}{#2}{%
- \@mkboth{\MakeMarkcase{##1}}{}}{%
- \ifx\@mkboth\markboth\markleft{\MakeMarkcase{##1}}\fi}%
- \fi
- \fi
- \endgroup
- }
- \fi
- \begingroup
- \edef\@tempa{#1}\edef\@tempb{#2}%
- \if at autooneside\if at twoside\else\let\@tempa\@empty\fi\fi
- \ifx\@tempa\@empty
- \endgroup
- \else
- \ifx\@tempa\@tempb
- \endgroup
- \else
- \endgroup
- \expandafter\def\csname #1mark\endcsname##1{%
- \begingroup
- \def\@tempa{\csname #1level\endcsname}%
- \@tempswafalse
- \ifnum \c at secnumdepth <\@tempa\else\if at mainmatter
- \@tempswatrue
- \fi\fi
- \if at tempswa
- \@iflevelok{#1}{#2}{%
- \ifx\@mkboth\markboth
- \markright{\MakeMarkcase{\csname #1markformat\endcsname
- ##1}}%
- \fi}{%
- \@mkboth{}{\MakeMarkcase{\csname #1markformat\endcsname
- ##1}}}%
- \else
- \@iflevelok{#1}{#2}{%
- \ifx\@mkboth\markboth
- \markright{\MakeMarkcase{##1}}%
- \fi}{%
- \@mkboth{}{\MakeMarkcase{##1}}}%
- \fi
- \endgroup
- }
- \fi\fi%
- \let\@mkboth\markboth
-}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\manualmark}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0g}{2001/06/25}{also deactivating \cs{...mark}}
-% \changes{v2.1a}{2002/10/30}{Switch off \cs{if at automark}}
-% This macro switchs to the manual set of marks (using \cs{markboth}
-% and \cs{markright}. This is very simple, we only have to deaktivate
-% the mark macros.
-% \begin{macrocode}
-\newcommand*{\manualmark}{%
- \if at chapter\let\chaptermark\@gobble\fi
- \let\sectionmark\@gobble
- \let\subsectionmark\@gobble
- \let\subsubsectionmark\@gobble
- \let\paragraphmark\@gobble
- \let\subparagraphmark\@gobble
- \let\@mkboth\@gobbletwo
- \@automarkfalse
-}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\partlevel}
-% \changes{v2.2}{2004/07/05}{New}
-% \changes{v2.4}{2009/11/11}{part level is always -1}
-% \begin{macro}{\chapterlevel}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\sectionlevel}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\subsectionlevel}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\subsubsectionlevel}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\paragraphlevel}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\subparagraphlevel}
-% \changes{v2.0}{2001/04/20}{New}
-% At \cs{automark} we use some macros to get the numeric level of a
-% sectioning name. We simply define these:
-% \begin{macrocode}
-\newcommand*{\partlevel}{-1}
-\newcommand*{\chapterlevel}{0}
-\newcommand*{\sectionlevel}{1}
-\newcommand*{\subsectionlevel}{2}
-\newcommand*{\subsubsectionlevel}{3}
-\newcommand*{\paragraphlevel}{4}
-\newcommand*{\subparagraphlevel}{5}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\MakeMarkcase}
-% \changes{v2.0m}{2002/02/05}{\texttt{scrlttr2} is a known class}
-% At \cs{automark} we use a new macro to enable usability of
-% \cs{MakeUppercase} at the head-marks. We set this macro to
-% \cs{MakeUppercase} if one of the standard-classes was loaded:
-% \begin{macrocode}
-\@ifundefined{MakeMarkcase}{%
- \@ifclassloaded{scrbook}{\let\MakeMarkcase\relax}{%
- \@ifclassloaded{scrreprt}{\let\MakeMarkcase\relax}{%
- \@ifclassloaded{scrartcl}{\let\MakeMarkcase\relax}{%
- \@ifclassloaded{scrlttr2}{\let\MakeMarkcase\relax}{%
- \@ifclassloaded{book}{}{%
- \@ifclassloaded{report}{}{%
- \@ifclassloaded{article}{}{%
- \PackageWarningNoLine{scrpage2}{%
- use of scrpage2 with unknown class.\MessageBreak
- Please mail to markus.kohm at gmx.de, if
- headmarks\MessageBreak
- are lower case without use of scrpage2}}}}%
- \let\MakeMarkcase\MakeUppercase}}}}}{}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\scrheadings at style}
-% \changes{v2.0g}{2001/06/25}{New}
-% \changes{v2.0m}{2002/02/05}{Take care of class \texttt{scrlttr2}}
-% This macro defines, which style for scrheadings should be used. If
-% it is not defined, we have to define it in a propper way.
-% \begin{macrocode}
-\@ifundefined{scrheadings at style}{%
- \@ifclassloaded{scrbook}{\def\scrheadings at style{koma}}{%
- \@ifclassloaded{scrreprt}{\def\scrheadings at style{koma}}{%
- \@ifclassloaded{scrartcl}{\def\scrheadings at style{koma}}{%
- \@ifclassloaded{scrlttr2}{\def\scrheadings at style{koma}}{%
- \def\scrheadings at style{standard}}}}}}{}
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \subsection{Width of head and foot}
-% \begin{macro}{\setheadwidth}
-% \changes{v1.3}{2001/03/30}{New}
-% \begin{macro}{\setfootwidth}
-% \changes{v1.3}{2001/03/30}{New}
-% \begin{macro}{\set at hf@width}
-% \changes{v1.3}{2001/03/30}{New}
-% \changes{v1.3a}{2001/05/31}{symbolic values ``paper'', ``text'',
-% ``textwidthmarginpar''}
-% \changes{v2.0b}{2001/05/31}{symbolic values ``paper'', ``text'',
-% ``textwidthmarginpar''}
-% \changes{v2.0c}{2001/06/07}{error fix at warning}
-% \begin{macro}{\settowidthof}
-% \changes{v2.0e}{2001/06/22}{New}
-% \begin{macro}{\deftowidthof}
-% \changes{v2.0e}{2001/06/22}{New}
-% \changes{v2.0f}{2001/06/23}{new symbolic values ``autohead'' and
-% ``autofoot''}
-% \changes{v2.0i}{2001/08/17}{new symbolic value ``page''}
-% \changes{v2.0k}{2001/09/28}{\cs{pagewidth} korrigiert}
-% \changes{v2.1b}{2003/05/31}{more save existance test}
-% \changes{v2.2}{2004/07/05}{value ``foot'' fixed}
-% Until version 1.3, head and foot of a page had same width like the
-% text block. Since version 1.3 this was changed. Now the head and
-% foot have their own width and an optional shift relative to the text
-% part of the page. This shift can be positive or negative. We set
-% the width and shift with one macro and save them at macros. The set
-% macros have an optional argument: the shift.
-%
-% For definition of symbolic length values there is the macro
-% \cs{settowidthof}. And to define a macro with this value, there
-% is \cs{deftowidthof}.
-% \begin{macrocode}
-\newcommand*{\settowidthof}[2]{%
- \edef\@tempa{#2}%
- \edef\@tempb{paper}\ifx\@tempa\@tempb
- \setlength{#1}{\paperwidth}%
- \else\edef\@tempb{text}\ifx\@tempa\@tempb
- \setlength{#1}{\textwidth}%
- \else\edef\@tempb{textwithmarginpar}\ifx\@tempa\@tempb
- \setlength{#1}{\textwidth}%
- \addtolength{#1}{\marginparwidth}%
- \addtolength{#1}{\marginparsep}%
- \else\edef\@tempb{head}\ifx\@tempa\@tempb
- \setlength{#1}{\@headwidth}%
- \else\edef\@tempb{foot}\ifx\@tempa\@tempb
- \setlength{#1}{\@footwidth}%
- \else\edef\@tempb{headtopline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr at headabove@linelength}%
- \else\edef\@tempb{headsepline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr at headbelow@linelength}%
- \else\edef\@tempb{footsepline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr at footabove@linelength}%
- \else\edef\@tempb{footbotline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr at footbelow@linelength}%
- \else\edef\@tempb{page}\ifx\@tempa\@tempb
- \setlength{#1}{\paperwidth}%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname ta at bcor\endcsname\relax\else
- \addtolength{#1}{-\ta at bcor}%
- \fi
- \else
- \setlength{#1}{#2}%
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
-}
-\newcommand*{\deftowidthof}[2]{%
- \edef\@tempa{#2}\edef\@tempb{autohead}\ifx\@tempa\@tempb
- \expandafter\def\csname #1\endcsname{\@headwidth}%
- \else\edef\@tempb{autofoot}\ifx\@tempa\@tempb
- \expandafter\def\csname #1\endcsname{\@footwidth}%
- \else
- \settowidthof{\@tempdima}{#2}%
- \expandafter\edef\csname #1\endcsname{\the\@tempdima}%
- \fi
- \fi
-}
-\newcommand*{\setheadwidth}[2][\@empty]{%
- \set at hf@width{head}{#1}{#2} %
-}
-\newcommand*{\setfootwidth}[2][\@empty]{%
- \set at hf@width{foot}{#1}{#2}%
-}
-\newcommand*{\set at hf@width}[3]{%
- \settowidthof{\@tempdima}{#3}%
- \ifdim\@tempdima>\paperwidth
- \PackageWarning
- {scrpage2}%
- {You've set width of #1 to a value\MessageBreak
- greater than width of page!\MessageBreak%
- I`ll reduce width of #1 to width of page}%
- \setlength{\@tempdima}{\paperwidth}%
- \else
- \ifdim\@tempdima<\z@
- \PackageWarning
- {scrpage2}%
- {You've set width of #1 to negative value!\MessageBreak%
- I'll set it to 0pt}%
- \setlength{\@tempdima}{\z@}%
- \fi
- \fi
- \expandafter\edef\csname @#1width\endcsname{\the\@tempdima}%
- \edef\@tempa{#2}%
- \setlength{\@tempdima}{\textwidth}%
- \addtolength{\@tempdima}{-\csname @#1width\endcsname}%
- \ifx\@tempa\@empty
- \if at twoside
- \setlength{\@tempdimb}{.3333333333\@tempdima}%
- \else
- \setlength{\@tempdimb}{.5\@tempdima}%
- \fi
- \else
- \setlength{\@tempdimb}{#2}%
- \fi
- \addtolength{\@tempdima}{-\@tempdimb}%
- \ifdim\@tempdimb<\z@
- \setlength{\@tempdimb}{-\@tempdimb}%
- \expandafter\edef\csname @odd#1shift\endcsname{-\the\@tempdimb}%
- \else
- \expandafter\edef\csname @odd#1shift\endcsname{\the\@tempdimb}%
- \fi
- \ifdim\@tempdima<\z@
- \setlength{\@tempdima}{-\@tempdima}%
- \expandafter\edef\csname @even#1shift\endcsname{-\the\@tempdima}%
- \else
- \expandafter\edef\csname @even#1shift\endcsname{\the\@tempdima}%
- \fi
-}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\@headwidth}
-% \changes{v1.3}{2001/03/30}{New}
-% \changes{v2.1}{2002/03/28}{use of option \texttt{mpinclude}}
-% \begin{macro}{\@footwidth}
-% \changes{v1.3}{2001/03/30}{New}
-% \changes{v2.1}{2002/03/28}{use of option \texttt{mpinclude}}
-% \begin{macro}{\@oddheadshift}
-% \changes{v1.3}{2001/03/30}{New}
-% \begin{macro}{\@evenheadshift}
-% \changes{v1.3}{2001/03/30}{New}
-% \begin{macro}{\@oddfootshift}
-% \changes{v1.3}{2001/03/30}{New}
-% \begin{macro}{\@evenfootshift}
-% \changes{v1.3}{2001/03/30}{New}
-% The values of width and shift of head and foot are saved at internal
-% macros.
-% \begin{macrocode}
-\newcommand*{\@headwidth}{\textwidth}%
-\newcommand*{\@oddheadshift}{\z@}%
-\newcommand*{\@evenheadshift}{\z@}%
-\newcommand*{\@footwidth}{\textwidth}%
-\newcommand*{\@oddfootshift}{\z@}%
-\newcommand*{\@evenfootshift}{\z@}%
-% \end{macrocode}
-% If option \texttt{mpinclude} was used, we use a special trick to set
-% width of head and foot but only if the user doesn't:
-% \begin{macrocode}
-\if at mincl
- \renewcommand*{\@headwidth}{}%
- \renewcommand*{\@footwidth}{}%
- \AtBeginDocument{%
- \ifx\@headwidth\@empty
- \setheadwidth[0pt]{textwithmarginpar}%
- \fi
- \ifx\@footwidth\@empty
- \setfootwidth[0pt]{textwithmarginpar}%
- \fi
- }
-\fi
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \subsection{Fonts}
-% \begin{macro}{\pnumfont}
-% We have to define a macro defining the font, used by |\pagemark|. Because
-% of this macro may already be defined by a \textsf{KOMA}-script-class, we
-% have to do this, using |\providecommand|
-% \begin{macrocode}
-\providecommand*{\pnumfont}{\normalfont}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\headfont}
-% There is also a macro used by |\@evenhead|, |\@oddhead| and |\@evenfoot|,
-% |\@oddfoot|:
-% \begin{macrocode}
-\providecommand*{\headfont}{\normalfont\slshape}
-\def\scr at fnt@wrn at pagehead#1{%
- `pagehead' is only an alias of `pageheadfoot'.\MessageBreak
- Font of page foot may also be changed%
-}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\footfont}
-% \changes{v2.2f}{2008/02/14}{New}
-% \begin{macro}{\scr at fnt@pagefoot}
-% \changes{v2.2f}{2008/02/14}{New (internal)}
-% \begin{macro}{\scr at fnt@wrn at pagefoot}
-% \changes{v2.2f}{2008/02/14}{deactivated}
-% There is also a macro used by |\@evenfoot|, |\@oddfoot| after |\headfont|:
-% \begin{macrocode}
-\providecommand*{\footfont}{\normalfont}
-\providecommand*{\scr at fnt@pagefoot}{\footfont}
-\let\scr at fnt@wrn at pagefoot\relax
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \subsection{Length and thickness of lines at head and foot}
-% \begin{macro}{\setheadtopline}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0d}{2001/06/19}{\texttt{headtop} changed into
-% \texttt{headabove}}
-% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''}
-% \begin{macro}{\setheadsepline}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0d}{2001/06/19}{\texttt{headbot} changed into
-% \texttt{headbelow}}
-% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''}
-% \begin{macro}{\setfootsepline}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0d}{2001/06/19}{\texttt{foottop} changed into
-% \texttt{footabove}}
-% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''}
-% \begin{macro}{\setfootbotline}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0d}{2001/06/19}{\texttt{footbot} changed into
-% \texttt{footbelow}}
-% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''}
-% Since version 2 there are new macros to set the length and
-% thickness of the lines at head and foot. Wie use macros not
-% dimensions, because the amount of dimensions is very small at \TeX.
-% \begin{macrocode}
-\newcommand*{\setheadtopline}{\scr at setline{head}{above}}
-\newcommand*{\setheadsepline}{\scr at setline{head}{below}}
-\newcommand*{\setfootsepline}{\scr at setline{foot}{above}}
-\newcommand*{\setfootbotline}{\scr at setline{foot}{below}}
-% \end{macrocode}
-% \begin{macro}{\scr at setline}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\@scr at setline}
-% \changes{v2.0d}{2001/06/19}{symbolic values implemented}
-% \begin{macro}{\@@scr at setline}
-% \changes{v2.0d}{2001/06/18}{macro name fixed}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\@scr at set@pre at line}
-% \changes{v2.2}{2004/07/05}{New internal}
-% The real change of the lines is done with the macros
-% \cs{scr at setline}, \cs{@scr at setline} and \cs{@@scr at setline}:
-% \begin{macrocode}
-\def\scr at setline#1#2{%
- \kernel at ifnextchar[%]
- {\@scr at setline{#1}{#2}}{\@@scr at setline{#1#2}}%
-}
-\def\@scr at setline#1#2[#3]{%
- \edef\@tempa{#3}\edef\@tempa{auto}\ifx\@tempa\@tempb
- \deftowidthof{scr@#1#2 at linelength}{#3#1}%
- \else
- \deftowidthof{scr@#1#2 at linelength}{#3}%
- \fi
- \@@scr at setline{#1#2}%
-}
-\def\@@scr at setline#1#2{%
- \edef\@tempa{#2}\edef\@tempb{current}\ifx\@tempa\@empty\else
- \ifx\@tempa\@tempb\else
- \setlength{\@tempdima}{#2}%
- \expandafter\edef\csname scr@#1 at linethickness\endcsname%
- {\the\@tempdima}%
- \fi\fi
- \kernel at ifnextchar[%]
- {\@src at set@pre at line{#1}}{}%
-}
-\def\@src at set@pre at line#1[#2]{%
- \expandafter\def\csname scr at pre@#1 at line\endcsname{#2}%
-}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \subsection{Extended multilanguage formats}
-% \begin{macro}{\partmarkformat}
-% \changes{v2.2}{2004/07/05}{New}
-% \begin{macro}{\chaptermarkformat}
-% \changes{v1.1}{1995/06/27}{Space after chapternumber increased.}
-% \begin{macro}{\sectionmarkformat}
-% \changes{v1.1}{1995/06/27}{Space after sectionnumber increased.}
-% \begin{macro}{\subsectionmarkformat}
-% \changes{v1.1}{1995/06/27}{Space after subsectionnumber increased.}
-% \begin{macro}{\subsubsectionmarkformat}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\paragraphmarkformat}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\subparagraphmarkformat}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\@seccntmarkformat}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\@seccntformat}
-% \changes{v2.0}{2001/04/20}{New}
-% There are some macros to handle languages like Chinese, Japanese or Korean.
-% These macros were defined first by Werner Lemberg at his CJK-bundle. See
-% |scrclass.dtx| for further information.
-% \begin{macrocode}
-\providecommand{\partmarkformat} {\partname\ \thepart. \ }
-\if at chapter
- \providecommand{\chaptermarkformat} {\@chapapp\ \thechapter. \ }
- \providecommand{\sectionmarkformat} {\thesection. \ }
- \providecommand{\subsectionmarkformat} {\@seccntmarkformat{subsection}}
-\else
- \providecommand{\sectionmarkformat} {\thesection\quad}
- \providecommand{\subsectionmarkformat} {\thesubsection\quad}
-\fi
-\providecommand{\subsubsectionmarkformat}{\@seccntmarkformat{subsubsection}}
-\providecommand{\paragraphmarkformat} {\@seccntmarkformat{paragraph}}
-\providecommand{\subparagraphmarkformat} {\@seccntmarkformat{subparagraph}}
-\providecommand{\@seccntmarkformat}[1] {\@seccntformat{#1}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \subsection{Definition of default pagestyles}
-%
-% \begin{macro}{\ps at save@plain}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0b}{2001/05/31}{use this instead of
-% \cs{ps at standardplain}}
-% We define two default pagestyles, which can be used instead of the
-% standard pagestyles. The two pagestyles are something like a
-% family. A pagestyle for \emph{normal} pages with head and foot and a
-% pagestyle for \emph{plain} pages with not so much head and foot. So
-% we have to redefine the standard pagestyle \texttt{plain}. But maybe
-% someone want to use the old standard pagestyle. So we first define
-% new names for old pagestyles.
-% \begin{macrocode}
-\newcommand*{\ps at save@plain}{}
-\let\ps at save@plain\ps at plain
-\newcommand*{\ps at use@plain}{\let\save@@mkboth\@mkboth
- \ps at save@plain
- \let\@mkboth\save@@mkboth}
-\let\ps at plain\ps at use@plain
-% \end{macrocode}
-% \begin{macro}{\ps at save@headings}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0b}{2001/05/31}{use this instead of
-% \cs{ps at standardheadings}}
-% \begin{macro}{\ps at save@myheadings}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0b}{2001/05/31}{use this instead of
-% \cs{ps at standardmyheadings}}
-% \begin{macro}{\ps at headings}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\ps at myheadings}
-% \changes{v2.0}{2001/04/20}{New}
-% If standard pagestyle \texttt{headings} or \texttt{myheadings} is
-% used, also standard pagestyle \texttt{use at plain} should be
-% used. So we also define new names for the other old pagestyles and
-% new pagestyles with the old names, doing the switch back for the
-% plain pagestyle. These are defined even if the pagestyles are
-% unknown.
-% \begin{macrocode}
-\newcommand*{\ps at save@headings}{}
-\let\ps at save@headings\ps at headings
-\newcommand*{\ps at save@myheadings}{}
-\let\ps at save@myheadings\ps at myheadings
-\def\ps at headings{%
- \PackageWarning{scrpage2}%
- {you've used pagestyle ``headings''.\MessageBreak
- You should not use this pagestyle with a\MessageBreak
- scrpage2-pagestyle!\MessageBreak
- You should use pagestyle ``useheadings'' instead\MessageBreak}%
- \let\ps at plain\ps at save@plain%
- \ps at save@headings\@automarktrue}
-\def\ps at myheadings{%
- \PackageWarning{scrpage2}%
- {you've used pagestyle ``myheadings''.\MessageBreak
- You should not use this pagestyle with a\MessageBreak
- scrpage2-pagestyle!\MessageBreak
- You should use pagestyle ``useheadings'' instead\MessageBreak}%
- \let\ps at plain\ps at save@plain%
- \ps at save@myheadings\@automarkfalse}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \begin{macro}{\ps at useheadings}
-% \changes{v2.0b}{2001/05/31}{New}
-% \changes{v2.0m}{2002/02/05}{Fatal bug (\cs{mkboth} instead of
-% \cs{@mkboth}) fixed}
-% \changes{v2.1a}{2002/10/30}{Use of switch \cs{if at automark}}
-% This is the pagestyle, you should use instead of \texttt{headings}
-% or \texttt{myheadings}. If you are using manual marks, this behaves
-% like pagestyle \texttt{myheadings}. If you are using automatic
-% marks, this behaves like headings, but without changing
-% \cs{chaptermark}, \cs{sectionmark} or \cs{subsectionmark}.
-% \begin{macrocode}
-\newcommand*{\ps at useheadings}{%
- \if at automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
- \let\ps at plain\ps at use@plain
- \let\save@@mkboth\@mkboth
- \let\save at chaptermark\chaptermark
- \let\save at sectionmark\sectionmark
- \let\save at subsectionmark\subsectionmark
- \ifx\@mkboth\markboth\ps at save@headings\else\ps at save@myheadings\fi
- \let\@mkboth\save@@mkboth
- \let\chaptermark\save at chaptermark
- \let\sectionmark\save at sectionmark
- \let\subsectionmark\save at subsectionmark
-}
-% \end{macrocode}
-% Note: Because of saving \cs{@mkboth}, \cs{chaptermark},
-% \cs{sectionmark} and \cs{subsection} before changing the pagestyle
-% and restore them after changing the pagestyle it does not matter, if
-% we set pagestyle \texttt{headings} or \texttt{myheadings}. So it
-% would be possible to remove the \cs{ifx}\dots\cs{fi}-line above and
-% simply use \cs{ps at save@headings} or \cs{ps at save@myheadings} instead
-% of.
-% \end{macro}
-%
-%
-% \begin{macro}{\ps at scrplain}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0a}{2001/04/24}{\cs{strut} inserted}
-% \changes{v2.0f}{2001/06/23}{\cs{strut} inserted}
-% \changes{v2.1c}{2004/02/07}{thickness of footbelow line fixed}
-% \begin{macro}{\scrplain at even@left at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at even@middle at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at even@right at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at odd@left at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at odd@middle at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at odd@right at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at even@left at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at even@middle at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at even@right at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at odd@left at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at odd@middle at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrplain at odd@right at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% After this, we can define the new pagestyles, first a new plain
-% one. It sould be variable and so we use macros to define the parts.
-% \begin{macrocode}
-\newcommand*{\ps at scrplain}{\let\ps at plain\ps@@scrplain\ps at plain}
-\newpagestyle{@scrplain}
-{%
- (\scrplain at headabove@linelength,\scr at headabove@linethickness)%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrplain at even@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering\strut
- \scrplain at even@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft
- \strut\scrplain at even@right at head\strut}}}%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrplain at odd@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering
- \strut\scrplain at odd@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft
- \strut\scrplain at odd@right at head\strut}}}%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrplain at odd@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering
- \strut\scrplain at odd@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft
- \strut\scrplain at odd@right at head\strut}}}%
- (\scrplain at headbelow@linelength,\scr at headbelow@linethickness)
-}{%
- (\scrplain at footabove@linelength,\scr at footabove@linethickness)
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrplain at even@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrplain at even@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrplain at even@right at foot\strut}}}%
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrplain at odd@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrplain at odd@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrplain at odd@right at foot\strut}}}%
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrplain at odd@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrplain at odd@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrplain at odd@right at foot\strut}}}%
- (\scrplain at footbelow@linelength,\scr at footbelow@linethickness)
-}
-\newcommand*{\scrplain at even@left at head}{}
-\newcommand*{\scrplain at even@middle at head}{}
-\newcommand*{\scrplain at even@right at head}{}
-\newcommand*{\scrplain at odd@left at head}{}
-\newcommand*{\scrplain at odd@middle at head}{}
-\newcommand*{\scrplain at odd@right at head}{}
-\newcommand*{\scrplain at even@left at foot}{}
-\newcommand*{\scrplain at even@middle at foot}{}
-\newcommand*{\scrplain at even@right at foot}{}
-\newcommand*{\scrplain at odd@left at foot}{}
-\newcommand*{\scrplain at odd@middle at foot}{}
-\newcommand*{\scrplain at odd@right at foot}{}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\ps at scrheadings}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v2.0a}{2001/04/24}{\cs{strut} inserted}
-% \changes{v2.0f}{2001/06/23}{\cs{strut} inserted}
-% \begin{macro}{\scrheadings at even@left at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at even@middle at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at even@right at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at odd@left at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at odd@middle at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at odd@right at head}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at even@left at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at even@middle at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at even@right at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at odd@left at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at odd@middle at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% \begin{macro}{\scrheadings at odd@right at foot}
-% \changes{v2.0}{2001/04/20}{New}
-% We also define define a new headings one. It sould be variable and
-% so we use macros to define the parts. But we need an \emph{also
-% action}, so we first define a inner pagestyle and then use this at a
-% outer one (definition is done in reverse order):
-% \begin{macrocode}
-\newcommand*{\ps at scrheadings}{\let\ps at plain\ps at scrplain\ps@@scrheadings}
-\newpagestyle{@scrheadings}
-{%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrheadings at even@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering
- \strut\scrheadings at even@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft%
- \strut\scrheadings at even@right at head\strut}}}%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrheadings at odd@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering
- \strut\scrheadings at odd@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft%
- \strut\scrheadings at odd@right at head\strut}}}%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrheadings at odd@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering
- \strut\scrheadings at odd@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft
- \strut\scrheadings at odd@right at head\strut}}}}%
-{%
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrheadings at even@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrheadings at even@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrheadings at even@right at foot\strut}}}%
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrheadings at odd@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrheadings at odd@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrheadings at odd@right at foot\strut}}}%
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrheadings at odd@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrheadings at odd@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrheadings at odd@right at foot\strut}}%
- }%
-}
-\newcommand*{\scrheadings at even@left at head}{}
-\newcommand*{\scrheadings at even@middle at head}{}
-\newcommand*{\scrheadings at even@right at head}{}
-\newcommand*{\scrheadings at odd@left at head}{}
-\newcommand*{\scrheadings at odd@middle at head}{}
-\newcommand*{\scrheadings at odd@right at head}{}
-\newcommand*{\scrheadings at even@left at foot}{}
-\newcommand*{\scrheadings at even@middle at foot}{}
-\newcommand*{\scrheadings at even@right at foot}{}
-\newcommand*{\scrheadings at odd@left at foot}{}
-\newcommand*{\scrheadings at odd@middle at foot}{}
-\newcommand*{\scrheadings at odd@right at foot}{}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \begin{macro}{\ihead}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\ohead}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\chead}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\lehead}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\lohead}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\rehead}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\rohead}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\cehead}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\cohead}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\ifoot}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\ofoot}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\cfoot}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\lefoot}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\lofoot}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\refoot}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\rofoot}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\cefoot}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% \begin{macro}{\cofoot}
-% \changes{v2.0}{2001/04/20}{New}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}%^^A
-% We also need macros to define the contents of the three part head
-% and foot. Each macro defines one of the part of head or foot of the
-% scrheadings pagestyle and optional of the scrplain pagestyle.
-% \begin{macrocode}
-\newcommand{\ihead}{\kernel at ifnextchar[{\@@lhead}{\@lhead}}
-\newcommand{\@lhead}[1]{\@rehead{#1}\@lohead{#1}}
-\newcommand{\@@lhead}[2][]{\@@rehead[{#1}]{#2}\@@lohead[{#1}]{#2}}
-\newcommand{\ohead}{\kernel at ifnextchar[{\@@rhead}{\@rhead}}
-\newcommand{\@rhead}[1]{\@lehead{#1}\@rohead{#1}}
-\newcommand{\@@rhead}[2][]{\@@lehead[{#1}]{#2}\@@rohead[{#1}]{#2}}
-\newcommand{\chead}{\kernel at ifnextchar[{\@@chead}{\@chead}}
-\newcommand{\@chead}[1]{\@cehead{#1}\@cohead{#1}}
-\newcommand{\@@chead}[2][]{\@@cehead[{#1}]{#2}\@@cohead[{#1}]{#2}}
-\newcommand{\lehead}{\kernel at ifnextchar[{\@@lehead}{\@lehead}}
-\newcommand{\@lehead}[1]{\renewcommand*{\scrheadings at even@left at head}{#1}}
-\newcommand{\@@lehead}[2][]{%
- \renewcommand*{\scrplain at even@left at head}{#1}%
- \renewcommand*{\scrheadings at even@left at head}{#2}}
-\newcommand{\lohead}{\kernel at ifnextchar[{\@@lohead}{\@lohead}}
-\newcommand{\@lohead}[1]{\renewcommand*{\scrheadings at odd@left at head}{#1}}
-\newcommand{\@@lohead}[2][]{%
- \renewcommand*{\scrplain at odd@left at head}{#1}%
- \renewcommand*{\scrheadings at odd@left at head}{#2}}
-\newcommand{\rehead}{\kernel at ifnextchar[{\@@rehead}{\@rehead}}
-\newcommand{\@rehead}[1]{\renewcommand*{\scrheadings at even@right at head}{#1}}
-\newcommand{\@@rehead}[2][]{%
- \renewcommand*{\scrplain at even@right at head}{#1}%
- \renewcommand*{\scrheadings at even@right at head}{#2}}
-\newcommand{\rohead}{\kernel at ifnextchar[{\@@rohead}{\@rohead}}
-\newcommand{\@rohead}[1]{\renewcommand*{\scrheadings at odd@right at head}{#1}}
-\newcommand{\@@rohead}[2][]{%
- \renewcommand*{\scrplain at odd@right at head}{#1}%
- \renewcommand*{\scrheadings at odd@right at head}{#2}}
-\newcommand{\cehead}{\kernel at ifnextchar[{\@@cehead}{\@cehead}}
-\newcommand{\@cehead}[1]{\renewcommand*{\scrheadings at even@middle at head}{#1}}
-\newcommand{\@@cehead}[2][]{%
- \renewcommand*{\scrplain at even@middle at head}{#1}%
- \renewcommand*{\scrheadings at even@middle at head}{#2}}
-\newcommand{\cohead}{\kernel at ifnextchar[{\@@cohead}{\@cohead}}
-\newcommand{\@cohead}[1]{\renewcommand*{\scrheadings at odd@middle at head}{#1}}
-\newcommand{\@@cohead}[2][]{%
- \renewcommand*{\scrplain at odd@middle at head}{#1}%
- \renewcommand*{\scrheadings at odd@middle at head}{#2}}
-\newcommand{\ifoot}{\kernel at ifnextchar[{\@@lfoot}{\@lfoot}}
-\newcommand{\@lfoot}[1]{\@refoot{#1}\@lofoot{#1}}
-\newcommand{\@@lfoot}[2][]{\@@refoot[{#1}]{#2}\@@lofoot[{#1}]{#2}}
-\newcommand{\ofoot}{\kernel at ifnextchar[{\@@rfoot}{\@rfoot}}
-\newcommand{\@rfoot}[1]{\@lefoot{#1}\@rofoot{#1}}
-\newcommand{\@@rfoot}[2][]{\@@lefoot[{#1}]{#2}\@@rofoot[{#1}]{#2}}
-\newcommand{\cfoot}{\kernel at ifnextchar[{\@@cfoot}{\@cfoot}}
-\newcommand{\@cfoot}[1]{\@cefoot{#1}\@cofoot{#1}}
-\newcommand{\@@cfoot}[2][]{\@@cefoot[{#1}]{#2}\@@cofoot[{#1}]{#2}}
-\newcommand{\lefoot}{\kernel at ifnextchar[{\@@lefoot}{\@lefoot}}
-\newcommand{\@lefoot}[1]{\renewcommand*{\scrheadings at even@left at foot}{#1}}
-\newcommand{\@@lefoot}[2][]{%
- \renewcommand*{\scrplain at even@left at foot}{#1}%
- \renewcommand*{\scrheadings at even@left at foot}{#2}}
-\newcommand{\lofoot}{\kernel at ifnextchar[{\@@lofoot}{\@lofoot}}
-\newcommand{\@lofoot}[1]{\renewcommand*{\scrheadings at odd@left at foot}{#1}}
-\newcommand{\@@lofoot}[2][]{%
- \renewcommand*{\scrplain at odd@left at foot}{#1}%
- \renewcommand*{\scrheadings at odd@left at foot}{#2}}
-\newcommand{\refoot}{\kernel at ifnextchar[{\@@refoot}{\@refoot}}
-\newcommand{\@refoot}[1]{\renewcommand*{\scrheadings at even@right at foot}{#1}}
-\newcommand{\@@refoot}[2][]{%
- \renewcommand*{\scrplain at even@right at foot}{#1}%
- \renewcommand*{\scrheadings at even@right at foot}{#2}}
-\newcommand{\rofoot}{\kernel at ifnextchar[{\@@rofoot}{\@rofoot}}
-\newcommand{\@rofoot}[1]{\renewcommand*{\scrheadings at odd@right at foot}{#1}}
-\newcommand{\@@rofoot}[2][]{%
- \renewcommand*{\scrplain at odd@right at foot}{#1}%
- \renewcommand*{\scrheadings at odd@right at foot}{#2}}
-\newcommand{\cefoot}{\kernel at ifnextchar[{\@@cefoot}{\@cefoot}}
-\newcommand{\@cefoot}[1]{\renewcommand*{\scrheadings at even@middle at foot}{#1}}
-\newcommand{\@@cefoot}[2][]{%
- \renewcommand*{\scrplain at even@middle at foot}{#1}%
- \renewcommand*{\scrheadings at even@middle at foot}{#2}}
-\newcommand{\cofoot}{\kernel at ifnextchar[{\@@cofoot}{\@cofoot}}
-\newcommand{\@cofoot}[1]{\renewcommand*{\scrheadings at odd@middle at foot}{#1}}
-\newcommand{\@@cofoot}[2][]{%
- \renewcommand*{\scrplain at odd@middle at foot}{#1}%
- \renewcommand*{\scrheadings at odd@middle at foot}{#2}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\clearscrheadings}
-% \changes{v2.0j}{2001/08/18}{New}
-% \begin{macro}{\clearscrheadfoot}
-% \changes{v2.0j}{2001/08/18}{New}
-% \begin{macro}{\clearscrpain}
-% \changes{v2.0j}{2001/08/18}{New}
-% Maybe you want to clear the currently defined head and foot. First
-% let's clear only scrheadings pagestyle but not scrplain pagestyle.
-% We do this simply using the already known command:
-% \begin{macrocode}
-\newcommand*{\clearscrheadings}{%
- \ihead{}\chead{}\ohead{}\ifoot{}\cfoot{}\ofoot{}}
-% \end{macrocode}
-% We can do almost the same to clear scrheadings pagestyle and
-% scrplain pagestyle together:
-% \begin{macrocode}
-\newcommand*{\clearscrheadfoot}{%
- \ihead[]{}\chead[]{}\ohead[]{}\ifoot[]{}\cfoot[]{}\ofoot[]{}}
-% \end{macrocode}
-% But, for only clearing the scrplain pagestyle, we have to do the
-% redefinition directly:
-% \begin{macrocode}
-\newcommand*{\clearscrplain}{%
- \renewcommand*{\scrplain at even@left at head}{}%
- \renewcommand*{\scrplain at even@middle at head}{}%
- \renewcommand*{\scrplain at even@right at head}{}%
- \renewcommand*{\scrplain at odd@left at head}{}%
- \renewcommand*{\scrplain at odd@middle at head}{}%
- \renewcommand*{\scrplain at odd@right at head}{}%
- \renewcommand*{\scrplain at even@left at foot}{}%
- \renewcommand*{\scrplain at even@middle at foot}{}%
- \renewcommand*{\scrplain at even@right at foot}{}%
- \renewcommand*{\scrplain at odd@left at foot}{}%
- \renewcommand*{\scrplain at odd@middle at foot}{}%
- \renewcommand*{\scrplain at odd@right at foot}{}%
-}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% Let's do the default setting:
-% \changes{v2.0m}{2002/02/05}{Active support for new letter class
-% \texttt{scrlttr2}}%^^A
-% \changes{v3.12}{2013/12/14}{fix \cs{rohead} if page number left at head}%^^A
-% \changes{v3.28}{2019/11/23}{\cs{PackageErrorNoLine} durch \cs{PackageError}
-% ersetzt}%^^A
-% \begin{macrocode}
-\def\@tempa{koma}\ifx\scrheadings at style\@tempa
- \@ifclassloaded{scrlttr2}{%
- \ifcase\@pageat
- \lehead[\pagemark]{\pagemark}\lohead[\pagemark]{\pagemark}%
- \chead{\rightmark}%
- \rehead{\leftmark}\rohead{\leftmark}%
- \or
- \lehead{\leftmark}\lohead{\leftmark}%
- \chead[\pagemark]{\pagemark}%
- \rehead{\rightmark}\rohead{\rightmark}%
- \or
- \lehead{\leftmark}\lohead{\leftmark}%
- \chead{\rightmark}%
- \rehead[\pagemark]{\pagemark}\rohead[\pagemark]{\pagemark}%
- \or
- \lehead{\leftmark}\lohead{\leftmark}%
- \rehead{\rightmark}\rohead{\rightmark}%
- \lefoot[\pagemark]{\pagemark}\lofoot[\pagemark]{\pagemark}%
- \or
- \lehead{\leftmark}\lohead{\leftmark}%
- \rehead{\rightmark}\rohead{\rightmark}%
- \cfoot[\pagemark]{\pagemark}%
- \or
- \lehead{\leftmark}\lohead{\leftmark}%
- \rehead{\rightmark}\rohead{\rightmark}%
- \refoot[\pagemark]{\pagemark}\rofoot[\pagemark]{\pagemark}%
- \fi
- \let\ps at save@myheadings=\ps at save@headings
- }{%
- \ohead{\if at twoside\headmark\fi}%
- \chead{\if at twoside\else\headmark\fi}%
- \cfoot[\if at twoside\else\pagemark\fi]{\if at twoside\else\pagemark\fi}%
- \ofoot[\if at twoside\pagemark\fi]{\if at twoside\pagemark\fi}%
- }%
-\else\def\@tempa{standard}\ifx\scrheadings at style\@tempa
- \ihead{\headmark}
- \ohead{\pagemark}
- \cfoot[\pagemark]{}
- \else\PackageError{scrpage2}{unknown scrheadings style}%
- {Somehow \string\scrheadings at style was
- defined\MessageBreak
- as ``\scrheadings at style''.\MessageBreak
- scrpage2 doesn't know what to do.
- If you'll continue, pagestyle
- ``scrheadings''\MessageBreak
- will be predefined empty.}
-\fi\fi
-\begingroup\expandafter\expandafter\expandafter\endgroup\expandafter
-\ifx\csname chaptermark\endcsname\relax
- \begingroup\expandafter\expandafter\expandafter\endgroup\expandafter
- \ifx\csname sectionmark\endcsname\relax
- \ifx\@mkboth\markboth\@automarktrue\fi
- \else
-% \end{macrocode}
-% \changes{v2.5a}{2012/11/02}{\cs{@gobble} is long, but \cs{sectionmark} and
-% \cs{chaptermark} may be short}
-% \begin{macrocode}
- \ifx\sectionmark\@gobble\else
- \begingroup
- \def\@gobble#1{}\ifx\sectionmark\@gobble\else
- \aftergroup\@automarktrue
- \fi
- \endgroup
- \fi
- \fi
-\else
- \ifx\chaptermark\@gobble\else
- \begingroup
- \def\@gobble#1{}\ifx\chaptermark\@gobble\else
- \aftergroup\@automarktrue
- \fi
- \endgroup
- \fi
-\fi
-% \end{macrocode}
-%
-%
-% \subsection{Configurationfile}
-% Not last and not least we include the local configuration-file
-% \texttt{scrpage.cfg}, if it exists.
-% \begin{macrocode}
-\InputIfFileExists{scrpage.cfg}
- {\typeout{*************************************^^J%
- * Local config file scrpage.cfg used^^J%
- *************************************}}
- {}
-% \end{macrocode}
-%
-%
-% \subsection{Some checks}
-% \changes{v2.0}{2001/04/20}{\cs{headheight}-check}
-% Last but not least we do some checks at version 2. Some means one at
-% the moment. And the one is a check, if the \cs{headheight} should be
-% increased.
-% \begin{macrocode}
-\AtBeginDocument{%
- \ifdim\headheight=12pt
- \PackageWarningNoLine{scrpage2}%
- {seems you are using a constant headheight.\MessageBreak
- If you get overfull \string\vbox\space warnings at almost every%
- \MessageBreak
- page, you should increase headheight e.g. writing\MessageBreak
- \space\string\setlength{\string\headheight}{%
- 1.1\string\baselineskip}\MessageBreak
- into the preamble of your document.\MessageBreak
- A better solution would be to use typearea package}%
- \else\ifdim\headheight<1.07\baselineskip
- \PackageWarningNoLine{scrpage2}%
- {seems you are using a very small headheight.\MessageBreak
- If you get overfull \string\vbox\space warnings at almost every%
- \MessageBreak
- page, you should increase headheight e.g. writing\MessageBreak
- \space\string\setlength{\string\headheight}{%
- 1.1\string\baselineskip}\MessageBreak
- into the preamble of your document.\MessageBreak
- A better solution would be to use typearea package}%
- \fi\fi}
-% \end{macrocode}
-%
-% \subsection{End}
-% \begin{macrocode}
-%</scrpage>
-% \end{macrocode}
-%
-% \Finale
-%
-\endinput
-%
-% end of file `scrpage.dtx'
-%%% Local Variables:
-%%% mode: doctex
-%%% TeX-master: t
-%%% End:
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -2,7 +2,7 @@
% \iffalse meta-comment
% ======================================================================
% scrwfile.dtx
-% Copyright (c) Markus Kohm, 2010-2019
+% Copyright (c) Markus Kohm, 2010-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -29,7 +29,7 @@
% at least three times.
% ----------------------------------------------------------------------
% scrwfile.dtx
-% Copyright (c) Markus Kohm, 2010-2019
+% Copyright (c) Markus Kohm, 2010-2020
%
% Diese Datei ist Teil des LaTeX2e KOMA-Script-Pakets.
%
@@ -75,7 +75,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrwfile.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrwfile.dtx 3453 2020-02-25 07:33:30Z kohm $
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{scrwfile.dtx}
@@ -454,6 +454,7 @@
% \cs{Ifattoclist}}%^^A
% \changes{v3.28}{2019/11/19}{\cs{iftocfeature} replaced by
% \cs{Iftocfeature}}%^^A
+% \changes{v3.30}{2020/02/25}{spurious space in warning message removed}%^^A
% 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
@@ -482,7 +483,7 @@
\Ifattoclist{#3}{%
\PackageWarning{scrwfile}{`#3' already under control of
tocbasic.\MessageBreak
- Nevertheless features will be set
+ Nevertheless features will be set%
}%
}{%
\addtotoclist[TOCclone]{#3}%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx 2020-04-21 21:21:23 UTC (rev 54825)
@@ -2,7 +2,7 @@
% \iffalse meta-comment
% ======================================================================
% tocbasic.dtx
-% Copyright (c) Markus Kohm, 2008-2019
+% Copyright (c) Markus Kohm, 2008-2020
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% tocbasic.dtx
-% Copyright (c) Markus Kohm, 2008-2019
+% Copyright (c) Markus Kohm, 2008-2020
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $
+%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $
%<identify>%%% (run: identify)
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
@@ -66,7 +66,7 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-11-22 08:30:48 +0100 (Fri, 22 Nov 2019) $
+ \filedate$Date: 2020-02-25 08:33:30 +0100 (Tue, 25 Feb 2020) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
\filerevision$Revision: 1962 $
\endgroup
@@ -1649,6 +1649,7 @@
% \begin{macro}{\tb at nt@level}
% \changes{v3.20}{2015/12/16}{undefined}%^^A
% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% \changes{v3.30}{2020/02/25}{spurious space in warning message removed}%^^A
% Each entry to a TOC/list of has a numeric level. You may set up your own
% level.
% \begin{macrocode}
@@ -1656,7 +1657,7 @@
\PackageWarning{tocbasic}{%
deprecated option `level'.\MessageBreak
You should replace option `level' by option\MessageBreak
- `tocentrylevel'
+ `tocentrylevel'%
}%
\l at addto@macro\tb at nt@tocstyle at options{,level={##1}}%
\FamilyKeyStateProcessed
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
DIN%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
5008%
@@ -73,7 +73,7 @@
\LoadLetterOption{%
DINmtext%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\@setplength{toaddrindent}{%
5mm}
@@ -134,7 +134,7 @@
\space\string\areaset[5mm]{%
\the\dimexpr \paperwidth-45mm\relax}{%
\the\dimexpr 1.414\dimexpr \paperwidth-45mm\relax\relax}\MessageBreak
- to follow the norm
+ to follow the norm%
}%
\fi
\ifdim \dimexpr\parskip\relax=\dimexpr\baselineskip\relax\else
@@ -146,7 +146,7 @@
document does not conform DIN5008.\MessageBreak
You shoud use, e.g.,\MessageBreak
\space\string\KOMAoption{parskip}{full}\MessageBreak
- to follow the norm
+ to follow the norm%
}%
\fi
\endgroup
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
5008%
@@ -73,7 +73,7 @@
\LoadLetterOption{%
DIN%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\@setplength{toaddrindent}{%
5mm}
@@ -132,7 +132,7 @@
\space\string\areaset[5mm]{%
\the\dimexpr \paperwidth-45mm\relax}{%
\the\dimexpr 1.414\dimexpr \paperwidth-45mm\relax\relax}\MessageBreak
- to follow the norm
+ to follow the norm%
}%
\fi
\ifdim \dimexpr\parskip\relax=\dimexpr\baselineskip\relax\else
@@ -144,7 +144,7 @@
document does not conform DIN5008.\MessageBreak
You shoud use, e.g.,\MessageBreak
\space\string\KOMAoption{parskip}{full}\MessageBreak
- to follow the norm
+ to follow the norm%
}%
\fi
\endgroup
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
DINmtext%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
KOMAold%
@@ -80,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z 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 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z 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 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Kaku,LATE,LOW,head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NF.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NF.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NF.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
NF%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z 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 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,EARLY,HIGH,head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,EARLY,LOW,head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,LATE,HIGH,head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,LATE,LOW,head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,RIGHT,LOW,head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/SN.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/SN.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/SN.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
SN%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
SNleft%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
UScommercial9
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
UScommercial9DW
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\@ifundefined{scr at fromname@var}{%
\LCOWarningNoLine{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/float.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/float.hak 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/float.hak 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\ProvidesFile{float.hak}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
scrhack part
(hacking package
float)%
]
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z 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 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/floatrow.hak 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\ProvidesFile{floatrow.hak}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
scrhack part
(hacking package
floatrow)%
]
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z 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 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/hyperref.hak 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\ProvidesFile{hyperref.hak}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
scrhack part
(hacking package
hyperref)%
]
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z 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 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/listings.hak 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\ProvidesFile{listings.hak}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
scrhack part
(hacking package
listings)%
]
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\newcommand*{\scr at do@hack at listings}{%
\RequirePackage{tocbasic}%
\addtotoclist[float]{lol}%
@@ -99,6 +99,12 @@
}%
}%
}%
+ \expandafter\def\expandafter\lst at makecaption\expandafter{%
+ \expandafter\def\expandafter\@captype\expandafter{%
+ \expandafter l\expandafter s\expandafter t\expandafter l%
+ \expandafter i\expandafter s\expandafter t\expandafter i%
+ \expandafter n\expandafter g\expandafter}\lst at makecaption
+ }%
\let\scr at do@hack at listings\relax
}
\scr at ifexpected{\lstlistoflistings}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\ProvidesFile{lscape.hak}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
scrhack part
(hacking package
lscape)%
]
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z 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 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/nomencl.hak 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\ProvidesFile{nomencl.hak}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
scrhack part
(hacking package
nomencl)%
]
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\RequirePackage{tocbasic}
\@ifpackagelater{nomencl}{2019/01/01}{%
\PackageInfo{scrhack}{only `tocbasic' loaded for `nomencl'}%
@@ -138,7 +138,7 @@
release of package `nomencl'.\MessageBreak
Mostly this patch does work too, but it also could\MessageBreak
break `nomencl`. If this happens, please deactivate\MessageBreak
- the `nomencl` hack of `scrhack`
+ the `nomencl` hack of `scrhack`%
}%
}{%
\PackageWarning{scrhack}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls 2020-04-21 21:21:23 UTC (rev 54825)
@@ -6,7 +6,7 @@
%%
%% scrkernel-version.dtx (with options: `class,article')
%% scrkernel-basics.dtx (with options: `class,load')
-%% scrkernel-listsof.dtx (with options: `class,book,prepare')
+%% scrkernel-listsof.dtx (with options: `class,article,prepare')
%% scrkernel-tocstyle.dtx (with options: `class,article,prepare')
%% scrkernel-sections.dtx (with options: `class,article,prepare')
%% scrkernel-compatibility.dtx (with options: `class,article,init')
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -121,19 +121,17 @@
article%
}
\ProvidesClass{\KOMAClassName}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
]
-\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
-\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist[ToC]{toc}
\Ifstr{\ext at toc}{toc}{}{%
\expandafter\addtotoclist
@@ -140,10 +138,9 @@
\expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]%
\expandafter{\ext at toc}%
}
-\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: prepare)
\newcommand*{\scr at dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
@@ -195,7 +192,7 @@
\newcommand*{\size at paragraph}{}
\newcommand*{\size at subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr at gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -272,10 +269,11 @@
\@namedef{scr at v@3.27a}{17}
\@namedef{scr at v@3.28}{17}
\@namedef{scr at v@3.29}{17}
+\@namedef{scr at v@3.30}{17}
\@namedef{scr at v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: option)
\newif\if at scr@emulatestandardclasses
\let\scr at emulatestandardclassestrue\relax
@@ -350,7 +348,7 @@
\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 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: option)
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
@@ -406,7 +404,7 @@
\newcommand*{\@gr at gsffamily}{%
\if at egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
@@ -494,7 +492,7 @@
\BeforePackage{tex4ht}{%
\let\scr at defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: options)
\KOMA at key{twoside}[true]{%
\if at atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -557,7 +555,8 @@
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
\Ifstr{#1}{}{%
\Ifstr{#3}{BCOR}{%
- \PassOptionsToPackage{BCOR#2}{typearea}%
+ \Ifstrstart{#2}{=}{\OptionNotUsed}{%
+ \PassOptionsToPackage{BCOR#2}{typearea}}%
}{\scr at pti@nerr at r}%
}{\scr at pti@nerr at r}%
}
@@ -566,7 +565,8 @@
\def\@@DIV #1DIV#2DIV#3\@@DIV{%
\edef\@tempa{#1}\ifx\@tempa\@empty
\edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb
- \PassOptionsToPackage{DIV#2}{typearea}%
+ \Ifstrstart{#2}{=}{\OptionNotUsed}{%
+ \PassOptionsToPackage{DIV#2}{typearea}}%
\else\scr at pti@nerr at r\fi
\else\@BCOR\fi
}
@@ -814,7 +814,7 @@
\KOMA at DeclareDeprecatedOption{abstractoff}{abstract=false}
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: option)
\KOMA at key{numbers}{%
\KOMA at set@ncmdkey{numbers}{@tempa}{%
@@ -1323,7 +1323,7 @@
\csname FN at mf@prepare\endcsname
\ifhmode\spacefactor\@x at sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
%%% (run: option)
\newif\if at tocleft
\KOMA at key{toc}{%
@@ -1808,10 +1808,10 @@
\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
@@ -1818,7 +1818,7 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: body)
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
@@ -2295,13 +2295,13 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z 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 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2314,37 +2314,39 @@
\let\scr at pti@nerr at r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
\if at scr@emulatestandardclasses
- \ifnum\@lastdiv=\z@
- \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
- \ifdim \f at size\p@<10.5\p@
- \setlength{\@tempdimb}{345\p@}
- \else\ifdim \f at size\p@<11.5\p@
- \setlength{\@tempdimb}{360\p@}
+ \Ifstr{\@lastdiv}{areaset}{}{%
+ \ifnum\@lastdiv=\z@
+ \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
+ \ifdim \f at size\p@<10.5\p@
+ \setlength{\@tempdimb}{345\p@}
+ \else\ifdim \f at size\p@<11.5\p@
+ \setlength{\@tempdimb}{360\p@}
+ \else
+ \setlength{\@tempdimb}{390\p@}
+ \fi
+ \fi
+ \if at twocolumn
+ \ifdim\@textwidth>2\@tempdimb\relax
+ \setlength{\textwidth}{2\@tempdimb}
+ \fi
\else
- \setlength{\@tempdimb}{390\p@}
+ \ifdim\textwidth>\@tempdimb
+ \setlength{\textwidth}{\@tempdimb}
+ \fi
\fi
+ \@settopoint\textwidth
+ \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
+ \divide\@tempdima\baselineskip
+ \@tempcnta=\@tempdima
+ \setlength{\textheight}{\@tempcnta\baselineskip}
+ \addtolength{\textheight}{\topskip}
+ \edef\reserved at a{%
+ \noexpand\@areasetadvancedtrue
+ \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
+ \if at areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
+ }\reserved at a
\fi
- \if at twocolumn
- \ifdim\@textwidth>2\@tempdimb\relax
- \setlength{\textwidth}{2\@tempdimb}
- \fi
- \else
- \ifdim\textwidth>\@tempdimb
- \setlength{\textwidth}{\@tempdimb}
- \fi
- \fi
- \@settopoint\textwidth
- \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
- \divide\@tempdima\baselineskip
- \@tempcnta=\@tempdima
- \setlength{\textheight}{\@tempcnta\baselineskip}
- \addtolength{\textheight}{\topskip}
- \edef\reserved at a{%
- \noexpand\@areasetadvancedtrue
- \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
- \if at areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
- }\reserved at a
- \fi
+ }%
\fi
%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
@@ -2951,7 +2953,7 @@
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{subsection}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{3}
\providecommand*{\ifnumbered}{%
@@ -3280,7 +3282,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@sect\space}%
+ of \string\@sect}%
\fi
\def\@sect#1#2#3#4#5#6[#7]#8{%
\ifnum \scr at osectarg=\z@
@@ -3452,7 +3454,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@ssect\space}%
+ of \string\@ssect}%
\fi
\def\@ssect#1#2#3#4#5{%
\scr at ifundefinedorrelax{scr at s@ct@@nn at m@}{%
@@ -3526,7 +3528,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@xsect\space}%
+ of \string\@xsect}%
\fi
\def\@xsect#1{%
\@ifundefined{scr at sect@runin}{%
@@ -3699,6 +3701,9 @@
}%
}%
}
+\newcommand*{\scr at dsc@style at chapter@subcommands}[1]{%
+ @#1, at s#1, at make#1head, at makes#1head,@@make#1head,@@makes#1head,set#1preamble%
+}
\newcommand*{\scr at dsc@style at part@options}{}
\DeclareSectionCommandStyleFuzzyOption{part}
{afterindent}{scr@}{@afterindent}
@@ -3714,6 +3719,9 @@
\@namedef{@#1}{\scr@@startpart{#1}}%
\@namedef{@s#1}{\scr@@startspart{#1}}%
}
+\newcommand*{\scr at dsc@style at part@subcommands}[1]{%
+ @#1, at s#1, at end#1,set#1preamble%
+}
\newcommand*{\scr at dsc@style at section@neededoptionstest}{%
\scr at ifundefinedorrelax{scr@\scr at dsc@current @sectionindent}{%
\scr at declaresectioncommandwarning{\scr at dsc@current}%
@@ -4173,9 +4181,39 @@
\expandafter\scr at ifundefinedorrelax\expandafter{\reserved at a}{}{%
\@tempswafalse
\edef\reserved at b{\expandafter\string\csname \reserved at a\endcsname}%
- }
- }
+ }%
+ }%
\if at tempswa
+ \expandafter\let\expandafter\scr at dsc@current
+ \csname scr at tso@##2 at style\endcsname
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{%
+ \edef\scr at dsc@current{##1}%
+ \FamilyKeyStateProcessed
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{style}%
+ \@tempswatrue
+ \@ifundefined{scr at dsc@current}{}{%
+ \scr at ifundefinedorrelax{scr at dsc@style@\scr at dsc@current @subcommands}{%
+ }{%
+ \edef\reserved at b{%
+ \csname scr at dsc@style@\scr at dsc@current @subcommands\endcsname{#2}%
+ }%
+ \expandafter\@for\expandafter\reserved at a\expandafter:\expandafter=%
+ \reserved at b\do{%
+ \expandafter\scr at ifundefinedorrelax\expandafter{\reserved at a}{}{%
+ \@tempswafalse
+ \edef\reserved at b{%
+ \expandafter\string\csname \reserved at a\endcsname}%
+ }%
+ }%
+ }
+ }%
+ \let\scr at dsc@current\relax
+ \fi
+ \if at tempswa
\DeclareSectionCommand[{#1}]{#2}%
\else
\ClassError{\KOMAClassName}{%
@@ -4776,7 +4814,7 @@
\fi
\newcommand*{\scr at fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\newif\if at restonecol
\newcommand{\dictum}[2][]{\par%
@@ -6170,7 +6208,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
%%% (run: body)
\g at addto@macro{\numberline at numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -6244,7 +6282,7 @@
You should use the features of package `tocbasic'\MessageBreak
instead of \string\toc at heading.\MessageBreak
Definition of \string\toc at heading\space may be removed from\MessageBreak
- KOMA-Script soon, so it should not be used
+ KOMA-Script soon, so it should not be used%
}%
\section*{\contentsname}%
\@mkboth{\MakeMarkcase{\contentsname}}{\MakeMarkcase{\contentsname}}%
@@ -6283,7 +6321,7 @@
Loading of package `scrhack' may help to\MessageBreak
avoid this warning, if you are using a\MessageBreak
a package that still implements the\MessageBreak
- deprecated \string\float at listhead\space interface
+ deprecated \string\float at listhead\space interface%
}%
}
\newcommand*{\scr at float@addtolists at warning}{%
@@ -6300,7 +6338,7 @@
Loading of package `scrhack' may help to\MessageBreak
avoid this warning, if you are using a\MessageBreak
a package that still implements the\MessageBreak
- deprecated \string\float at addtolist\space interface
+ deprecated \string\float at addtolist\space interface%
}%
\global\let\scr at float@addtolists at warning\relax
}
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -60,7 +60,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -77,7 +77,7 @@
\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
\edef\KOMALongClassFileName{\KOMALongClassFileName}
\ProvidesClass{\KOMALongClassName}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 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 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrbase.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -45,7 +45,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,19 +67,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package
(%
KOMA-Script-independent
@@ -110,6 +110,16 @@
\expandafter\reserved at a\expandafter{\reserved at b}
\RequirePackage{keyval}
\providecommand*\kernel at ifstar[1]{\kernel at ifnextchar*{\@firstoftwo{#1}}}
+\newcommand{\rloop}[1]{}
+\long\def\rloop#1\repeat{%
+ \ifdefined\iterate
+ \edef\iterate{\unexpanded{#1\relax\expandafter\iterate\fi\def\iterate}%
+ {\unexpanded\expandafter{\iterate}}}%
+ \else
+ \def\iterate{#1\relax\expandafter\iterate\fi\let\iterate\relax}%
+ \fi
+ \iterate
+}
\newcommand{\scr at ifundefinedorrelax}[1]{%
\ifcsname #1\endcsname
\expandafter\ifx\csname #1\endcsname\relax
@@ -454,7 +464,7 @@
\long\def\l at addto@macro#1#2{%
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: option)
\DefineFamily{KOMA}
\DefineFamilyMember{KOMA}
@@ -466,13 +476,13 @@
\RelaxFamilyKey[.scrbase.sty]{KOMA}{internalonly}%
}
\FamilyProcessOptions{KOMA}\relax
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
%%% (run: option)
%%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $
\RequirePackage{scrlfile}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: body)
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
@@ -1255,12 +1265,12 @@
}%
}%
}
-\newcommand{\scr at ifpdftex}{\ifnotundefined{pdftexversion}}
-\newcommand{\scr at ifluatex}{\ifnotundefined{luatexversion}}
+\newcommand{\scr at ifpdftex}{\Ifnotundefined{pdftexversion}}
+\newcommand{\scr at ifluatex}{\Ifnotundefined{luatexversion}}
\newcommand*{\scr at ifpdforluatex}{%
\scr at ifpdftex{\@firstoftwo}{\scr at ifluatex{\@firstoftwo}{\@secondoftwo}}%
}
-\newcommand{\scr at ifVTeX}{\ifnotundefined{VTeXversion}}
+\newcommand{\scr at ifVTeX}{\Ifnotundefined{VTeXversion}}
\newcommand{\scr at ifpdfoutput}{%
\scr at ifundefinedorrelax{pdfoutput}{%
\scr at ifundefinedorrelax{outputmode}{%
@@ -1299,7 +1309,7 @@
}
\newcommand*{\Ifpdfoutput}{\scr at ifpdfoutput}
\newcommand*{\scr at ifpsoutput}{%
- \ifnotundefined{if at dvips}{%
+ \Ifnotundefined{if at dvips}{%
\if at dvips
\expandafter\@firstoftwo
\else
@@ -1306,7 +1316,7 @@
\expandafter\@secondoftwo
\fi
}{%
- \ifnotundefined{OpMode}{%
+ \Ifnotundefined{OpMode}{%
\ifnum\OpMode=2
\expandafter\@firstoftwo
\else
@@ -1933,7 +1943,7 @@
Setting this command to a non empty\MessageBreak
value for option `#2' of\MessageBreak
family `#1' is deprecated,\MessageBreak
- but has been found
+ but has been found%
}%
\fi
}
@@ -2247,18 +2257,20 @@
but do-hook specificators must not be empty.%
}%
}{%
- \let\scr at hookname\relax
- \edef\scr at hookargument{#1}%
- \loop
- \scr at hooksplit@specificator\scr at hookname\scr at hookargument
- \scr at hookargument
- \begingroup\edef\reserved at a{%
- \unexpanded{\endgroup #2}{\scr at hookname}{\scr at hookargument}%
- }\reserved at a
- \ifx\scr at hookargument\@empty\else
- \repeat
- \let\scr at hookname\relax
- \let\scr at hookargument\relax
+ \begingroup
+ \def\scr at hookrun{\endgroup}%
+ \let\scr at hookname\relax
+ \edef\scr at hookargument{#1}%
+ \rloop
+ \scr at hooksplit@specificator\scr at hookname\scr at hookargument
+ \scr at hookargument
+ \edef\scr at hookrun{%
+ \unexpanded\expandafter{\scr at hookrun}%
+ \unexpanded{#2}{\scr at hookname}{\scr at hookargument}%
+ }%
+ \ifx\scr at hookargument\@empty\else
+ \repeat
+ \scr at hookrun
}%
}
\newcommand*{\SplitDoHook}[3]{%
@@ -2331,7 +2343,7 @@
}%
}%
}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
%%% (run: body)
\newcommand*{\defcaptionname}{%
\kernel at ifstar\scr at def@scaptionname\scr at def@captionname
@@ -2539,6 +2551,7 @@
\let#2\relax
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
+ \let\renewcommand\providecommand
\csname extras\scr at reserved@a\endcsname
\csname captions\scr at reserved@a\endcsname
\ifx #2\relax \aftergroup\@firstofone
@@ -2582,6 +2595,7 @@
\else
\begingroup
\let#2\relax
+ \let\renewcommand\providecommand
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
\csname captions\scr at reserved@a\endcsname
@@ -2629,6 +2643,7 @@
\else
\begingroup
\let#2\relax
+ \let\renewcommand\providecommand
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
\csname captions\scr at reserved@a\endcsname
@@ -2679,6 +2694,7 @@
\else
\begingroup
\let#2\relax
+ \let\renewcommand\providecommand
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
\csname captions\scr at reserved@a\endcsname
@@ -2732,6 +2748,7 @@
\else
\begingroup
\let#2\relax
+ \let\renewcommand\providecommand
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
\csname captions\scr at reserved@a\endcsname
@@ -2781,6 +2798,7 @@
\else
\begingroup
\let#2\relax
+ \let\renewcommand\providecommand
\expandafter\providecommand\expandafter*%
\csname abx at extras@\scr at reserved@a\endcsname{}%
\csname extras\scr at reserved@a\endcsname
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -121,16 +121,16 @@
book%
}
\ProvidesClass{\KOMAClassName}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
@@ -143,7 +143,7 @@
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: prepare)
\newif\if at openright
\@openrighttrue
@@ -219,7 +219,7 @@
\newcommand*{\size at paragraph}{}
\newcommand*{\size at subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr at gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -296,10 +296,11 @@
\@namedef{scr at v@3.27a}{17}
\@namedef{scr at v@3.28}{17}
\@namedef{scr at v@3.29}{17}
+\@namedef{scr at v@3.30}{17}
\@namedef{scr at v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: option)
\newif\if at scr@emulatestandardclasses
\let\scr at emulatestandardclassestrue\relax
@@ -373,7 +374,7 @@
\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 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: option)
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
@@ -429,7 +430,7 @@
\newcommand*{\@gr at gsffamily}{%
\if at egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
@@ -517,7 +518,7 @@
\BeforePackage{tex4ht}{%
\let\scr at defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: options)
\KOMA at key{twoside}[true]{%
\if at atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -580,7 +581,8 @@
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
\Ifstr{#1}{}{%
\Ifstr{#3}{BCOR}{%
- \PassOptionsToPackage{BCOR#2}{typearea}%
+ \Ifstrstart{#2}{=}{\OptionNotUsed}{%
+ \PassOptionsToPackage{BCOR#2}{typearea}}%
}{\scr at pti@nerr at r}%
}{\scr at pti@nerr at r}%
}
@@ -589,7 +591,8 @@
\def\@@DIV #1DIV#2DIV#3\@@DIV{%
\edef\@tempa{#1}\ifx\@tempa\@empty
\edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb
- \PassOptionsToPackage{DIV#2}{typearea}%
+ \Ifstrstart{#2}{=}{\OptionNotUsed}{%
+ \PassOptionsToPackage{DIV#2}{typearea}}%
\else\scr at pti@nerr at r\fi
\else\@BCOR\fi
}
@@ -834,7 +837,7 @@
{notitlepage}{titlepage=false}
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: option)
\KOMA at key{open}{%
\KOMA at set@ncmdkey{open}{@tempa}{%
@@ -1479,7 +1482,7 @@
\csname FN at mf@prepare\endcsname
\ifhmode\spacefactor\@x at sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
%%% (run: option)
\newif\if at tocleft
\KOMA at key{toc}{%
@@ -2012,11 +2015,11 @@
\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openright}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
@@ -2023,7 +2026,7 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: body)
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
@@ -2507,13 +2510,13 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z 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 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2526,37 +2529,39 @@
\let\scr at pti@nerr at r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
\if at scr@emulatestandardclasses
- \ifnum\@lastdiv=\z@
- \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
- \ifdim \f at size\p@<10.5\p@
- \setlength{\@tempdimb}{345\p@}
- \else\ifdim \f at size\p@<11.5\p@
- \setlength{\@tempdimb}{360\p@}
+ \Ifstr{\@lastdiv}{areaset}{}{%
+ \ifnum\@lastdiv=\z@
+ \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
+ \ifdim \f at size\p@<10.5\p@
+ \setlength{\@tempdimb}{345\p@}
+ \else\ifdim \f at size\p@<11.5\p@
+ \setlength{\@tempdimb}{360\p@}
+ \else
+ \setlength{\@tempdimb}{390\p@}
+ \fi
+ \fi
+ \if at twocolumn
+ \ifdim\@textwidth>2\@tempdimb\relax
+ \setlength{\textwidth}{2\@tempdimb}
+ \fi
\else
- \setlength{\@tempdimb}{390\p@}
+ \ifdim\textwidth>\@tempdimb
+ \setlength{\textwidth}{\@tempdimb}
+ \fi
\fi
+ \@settopoint\textwidth
+ \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
+ \divide\@tempdima\baselineskip
+ \@tempcnta=\@tempdima
+ \setlength{\textheight}{\@tempcnta\baselineskip}
+ \addtolength{\textheight}{\topskip}
+ \edef\reserved at a{%
+ \noexpand\@areasetadvancedtrue
+ \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
+ \if at areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
+ }\reserved at a
\fi
- \if at twocolumn
- \ifdim\@textwidth>2\@tempdimb\relax
- \setlength{\textwidth}{2\@tempdimb}
- \fi
- \else
- \ifdim\textwidth>\@tempdimb
- \setlength{\textwidth}{\@tempdimb}
- \fi
- \fi
- \@settopoint\textwidth
- \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
- \divide\@tempdima\baselineskip
- \@tempcnta=\@tempdima
- \setlength{\textheight}{\@tempcnta\baselineskip}
- \addtolength{\textheight}{\topskip}
- \edef\reserved at a{%
- \noexpand\@areasetadvancedtrue
- \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
- \if at areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
- }\reserved at a
- \fi
+ }%
\fi
%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
@@ -3131,7 +3136,7 @@
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\providecommand*{\ifnumbered}{%
@@ -3460,7 +3465,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@sect\space}%
+ of \string\@sect}%
\fi
\def\@sect#1#2#3#4#5#6[#7]#8{%
\ifnum \scr at osectarg=\z@
@@ -3632,7 +3637,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@ssect\space}%
+ of \string\@ssect}%
\fi
\def\@ssect#1#2#3#4#5{%
\scr at ifundefinedorrelax{scr at s@ct@@nn at m@}{%
@@ -3706,7 +3711,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@xsect\space}%
+ of \string\@xsect}%
\fi
\def\@xsect#1{%
\@ifundefined{scr at sect@runin}{%
@@ -3905,6 +3910,9 @@
\@namedef{@@makes#1head}{\scr@@makeschapterhead{#1}}%
\@namedef{set#1preamble}{\set at preamble{#1}}%
}
+\newcommand*{\scr at dsc@style at chapter@subcommands}[1]{%
+ @#1, at s#1, at make#1head, at makes#1head,@@make#1head,@@makes#1head,set#1preamble%
+}
\newcommand*{\scr at dsc@style at part@options}{}
\DeclareSectionCommandStyleOption{part}{pagestyle}{%
\@namedef{\scr at dsc@current pagestyle}{#1}%
@@ -3928,6 +3936,9 @@
\@namedef{@end#1}{\scr@@endpart{#1}}%
\@namedef{set#1preamble}{\set at preamble{#1}}%
}
+\newcommand*{\scr at dsc@style at part@subcommands}[1]{%
+ @#1, at s#1, at end#1,set#1preamble%
+}
\newcommand*{\scr at dsc@style at section@neededoptionstest}{%
\scr at ifundefinedorrelax{scr@\scr at dsc@current @sectionindent}{%
\scr at declaresectioncommandwarning{\scr at dsc@current}%
@@ -4485,9 +4496,39 @@
\expandafter\scr at ifundefinedorrelax\expandafter{\reserved at a}{}{%
\@tempswafalse
\edef\reserved at b{\expandafter\string\csname \reserved at a\endcsname}%
- }
- }
+ }%
+ }%
\if at tempswa
+ \expandafter\let\expandafter\scr at dsc@current
+ \csname scr at tso@##2 at style\endcsname
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{%
+ \edef\scr at dsc@current{##1}%
+ \FamilyKeyStateProcessed
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{style}%
+ \@tempswatrue
+ \@ifundefined{scr at dsc@current}{}{%
+ \scr at ifundefinedorrelax{scr at dsc@style@\scr at dsc@current @subcommands}{%
+ }{%
+ \edef\reserved at b{%
+ \csname scr at dsc@style@\scr at dsc@current @subcommands\endcsname{#2}%
+ }%
+ \expandafter\@for\expandafter\reserved at a\expandafter:\expandafter=%
+ \reserved at b\do{%
+ \expandafter\scr at ifundefinedorrelax\expandafter{\reserved at a}{}{%
+ \@tempswafalse
+ \edef\reserved at b{%
+ \expandafter\string\csname \reserved at a\endcsname}%
+ }%
+ }%
+ }
+ }%
+ \let\scr at dsc@current\relax
+ \fi
+ \if at tempswa
\DeclareSectionCommand[{#1}]{#2}%
\else
\ClassError{\KOMAClassName}{%
@@ -5609,7 +5650,7 @@
\fi
\newcommand*{\scr at fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\newif\if at restonecol
\newcommand{\dictum}[2][]{\par%
@@ -7032,7 +7073,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
%%% (run: body)
\g at addto@macro{\numberline at numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -7112,7 +7153,7 @@
You should use the features of package `tocbasic'\MessageBreak
instead of \string\toc at heading.\MessageBreak
Definition of \string\toc at heading\space may be removed from\MessageBreak
- KOMA-Script soon, so it should not be used
+ KOMA-Script soon, so it should not be used%
}%
\chapter*{\contentsname}%
\@mkboth{\MakeMarkcase{\contentsname}}{\MakeMarkcase{\contentsname}}%
@@ -7151,7 +7192,7 @@
Loading of package `scrhack' may help to\MessageBreak
avoid this warning, if you are using a\MessageBreak
a package that still implements the\MessageBreak
- deprecated \string\float at listhead\space interface
+ deprecated \string\float at listhead\space interface%
}%
}
\newcommand*{\scr at float@addtolists at warning}{%
@@ -7168,7 +7209,7 @@
Loading of package `scrhack' may help to\MessageBreak
avoid this warning, if you are using a\MessageBreak
a package that still implements the\MessageBreak
- deprecated \string\float at addtolist\space interface
+ deprecated \string\float at addtolist\space interface%
}%
\global\let\scr at float@addtolists at warning\relax
}
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -74,11 +74,11 @@
%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package
(day of the week)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -65,20 +65,20 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: preidentify)
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname KOMAClassName\endcsname\relax\else
- \PackageWarning{scrextend}{%
+ \PackageWarningNoLine{scrextend}{%
This package was made to extend other classes but\MessageBreak
KOMA-Script classes by some features of the\MessageBreak
KOMA-Script classes.\MessageBreak
It should never be used with a KOMA-Script class.\MessageBreak
- Loading of the package will be aborted\@gobble%
+ Loading of the package will be aborted%
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -100,16 +100,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: prepare)
\ProvidesPackage{scrextend}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 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 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: prepare)
\newcommand*{\sectfont}{\normalcolor\@gr at gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: init)
\providecommand*
{\scr at compatibility}{\scr at v@last}
@@ -216,8 +216,9 @@
\@namedef{scr at v@3.27a}{17}
\@namedef{scr at v@3.28}{17}
\@namedef{scr at v@3.29}{17}
+\@namedef{scr at v@3.30}{17}
\@namedef{scr at v@last}{17}
-%%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: option)
\KOMA at key{extendedfeature}{%
\scr at ext@activate{#1}%
@@ -241,7 +242,7 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: option)
\KOMA at key{version}[last]{%
\scr at ifundefinedorrelax{scr at v@#1}{%
@@ -296,7 +297,7 @@
\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 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: option)
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
@@ -436,7 +437,7 @@
\KOMA at DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $
%%% (run: option)
@@ -595,12 +596,12 @@
\relax}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: execoption)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: execoption)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: body)
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
@@ -1347,11 +1348,11 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr at fnt@title}{\titlefont}%
\newcommand*{\scr at fnt@subject}{\subject at font}%
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: body)
\newcommand*{\scr at fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\scr at ifundefinedorrelax{if at restonecol}{%
\expandafter\newif\csname if at restonecol\endcsname
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -73,7 +73,7 @@
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: identify)
\ProvidesPackage{scrfontsizes}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package (font size file generator)]
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,22 +65,22 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
%%% using: package,identify
\ProvidesPackage{scrhack}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package (hacking other packages)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z 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 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
%%% using: package,body
\newcommand{\scr at ifexpected}[2]{%
\begingroup
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -48,7 +48,7 @@
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package
(for jurists)
]
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -45,7 +45,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,19 +67,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package
(%
KOMA-Script-dependent
@@ -243,7 +243,7 @@
}
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: option)
\KOMAProcessOptions\relax
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
@@ -250,9 +250,9 @@
%%% (run: option)
%%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $
\RequirePackage{scrlfile}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: body)
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -49,7 +49,7 @@
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package
(end user interface for scrlayer)]
%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -47,7 +47,7 @@
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package
(defining layers and page styles)]
%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.cls 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.cls 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -60,7 +60,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -77,7 +77,7 @@
\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
\edef\KOMALongClassFileName{\KOMALongClassFileName}
\ProvidesClass{\KOMALongClassName}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 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 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -61,7 +61,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -83,7 +83,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -90,13 +90,13 @@
\let\scr at pkgextension\@pkgextension
}
\ProvidesPackage{scrletter}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
letter package extending any KOMA-Script class%
]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: init)
\scr at ifundefinedorrelax{KOMAClassName}{%
\PackageWarningNoLine{scrletter}{%
@@ -120,11 +120,11 @@
}
\providecommand*{\par at updaterelative}{}
}{}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: option)
\newcommand*{\lco at test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -142,7 +142,7 @@
}
\AtEndOfPackage
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
%%% (run: option)
\newif\if at orgdate\@orgdatetrue
\KOMA at key{numericaldate}[true]{%
@@ -166,7 +166,7 @@
%%% (run: option)
%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $
%%% (run: option)
\KOMA at ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -735,15 +735,15 @@
\newcommand*{\scr at symbol@www}{\undefined}
%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: execoption)
\KOMAProcessOptions\relax
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\providecommand*{\scr at endstrut}{\unskip\ifhmode\nobreak\strut\fi}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore at catcode@level}%
@@ -915,7 +915,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP at size{#2}\edef\LOPNP at option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
%%% (run: body)
\newcommand*{\g at addnumerical@date}[2]{%
\@ifundefined{date#1}{%
@@ -1802,7 +1802,7 @@
\rofoot[\ifnum\@pageat=5 \pagemark\fi]%
{}%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $
%%% (run: body)
\newkomavar{firsthead}
\setkomavar{firsthead}{%
@@ -2291,9 +2291,12 @@
\if at baddr
\Ifkomavarempty{backaddress}{}{{%
\noindent%
- \def\\{\usekomavar{backaddressseparator}\@ogobble}%
- \backaddr at format{\scriptsize\usekomafont{backaddress}%
- \usekomavar{backaddress}}}}%
+ \backaddr at format{\scriptsize
+ {%
+ \def\\{\usekomavar{backaddressseparator}\@ogobble}%
+ \usekomafont{backaddress}%
+ {\usekomavar{backaddress}}%
+ }}}}%
\fi
}{backaddress}{backaddrheight}{\setkomavar}%
\ifcase \ltr at priority
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $
\ProvidesPackage{scrlfile}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package
(loading files)]
\ExecuteOptions{}
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -110,13 +110,13 @@
letter%
}
\ProvidesClass{\KOMAClassName}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -193,10 +193,11 @@
\@namedef{scr at v@3.27a}{17}
\@namedef{scr at v@3.28}{17}
\@namedef{scr at v@3.29}{17}
+\@namedef{scr at v@3.30}{17}
\@namedef{scr at v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: option)
\KOMA at key{version}[last]{%
\scr at ifundefinedorrelax{scr at v@#1}{%
@@ -246,7 +247,7 @@
\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 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: option)
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
@@ -300,7 +301,7 @@
\newcommand*{\@gr at gsffamily}{%
\if at egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: option)
\newcommand*{\lco at test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -318,7 +319,7 @@
}
\AtEndOfClass
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
%%% (run: option)
\newif\if at orgdate\@orgdatetrue
\KOMA at key{numericaldate}[true]{%
@@ -424,7 +425,7 @@
%%% (run: option)
%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: options)
\KOMA at key{twoside}[true]{%
\if at atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -486,7 +487,8 @@
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
\Ifstr{#1}{}{%
\Ifstr{#3}{BCOR}{%
- \PassOptionsToPackage{BCOR#2}{typearea}%
+ \Ifstrstart{#2}{=}{\OptionNotUsed}{%
+ \PassOptionsToPackage{BCOR#2}{typearea}}%
}{\scr at pti@nerr at r}%
}{\scr at pti@nerr at r}%
}
@@ -495,7 +497,8 @@
\def\@@DIV #1DIV#2DIV#3\@@DIV{%
\edef\@tempa{#1}\ifx\@tempa\@empty
\edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb
- \PassOptionsToPackage{DIV#2}{typearea}%
+ \Ifstrstart{#2}{=}{\OptionNotUsed}{%
+ \PassOptionsToPackage{DIV#2}{typearea}}%
\else\scr at pti@nerr at r\fi
\else\@BCOR\fi
}
@@ -887,7 +890,7 @@
\relax}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $
%%% (run: option)
\KOMA at ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -1474,13 +1477,13 @@
\newcommand*{\scr at symbol@www}{\undefined}
%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: body)
\expandafter\ifnum \@nameuse{scr at v@2.95}>\scr at compatibility\relax
\newcommand*{\@setif}[2][]{%
@@ -1968,7 +1971,7 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
@@ -2089,7 +2092,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 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore at catcode@level}%
@@ -2263,7 +2266,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP at size{#2}\edef\LOPNP at option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
%%% (run: body)
\newcommand*{\g at addnumerical@date}[2]{%
\@ifundefined{date#1}{%
@@ -3118,7 +3121,7 @@
\@tempa%
}
\newcommand*{\addtoplength}{\@addtoplength}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -3681,7 +3684,7 @@
\newcommand*{\scr at fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $
%%% (run: body)
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
@@ -4219,9 +4222,12 @@
\if at baddr
\Ifkomavarempty{backaddress}{}{{%
\noindent%
- \def\\{\usekomavar{backaddressseparator}\@ogobble}%
- \backaddr at format{\scriptsize\usekomafont{backaddress}%
- \usekomavar{backaddress}}}}%
+ \backaddr at format{\scriptsize
+ {%
+ \def\\{\usekomavar{backaddressseparator}\@ogobble}%
+ \usekomafont{backaddress}%
+ {\usekomavar{backaddress}}%
+ }}}}%
\fi
}{backaddress}{backaddrheight}{\setkomavar}%
\ifcase \ltr at priority
Deleted: trunk/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -1,1088 +0,0 @@
-%%
-%% This is file `scrpage2.sty',
-%% generated with the docstrip utility, extended by scrdocstrip.
-%%
-%% The original source files were:
-%%
-%% scrpage.dtx (with options: `scrpage')
-%% scrlogo.dtx (with options: `logo')
-%%
-%% Copyright (c) 1994-2019 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.txt'. 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: scrpage.dtx 3403 2019-11-23 15:38:36Z kohm $
-\NeedsTeXFormat{LaTeX2e}[1995/06/01]
-\ProvidesPackage{scrpage2}[%
- 2020/01/24 v3.29 KOMA-Script
- package
- (page head and foot)]
-\PackageWarning{scrpage2}{usage of obsolete package!\MessageBreak
- Package `scrpage2' is obsolete.\MessageBreak
- You should not longer use package `scrpage2'.\MessageBreak
- You should replace usage of package `scrpage2'\MessageBreak
- by `scrlayer-scrpage'}
-\newcommand*{\@Pass at Obsolete@Option at To@Typearea}[1]{%
- \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
- \ifin@
- \PackageWarningNoLine{scrpage2}{%
- deprecated passing option `\CurrentOption' to scrpage2.\MessageBreak
- If you are using package typearea or\MessageBreak
- a KOMA-Script class since version 3.00\MessageBreak
- you may use `\string\KOMAoptions{#1}' and\MessageBreak
- remove passing `\CurrentOption' to scrpage2%
- }%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname KOMAoptions\endcsname\relax
- \PassOptionsToPackage{#1}{typearea}%
- \else
- \KOMAoptions{#1}\csname relcalctypearea\endcsname
- \fi
- \fi
-}
-\DeclareOption{headinclude}{%
- \@Pass at Obsolete@Option at To@Typearea{headinclude}%
-}
-\DeclareOption{headexclude}{%
- \@Pass at Obsolete@Option at To@Typearea{headinclude=false}%
-}
-\DeclareOption{footinclude}{%
- \@Pass at Obsolete@Option at To@Typearea{footinclude}%
-}
-\DeclareOption{footexclude}{%
- \@Pass at Obsolete@Option at To@Typearea{footinclude=false}%
-}
-\@ifundefined{@mincltrue}{\newif\if at mincl}{}
-\DeclareOption{mpinclude}{\@mincltrue}
-\DeclareOption{mpexclude}{\@minclfalse}
-\newcommand*{\scr at headabove@linethickness}{0pt}
-\newcommand*{\scr at headbelow@linethickness}{0pt}
-\newcommand*{\scr at footabove@linethickness}{0pt}
-\newcommand*{\scr at footbelow@linethickness}{0pt}
-\newcommand*{\scr at headabove@linelength}{\@headwidth}
-\newcommand*{\scr at headbelow@linelength}{\@headwidth}
-\newcommand*{\scr at footabove@linelength}{\@footwidth}
-\newcommand*{\scr at footbelow@linelength}{\@footwidth}
-\newcommand*{\scrplain at headabove@linelength}{0pt}
-\newcommand*{\scrplain at headbelow@linelength}{0pt}
-\newcommand*{\scrplain at footabove@linelength}{0pt}
-\newcommand*{\scrplain at footbelow@linelength}{0pt}
-\DeclareOption{headtopline}{%
- \renewcommand*{\scr at headabove@linethickness}{.4pt}
- \PassOptionsToPackage{headinclude}{typearea}}
-\DeclareOption{headsepline}{%
- \renewcommand*{\scr at headbelow@linethickness}{.4pt}
- \PassOptionsToPackage{headinclude}{typearea}}
-\DeclareOption{footsepline}{%
- \renewcommand*{\scr at footabove@linethickness}{.4pt}
- \PassOptionsToPackage{footinclude}{typearea}}
-\DeclareOption{footbotline}{
- \renewcommand*{\scr at footbelow@linethickness}{.4pt}
- \PassOptionsToPackage{footinclude}{typearea}}
-\DeclareOption{plainheadtopline}{%
- \renewcommand*{\scrplain at headabove@linelength}{\scr at headabove@linelength}
- \PassOptionsToPackage{headinclude}{typearea}}
-\DeclareOption{plainheadsepline}{%
- \renewcommand*{\scrplain at headbelow@linelength}{\scr at headbelow@linelength}
- \PassOptionsToPackage{headinclude}{typearea}}
-\DeclareOption{plainfootsepline}{%
- \renewcommand*{\scrplain at footabove@linelength}{\scr at footabove@linelength}
- \PassOptionsToPackage{footinclude}{typearea}}
-\DeclareOption{plainfootbotline}{
- \renewcommand*{\scrplain at footbelow@linelength}{\scr at footbelow@linelength}
- \PassOptionsToPackage{footinclude}{typearea}}
-\newcommand*{\hfline at adjust}{1}
-\DeclareOption{ilines}{\renewcommand*{\hfline at adjust}{0}}
-\DeclareOption{clines}{\renewcommand*{\hfline at adjust}{1}}
-\DeclareOption{olines}{\renewcommand*{\hfline at adjust}{2}}
-\DeclareOption{automark}{%
- \AtEndOfPackage{\if at twoside%
- \if at chapter\automark[section]{chapter}%
- \else\automark[subsection]{section}\fi%
- \else%
- \if at chapter\automark{chapter}\else\automark{section}\fi%
- \fi}}
-\DeclareOption{manualmark}{\AtEndOfPackage{\manualmark}}
-\newif\if at autooneside\@autoonesidefalse
-\DeclareOption{autooneside}{\@autoonesidetrue}
-\DeclareOption{markuppercase}{\let\MakeMarkcase\MakeUppercase}
-\DeclareOption{markusedcase}{\let\MakeMarkcase\@empty}
-\newcommand*{\scr at nouppercase}{}
-\DeclareOption{nouppercase}{\renewcommand*{\scr at nouppercase}{%
- \let\uppercase\relax\let\MakeUppercase\relax
- \expandafter\let\csname MakeUppercase \endcsname\relax}
- \ifx\MakeMarkcase\MakeUppercase
- \PackageWarning{scrpage2}{%
- Option 'markuppercase' will be ignored.\MessageBreak%
- You shouldn't use option 'markuppercase' together\MessageBreak%
- with option 'nouppercase'}
- \let\MakeMarkcase\@empty
- \fi}
-\DeclareOption{komastyle}{\def\scrheadings at style{koma}
- \@ifundefined{MakeMarkcase}{\let\MakeMarkcase\relax}{}}
-\DeclareOption{standardstyle}{\def\scrheadings at style{standard}
- \@ifundefined{MakeMarkcase}{\let\MakeMarkcase\MakeUppercase}{}}
-\ExecuteOptions{}
-\ProcessOptions\relax
-\newif\if at chapter
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname chapter\endcsname\relax
- \@chapterfalse
-\else
- \@chaptertrue
-\fi
-\def\@tempa{\newif\if at mainmatter\@mainmattertrue}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname mainmatter\endcsname\relax
-\else
- \@ifundefined{@mainmattertrue}{%
- \PackageWarningNoLine{scrpage2}{%
- \string\mainmatter\space defined without
- \expandafter\string\csname if at mainmatter\endcsname!\MessageBreak
- This switch is obligatory for scrpage2 to omit\MessageBreak
- running head chapter numbers in front and\MessageBreak
- back matter and will be defined now%
- }%
- }{%
- \let\@tempa\relax
- }%
-\fi
-\@tempa
-\let\headmark\relax
-\DeclareRobustCommand\pagemark{{\pnumfont\thepage}}
-\newif\if at automark\@automarkfalse
-\def\defpagestyle{%
- \@ifstar
- {\@defpagestyle[-]}%
- {\@defpagestyle[+]}}
-\def\@defpagestyle[#1]#2#3#4{%
- \expandafter\def\csname ps@#2\endcsname{%
- \if at automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
- \def at head#3
- \def at foot#4
- }%
-}
-\def\def at head{%
- \kernel at ifnextchar(%)
- {\def@@head}%
- {\def@@head(\scr at headabove@linelength,%
- \scr at headabove@linethickness)}}
-\def\def@@head(#1,#2)#3#4#5{%
- \kernel at ifnextchar(%)
- {\def@@@head({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@head({#1},{#2}){#3}{#4}{#5}%
- (\scr at headbelow@linelength,%
- \scr at headbelow@linethickness)}}
-\def\def@@@head(#1,#2)#3#4#5(#6,#7){%
- \def\@evenhead{%
- \if at twoside
- \let\headmark\leftmark%
- \hss\hskip\@evenheadshift\vbox{\hsize=\@headwidth\relax%
- \hf at rule{#1}{#2}{\@headwidth}{headabove}%
- \vskip#2
- \vskip\baselineskip
- \hb at xt@\@headwidth{{%
- \scr at nouppercase
- \headfont\strut #3}}%
- \hf at rule{#6}{#7}{\@headwidth}{headbelow}%
- }\hskip\@oddheadshift\hss
- \fi
- }%
- \def\@oddhead{\let\headmark\rightmark
- \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
- \hf at rule{#1}{#2}{\@headwidth}{headabove}%
- \vskip#2%
- \vskip\baselineskip
- \hb at xt@\@headwidth{{%
- \scr at nouppercase
- \headfont\strut \if at twoside #4\else #5\fi}}%
- \hf at rule{#6}{#7}{\@headwidth}{headbelow}%
- }\hskip\@evenheadshift\hss}%
-}
-\def\def at foot{%
- \kernel at ifnextchar(%)
- {\def@@foot}
- {\def@@foot(\scr at footabove@linelength,%
- \scr at footabove@linethickness)}}
-\def\def@@foot(#1,#2)#3#4#5{%
- \kernel at ifnextchar(%)
- {\def@@@foot({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@foot({#1},{#2}){#3}{#4}{#5}%
- (\scr at footbelow@linelength,%
- \scr at footbelow@linethickness)}}
-\def\def@@@foot(#1,#2)#3#4#5(#6,#7){%
- \def\@evenfoot{%
- \if at twoside
- \let\headmark\leftmark
- \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot at rule{#1}{#2}\hb at xt@\@footwidth{{%
- \scr at nouppercase
- \headfont\footfont\strut #3}}%
- \botfoot at rule{#6}{#7}}\hskip\@oddfootshift\hss
- \fi
- }%
- \def\@oddfoot{\let\headmark\rightmark
- \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot at rule{#1}{#2}\hb at xt@\@footwidth{{%
- \scr at nouppercase
- \headfont\footfont\strut \if at twoside #4\else #5\fi}}%
- \botfoot at rule{#6}{#7}}\hskip\@evenfootshift\hss}%
-}
-\newcommand\topfoot at rule[2]{%
- \@tempdima\baselineskip\advance\@tempdima by-.7\normalbaselineskip
- \advance\@tempdima by -#2
- \vskip\@tempdima\hf at rule{#1}{#2}{\@footwidth}{footabove}%
- \vskip-\@tempdima}
-\newcommand\botfoot at rule[2]{%
- \@tempdima-\baselineskip\advance\@tempdima by .3\normalbaselineskip
- \advance\@tempdima by #2
- \vskip\@tempdima\hf at rule{#1}{#2}{\@footwidth}{footbelow}%
-}
-\newcommand*{\hf at rule}[4]{%
- \setlength{\@tempdimb}{#1}
- \begingroup
- \csname scr at pre@#4 at line\endcsname
- \if at twoside
- \ifodd\c at page
- \edef\@tempa{\hfline at adjust}%
- \else
- \@tempcnta=2\advance\@tempcnta -\hfline at adjust
- \edef\@tempa{\the\@tempcnta}%
- \fi
- \else
- \edef\@tempa{\hfline at adjust}%
- \fi
- \ifnum\@tempa=1
- \setlength{\@tempdimb}{.5\@tempdimb}%
- \fi
- \hb at xt@#3{%
- \ifnum\@tempa>0
- \hfill%
- \llap{\vrule\@depth#2\@height\z@\@width\@tempdimb}%
- \fi
- \ifnum\@tempa<2
- \rlap{\vrule\@depth#2\@height\z@\@width\@tempdimb}%
- \hfill%
- \fi
- }%
- \endgroup
-}
-\newcommand*{\scr at pre@headabove at line}{}
-\newcommand*{\scr at fnt@headtopline}{\scr at pre@headabove at line}
-\newcommand*{\scr at pre@headbelow at line}{}
-\newcommand*{\scr at fnt@headsepline}{\scr at pre@headbelow at line}
-\newcommand*{\scr at pre@footabove at line}{}
-\newcommand*{\scr at fnt@footsepline}{\scr at pre@footabove at line}
-\newcommand*{\scr at pre@footbelow at line}{}
-\newcommand*{\scr at fnt@footbottomline}{\scr at pre@footbelow at line}
-\newcommand*{\scr at fnt@instead at footbotline}{footbottomline}
-\def\newpagestyle{%
- \@ifstar
- {\@newpagestyle[-]}%
- {\@newpagestyle[+]}}
-\def\@newpagestyle[#1]#2#3#4{%
- \expandafter\ifx\csname ps@#2\endcsname\relax
- \@defpagestyle[#1]{#2}{#3}{#4}%
- \else
- \PackageError
- {scrpage2}%
- {Your command was ignored}%
- {There is already a pagestyle named ``#1''.\MessageBreak%
- Use \protect\defpagestyle\space, \protect\renewpagestyle or
- \protect\providepagestyle.}%
- \fi
-}
-\def\renewpagestyle{%
- \@ifstar
- {\@renewpagestyle[-]}%
- {\@renewpagestyle[+]}}
-\def\@renewpagestyle[#1]#2#3#4{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname ps@#2\endcsname\relax
- \PackageError
- {scrpage2}%
- {Your command was ignored}%
- {There is no pagestyle named ``#1''.\MessageBreak%
- Use \protect\defpagestyle, \protect\newpagestyle or
- \protect\providepagestyle.}%
- \else
- \@defpagestyle[#1]{#2}{#3}{#4}%
- \fi
-}
-\def\providepagestyle{%
- \@ifstar
- {\@providepagestyle[-]}%
- {\@providepagestyle[+]}}
-\def\@providepagestyle[#1]#2#3#4{%
- \expandafter\ifx\csname ps@#2\endcsname\relax
- \@defpagestyle[#1]{#2}{#3}{#4}%
- \else
- \PackageInfo
- {scrpage2}%
- {\protect\providepagestyle\protect{#1\protect} ignored.}%
- \fi
-}
-\def\deftripstyle{%
- \@ifstar
- {\@deftripstyle[-]}%
- {\@deftripstyle[+]}}
-\def\@deftripstyle[#1]#2{%
- \kernel at ifnextchar[%]
- {\@@deftripstyle[#1]{#2}}%
- {\@@deftripstyle[#1]{#2}[\z@]}}
-\def\@@deftripstyle[#1]#2[#3]{%
- \def\@tempa{#1}%
- \kernel at ifnextchar[%]
- {\@@@deftripstyle#2[#3]}%
- {\@@@deftripstyle#2[\z@][#3]}}
-\def\@@@deftripstyle#1[#2][#3]#4#5#6#7#8#9{%
- \def\@tempb{+}%
- \ifx\@tempa\@tempb
- \defpagestyle{#1}%
- {(\@headwidth,#2)%
- {\rlap{#6}\hfill{#5}\hfill\llap{#4}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- (\@headwidth,#3)}%
- {(\@footwidth,#3)%
- {\rlap{#9}\hfill{#8}\hfill\llap{#7}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- (\@footwidth,#2)}%
- \else
- \defpagestyle*{#1}%
- {(\@headwidth,#2)%
- {\rlap{#6}\hfill{#5}\hfill\llap{#4}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- (\@headwidth,#3)}%
- {(\@footwidth,#3)%
- {\rlap{#9}\hfill{#8}\hfill\llap{#7}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- (\@footwidth,#2)}%
- \fi
-}
-\newcommand*{\@iflevelok}[4]{%
- \begingroup
- \edef\@tempa{#1}\ifx\@tempa\@empty\def\@tempa{\endgroup #3}\else
- \def\@tempa{\csname #1level\endcsname}%
- \def\@tempb{\csname #2level\endcsname}%
- \ifnum \@tempa>\@tempb
- \def\@tempa{\endgroup#3}%
- \else
- \def\@tempa{\endgroup#4}%
- \fi\fi\@tempa}
-\providecommand{\markleft}[1]{%
- \begingroup
- \let\label\relax \let\index\relax \let\glossary\relax
- \expandafter\@markleft\@themark {#1}%
- \@temptokena \expandafter{\@themark}%
- \mark{\the\@temptokena}%
- \endgroup
- \if at nobreak\ifvmode\nobreak\fi\fi}
-\providecommand{\@markleft}[3]{\@temptokena {#2}%
- \unrestored at protected@xdef\@themark{{#3}{\the\@temptokena}}}
-\newcommand*{\automark}[2][\@empty]{%
- \manualmark
- \@automarktrue
- \begingroup
- \edef\@tempa{#2}\ifx\@tempa\@empty
- \endgroup
- \PackageWarning{scrpage2}%
- {\string\automark\space with empty obligatory argument}%
- \else
- \endgroup
- \expandafter\def\csname #2mark\endcsname##1{%
- \begingroup
- \def\@tempa{\csname #2level\endcsname}%
- \@tempswafalse
- \ifnum \c at secnumdepth <\@tempa\else\if at mainmatter
- \@tempswatrue
- \fi\fi
- \edef\@tempa{#1}%
- \if at twoside\edef\@tempb{#2}\else\let\@tempb\@tempa\fi
- \ifx\@tempa\@tempb
- \if at tempswa
- \@mkboth{\MakeMarkcase{\csname #2markformat\endcsname ##1}}%
- {\MakeMarkcase{\csname #2markformat\endcsname ##1}}%
- \else%
- \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
- \fi
- \else
- \if at tempswa
- \@iflevelok{#1}{#2}{%
- \@mkboth{\MakeMarkcase{\csname #2markformat\endcsname
- ##1}}{}}{%
- \ifx\@mkboth\markboth\markleft{\MakeMarkcase{\csname
- #2markformat\endcsname ##1}}%
- \fi}
- \else
- \@iflevelok{#1}{#2}{%
- \@mkboth{\MakeMarkcase{##1}}{}}{%
- \ifx\@mkboth\markboth\markleft{\MakeMarkcase{##1}}\fi}%
- \fi
- \fi
- \endgroup
- }
- \fi
- \begingroup
- \edef\@tempa{#1}\edef\@tempb{#2}%
- \if at autooneside\if at twoside\else\let\@tempa\@empty\fi\fi
- \ifx\@tempa\@empty
- \endgroup
- \else
- \ifx\@tempa\@tempb
- \endgroup
- \else
- \endgroup
- \expandafter\def\csname #1mark\endcsname##1{%
- \begingroup
- \def\@tempa{\csname #1level\endcsname}%
- \@tempswafalse
- \ifnum \c at secnumdepth <\@tempa\else\if at mainmatter
- \@tempswatrue
- \fi\fi
- \if at tempswa
- \@iflevelok{#1}{#2}{%
- \ifx\@mkboth\markboth
- \markright{\MakeMarkcase{\csname #1markformat\endcsname
- ##1}}%
- \fi}{%
- \@mkboth{}{\MakeMarkcase{\csname #1markformat\endcsname
- ##1}}}%
- \else
- \@iflevelok{#1}{#2}{%
- \ifx\@mkboth\markboth
- \markright{\MakeMarkcase{##1}}%
- \fi}{%
- \@mkboth{}{\MakeMarkcase{##1}}}%
- \fi
- \endgroup
- }
- \fi\fi%
- \let\@mkboth\markboth
-}
-\newcommand*{\manualmark}{%
- \if at chapter\let\chaptermark\@gobble\fi
- \let\sectionmark\@gobble
- \let\subsectionmark\@gobble
- \let\subsubsectionmark\@gobble
- \let\paragraphmark\@gobble
- \let\subparagraphmark\@gobble
- \let\@mkboth\@gobbletwo
- \@automarkfalse
-}
-\newcommand*{\partlevel}{-1}
-\newcommand*{\chapterlevel}{0}
-\newcommand*{\sectionlevel}{1}
-\newcommand*{\subsectionlevel}{2}
-\newcommand*{\subsubsectionlevel}{3}
-\newcommand*{\paragraphlevel}{4}
-\newcommand*{\subparagraphlevel}{5}
-\@ifundefined{MakeMarkcase}{%
- \@ifclassloaded{scrbook}{\let\MakeMarkcase\relax}{%
- \@ifclassloaded{scrreprt}{\let\MakeMarkcase\relax}{%
- \@ifclassloaded{scrartcl}{\let\MakeMarkcase\relax}{%
- \@ifclassloaded{scrlttr2}{\let\MakeMarkcase\relax}{%
- \@ifclassloaded{book}{}{%
- \@ifclassloaded{report}{}{%
- \@ifclassloaded{article}{}{%
- \PackageWarningNoLine{scrpage2}{%
- use of scrpage2 with unknown class.\MessageBreak
- Please mail to markus.kohm at gmx.de, if
- headmarks\MessageBreak
- are lower case without use of scrpage2}}}}%
- \let\MakeMarkcase\MakeUppercase}}}}}{}
-\@ifundefined{scrheadings at style}{%
- \@ifclassloaded{scrbook}{\def\scrheadings at style{koma}}{%
- \@ifclassloaded{scrreprt}{\def\scrheadings at style{koma}}{%
- \@ifclassloaded{scrartcl}{\def\scrheadings at style{koma}}{%
- \@ifclassloaded{scrlttr2}{\def\scrheadings at style{koma}}{%
- \def\scrheadings at style{standard}}}}}}{}
-\newcommand*{\settowidthof}[2]{%
- \edef\@tempa{#2}%
- \edef\@tempb{paper}\ifx\@tempa\@tempb
- \setlength{#1}{\paperwidth}%
- \else\edef\@tempb{text}\ifx\@tempa\@tempb
- \setlength{#1}{\textwidth}%
- \else\edef\@tempb{textwithmarginpar}\ifx\@tempa\@tempb
- \setlength{#1}{\textwidth}%
- \addtolength{#1}{\marginparwidth}%
- \addtolength{#1}{\marginparsep}%
- \else\edef\@tempb{head}\ifx\@tempa\@tempb
- \setlength{#1}{\@headwidth}%
- \else\edef\@tempb{foot}\ifx\@tempa\@tempb
- \setlength{#1}{\@footwidth}%
- \else\edef\@tempb{headtopline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr at headabove@linelength}%
- \else\edef\@tempb{headsepline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr at headbelow@linelength}%
- \else\edef\@tempb{footsepline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr at footabove@linelength}%
- \else\edef\@tempb{footbotline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr at footbelow@linelength}%
- \else\edef\@tempb{page}\ifx\@tempa\@tempb
- \setlength{#1}{\paperwidth}%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname ta at bcor\endcsname\relax\else
- \addtolength{#1}{-\ta at bcor}%
- \fi
- \else
- \setlength{#1}{#2}%
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
-}
-\newcommand*{\deftowidthof}[2]{%
- \edef\@tempa{#2}\edef\@tempb{autohead}\ifx\@tempa\@tempb
- \expandafter\def\csname #1\endcsname{\@headwidth}%
- \else\edef\@tempb{autofoot}\ifx\@tempa\@tempb
- \expandafter\def\csname #1\endcsname{\@footwidth}%
- \else
- \settowidthof{\@tempdima}{#2}%
- \expandafter\edef\csname #1\endcsname{\the\@tempdima}%
- \fi
- \fi
-}
-\newcommand*{\setheadwidth}[2][\@empty]{%
- \set at hf@width{head}{#1}{#2} %
-}
-\newcommand*{\setfootwidth}[2][\@empty]{%
- \set at hf@width{foot}{#1}{#2}%
-}
-\newcommand*{\set at hf@width}[3]{%
- \settowidthof{\@tempdima}{#3}%
- \ifdim\@tempdima>\paperwidth
- \PackageWarning
- {scrpage2}%
- {You've set width of #1 to a value\MessageBreak
- greater than width of page!\MessageBreak%
- I`ll reduce width of #1 to width of page}%
- \setlength{\@tempdima}{\paperwidth}%
- \else
- \ifdim\@tempdima<\z@
- \PackageWarning
- {scrpage2}%
- {You've set width of #1 to negative value!\MessageBreak%
- I'll set it to 0pt}%
- \setlength{\@tempdima}{\z@}%
- \fi
- \fi
- \expandafter\edef\csname @#1width\endcsname{\the\@tempdima}%
- \edef\@tempa{#2}%
- \setlength{\@tempdima}{\textwidth}%
- \addtolength{\@tempdima}{-\csname @#1width\endcsname}%
- \ifx\@tempa\@empty
- \if at twoside
- \setlength{\@tempdimb}{.3333333333\@tempdima}%
- \else
- \setlength{\@tempdimb}{.5\@tempdima}%
- \fi
- \else
- \setlength{\@tempdimb}{#2}%
- \fi
- \addtolength{\@tempdima}{-\@tempdimb}%
- \ifdim\@tempdimb<\z@
- \setlength{\@tempdimb}{-\@tempdimb}%
- \expandafter\edef\csname @odd#1shift\endcsname{-\the\@tempdimb}%
- \else
- \expandafter\edef\csname @odd#1shift\endcsname{\the\@tempdimb}%
- \fi
- \ifdim\@tempdima<\z@
- \setlength{\@tempdima}{-\@tempdima}%
- \expandafter\edef\csname @even#1shift\endcsname{-\the\@tempdima}%
- \else
- \expandafter\edef\csname @even#1shift\endcsname{\the\@tempdima}%
- \fi
-}
-\newcommand*{\@headwidth}{\textwidth}%
-\newcommand*{\@oddheadshift}{\z@}%
-\newcommand*{\@evenheadshift}{\z@}%
-\newcommand*{\@footwidth}{\textwidth}%
-\newcommand*{\@oddfootshift}{\z@}%
-\newcommand*{\@evenfootshift}{\z@}%
-\if at mincl
- \renewcommand*{\@headwidth}{}%
- \renewcommand*{\@footwidth}{}%
- \AtBeginDocument{%
- \ifx\@headwidth\@empty
- \setheadwidth[0pt]{textwithmarginpar}%
- \fi
- \ifx\@footwidth\@empty
- \setfootwidth[0pt]{textwithmarginpar}%
- \fi
- }
-\fi
-\providecommand*{\pnumfont}{\normalfont}
-\providecommand*{\headfont}{\normalfont\slshape}
-\def\scr at fnt@wrn at pagehead#1{%
- `pagehead' is only an alias of `pageheadfoot'.\MessageBreak
- Font of page foot may also be changed%
-}
-\providecommand*{\footfont}{\normalfont}
-\providecommand*{\scr at fnt@pagefoot}{\footfont}
-\let\scr at fnt@wrn at pagefoot\relax
-\newcommand*{\setheadtopline}{\scr at setline{head}{above}}
-\newcommand*{\setheadsepline}{\scr at setline{head}{below}}
-\newcommand*{\setfootsepline}{\scr at setline{foot}{above}}
-\newcommand*{\setfootbotline}{\scr at setline{foot}{below}}
-\def\scr at setline#1#2{%
- \kernel at ifnextchar[%]
- {\@scr at setline{#1}{#2}}{\@@scr at setline{#1#2}}%
-}
-\def\@scr at setline#1#2[#3]{%
- \edef\@tempa{#3}\edef\@tempa{auto}\ifx\@tempa\@tempb
- \deftowidthof{scr@#1#2 at linelength}{#3#1}%
- \else
- \deftowidthof{scr@#1#2 at linelength}{#3}%
- \fi
- \@@scr at setline{#1#2}%
-}
-\def\@@scr at setline#1#2{%
- \edef\@tempa{#2}\edef\@tempb{current}\ifx\@tempa\@empty\else
- \ifx\@tempa\@tempb\else
- \setlength{\@tempdima}{#2}%
- \expandafter\edef\csname scr@#1 at linethickness\endcsname%
- {\the\@tempdima}%
- \fi\fi
- \kernel at ifnextchar[%]
- {\@src at set@pre at line{#1}}{}%
-}
-\def\@src at set@pre at line#1[#2]{%
- \expandafter\def\csname scr at pre@#1 at line\endcsname{#2}%
-}
-\providecommand{\partmarkformat} {\partname\ \thepart. \ }
-\if at chapter
- \providecommand{\chaptermarkformat} {\@chapapp\ \thechapter. \ }
- \providecommand{\sectionmarkformat} {\thesection. \ }
- \providecommand{\subsectionmarkformat} {\@seccntmarkformat{subsection}}
-\else
- \providecommand{\sectionmarkformat} {\thesection\quad}
- \providecommand{\subsectionmarkformat} {\thesubsection\quad}
-\fi
-\providecommand{\subsubsectionmarkformat}{\@seccntmarkformat{subsubsection}}
-\providecommand{\paragraphmarkformat} {\@seccntmarkformat{paragraph}}
-\providecommand{\subparagraphmarkformat} {\@seccntmarkformat{subparagraph}}
-\providecommand{\@seccntmarkformat}[1] {\@seccntformat{#1}}
-\newcommand*{\ps at save@plain}{}
-\let\ps at save@plain\ps at plain
-\newcommand*{\ps at use@plain}{\let\save@@mkboth\@mkboth
- \ps at save@plain
- \let\@mkboth\save@@mkboth}
-\let\ps at plain\ps at use@plain
-\newcommand*{\ps at save@headings}{}
-\let\ps at save@headings\ps at headings
-\newcommand*{\ps at save@myheadings}{}
-\let\ps at save@myheadings\ps at myheadings
-\def\ps at headings{%
- \PackageWarning{scrpage2}%
- {you've used pagestyle ``headings''.\MessageBreak
- You should not use this pagestyle with a\MessageBreak
- scrpage2-pagestyle!\MessageBreak
- You should use pagestyle ``useheadings'' instead\MessageBreak}%
- \let\ps at plain\ps at save@plain%
- \ps at save@headings\@automarktrue}
-\def\ps at myheadings{%
- \PackageWarning{scrpage2}%
- {you've used pagestyle ``myheadings''.\MessageBreak
- You should not use this pagestyle with a\MessageBreak
- scrpage2-pagestyle!\MessageBreak
- You should use pagestyle ``useheadings'' instead\MessageBreak}%
- \let\ps at plain\ps at save@plain%
- \ps at save@myheadings\@automarkfalse}
-\newcommand*{\ps at useheadings}{%
- \if at automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
- \let\ps at plain\ps at use@plain
- \let\save@@mkboth\@mkboth
- \let\save at chaptermark\chaptermark
- \let\save at sectionmark\sectionmark
- \let\save at subsectionmark\subsectionmark
- \ifx\@mkboth\markboth\ps at save@headings\else\ps at save@myheadings\fi
- \let\@mkboth\save@@mkboth
- \let\chaptermark\save at chaptermark
- \let\sectionmark\save at sectionmark
- \let\subsectionmark\save at subsectionmark
-}
-\newcommand*{\ps at scrplain}{\let\ps at plain\ps@@scrplain\ps at plain}
-\newpagestyle{@scrplain}
-{%
- (\scrplain at headabove@linelength,\scr at headabove@linethickness)%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrplain at even@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering\strut
- \scrplain at even@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft
- \strut\scrplain at even@right at head\strut}}}%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrplain at odd@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering
- \strut\scrplain at odd@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft
- \strut\scrplain at odd@right at head\strut}}}%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrplain at odd@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering
- \strut\scrplain at odd@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft
- \strut\scrplain at odd@right at head\strut}}}%
- (\scrplain at headbelow@linelength,\scr at headbelow@linethickness)
-}{%
- (\scrplain at footabove@linelength,\scr at footabove@linethickness)
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrplain at even@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrplain at even@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrplain at even@right at foot\strut}}}%
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrplain at odd@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrplain at odd@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrplain at odd@right at foot\strut}}}%
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrplain at odd@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrplain at odd@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrplain at odd@right at foot\strut}}}%
- (\scrplain at footbelow@linelength,\scr at footbelow@linethickness)
-}
-\newcommand*{\scrplain at even@left at head}{}
-\newcommand*{\scrplain at even@middle at head}{}
-\newcommand*{\scrplain at even@right at head}{}
-\newcommand*{\scrplain at odd@left at head}{}
-\newcommand*{\scrplain at odd@middle at head}{}
-\newcommand*{\scrplain at odd@right at head}{}
-\newcommand*{\scrplain at even@left at foot}{}
-\newcommand*{\scrplain at even@middle at foot}{}
-\newcommand*{\scrplain at even@right at foot}{}
-\newcommand*{\scrplain at odd@left at foot}{}
-\newcommand*{\scrplain at odd@middle at foot}{}
-\newcommand*{\scrplain at odd@right at foot}{}
-\newcommand*{\ps at scrheadings}{\let\ps at plain\ps at scrplain\ps@@scrheadings}
-\newpagestyle{@scrheadings}
-{%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrheadings at even@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering
- \strut\scrheadings at even@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft%
- \strut\scrheadings at even@right at head\strut}}}%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrheadings at odd@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering
- \strut\scrheadings at odd@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft%
- \strut\scrheadings at odd@right at head\strut}}}%
- {%
- \rlap{\parbox{\@headwidth}{\raggedright
- \strut\scrheadings at odd@left at head\strut}}%
- \hfill
- \parbox{\@headwidth}{\centering
- \strut\scrheadings at odd@middle at head\strut}%
- \hfill
- \llap{\parbox{\@headwidth}{\raggedleft
- \strut\scrheadings at odd@right at head\strut}}}}%
-{%
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrheadings at even@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrheadings at even@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrheadings at even@right at foot\strut}}}%
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrheadings at odd@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrheadings at odd@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrheadings at odd@right at foot\strut}}}%
- {%
- \rlap{\parbox{\@footwidth}{\raggedright
- \strut\scrheadings at odd@left at foot\strut}}%
- \hfill
- \parbox{\@footwidth}{\centering
- \strut\scrheadings at odd@middle at foot\strut}%
- \hfill
- \llap{\parbox{\@footwidth}{\raggedleft
- \strut\scrheadings at odd@right at foot\strut}}%
- }%
-}
-\newcommand*{\scrheadings at even@left at head}{}
-\newcommand*{\scrheadings at even@middle at head}{}
-\newcommand*{\scrheadings at even@right at head}{}
-\newcommand*{\scrheadings at odd@left at head}{}
-\newcommand*{\scrheadings at odd@middle at head}{}
-\newcommand*{\scrheadings at odd@right at head}{}
-\newcommand*{\scrheadings at even@left at foot}{}
-\newcommand*{\scrheadings at even@middle at foot}{}
-\newcommand*{\scrheadings at even@right at foot}{}
-\newcommand*{\scrheadings at odd@left at foot}{}
-\newcommand*{\scrheadings at odd@middle at foot}{}
-\newcommand*{\scrheadings at odd@right at foot}{}
-\newcommand{\ihead}{\kernel at ifnextchar[{\@@lhead}{\@lhead}}
-\newcommand{\@lhead}[1]{\@rehead{#1}\@lohead{#1}}
-\newcommand{\@@lhead}[2][]{\@@rehead[{#1}]{#2}\@@lohead[{#1}]{#2}}
-\newcommand{\ohead}{\kernel at ifnextchar[{\@@rhead}{\@rhead}}
-\newcommand{\@rhead}[1]{\@lehead{#1}\@rohead{#1}}
-\newcommand{\@@rhead}[2][]{\@@lehead[{#1}]{#2}\@@rohead[{#1}]{#2}}
-\newcommand{\chead}{\kernel at ifnextchar[{\@@chead}{\@chead}}
-\newcommand{\@chead}[1]{\@cehead{#1}\@cohead{#1}}
-\newcommand{\@@chead}[2][]{\@@cehead[{#1}]{#2}\@@cohead[{#1}]{#2}}
-\newcommand{\lehead}{\kernel at ifnextchar[{\@@lehead}{\@lehead}}
-\newcommand{\@lehead}[1]{\renewcommand*{\scrheadings at even@left at head}{#1}}
-\newcommand{\@@lehead}[2][]{%
- \renewcommand*{\scrplain at even@left at head}{#1}%
- \renewcommand*{\scrheadings at even@left at head}{#2}}
-\newcommand{\lohead}{\kernel at ifnextchar[{\@@lohead}{\@lohead}}
-\newcommand{\@lohead}[1]{\renewcommand*{\scrheadings at odd@left at head}{#1}}
-\newcommand{\@@lohead}[2][]{%
- \renewcommand*{\scrplain at odd@left at head}{#1}%
- \renewcommand*{\scrheadings at odd@left at head}{#2}}
-\newcommand{\rehead}{\kernel at ifnextchar[{\@@rehead}{\@rehead}}
-\newcommand{\@rehead}[1]{\renewcommand*{\scrheadings at even@right at head}{#1}}
-\newcommand{\@@rehead}[2][]{%
- \renewcommand*{\scrplain at even@right at head}{#1}%
- \renewcommand*{\scrheadings at even@right at head}{#2}}
-\newcommand{\rohead}{\kernel at ifnextchar[{\@@rohead}{\@rohead}}
-\newcommand{\@rohead}[1]{\renewcommand*{\scrheadings at odd@right at head}{#1}}
-\newcommand{\@@rohead}[2][]{%
- \renewcommand*{\scrplain at odd@right at head}{#1}%
- \renewcommand*{\scrheadings at odd@right at head}{#2}}
-\newcommand{\cehead}{\kernel at ifnextchar[{\@@cehead}{\@cehead}}
-\newcommand{\@cehead}[1]{\renewcommand*{\scrheadings at even@middle at head}{#1}}
-\newcommand{\@@cehead}[2][]{%
- \renewcommand*{\scrplain at even@middle at head}{#1}%
- \renewcommand*{\scrheadings at even@middle at head}{#2}}
-\newcommand{\cohead}{\kernel at ifnextchar[{\@@cohead}{\@cohead}}
-\newcommand{\@cohead}[1]{\renewcommand*{\scrheadings at odd@middle at head}{#1}}
-\newcommand{\@@cohead}[2][]{%
- \renewcommand*{\scrplain at odd@middle at head}{#1}%
- \renewcommand*{\scrheadings at odd@middle at head}{#2}}
-\newcommand{\ifoot}{\kernel at ifnextchar[{\@@lfoot}{\@lfoot}}
-\newcommand{\@lfoot}[1]{\@refoot{#1}\@lofoot{#1}}
-\newcommand{\@@lfoot}[2][]{\@@refoot[{#1}]{#2}\@@lofoot[{#1}]{#2}}
-\newcommand{\ofoot}{\kernel at ifnextchar[{\@@rfoot}{\@rfoot}}
-\newcommand{\@rfoot}[1]{\@lefoot{#1}\@rofoot{#1}}
-\newcommand{\@@rfoot}[2][]{\@@lefoot[{#1}]{#2}\@@rofoot[{#1}]{#2}}
-\newcommand{\cfoot}{\kernel at ifnextchar[{\@@cfoot}{\@cfoot}}
-\newcommand{\@cfoot}[1]{\@cefoot{#1}\@cofoot{#1}}
-\newcommand{\@@cfoot}[2][]{\@@cefoot[{#1}]{#2}\@@cofoot[{#1}]{#2}}
-\newcommand{\lefoot}{\kernel at ifnextchar[{\@@lefoot}{\@lefoot}}
-\newcommand{\@lefoot}[1]{\renewcommand*{\scrheadings at even@left at foot}{#1}}
-\newcommand{\@@lefoot}[2][]{%
- \renewcommand*{\scrplain at even@left at foot}{#1}%
- \renewcommand*{\scrheadings at even@left at foot}{#2}}
-\newcommand{\lofoot}{\kernel at ifnextchar[{\@@lofoot}{\@lofoot}}
-\newcommand{\@lofoot}[1]{\renewcommand*{\scrheadings at odd@left at foot}{#1}}
-\newcommand{\@@lofoot}[2][]{%
- \renewcommand*{\scrplain at odd@left at foot}{#1}%
- \renewcommand*{\scrheadings at odd@left at foot}{#2}}
-\newcommand{\refoot}{\kernel at ifnextchar[{\@@refoot}{\@refoot}}
-\newcommand{\@refoot}[1]{\renewcommand*{\scrheadings at even@right at foot}{#1}}
-\newcommand{\@@refoot}[2][]{%
- \renewcommand*{\scrplain at even@right at foot}{#1}%
- \renewcommand*{\scrheadings at even@right at foot}{#2}}
-\newcommand{\rofoot}{\kernel at ifnextchar[{\@@rofoot}{\@rofoot}}
-\newcommand{\@rofoot}[1]{\renewcommand*{\scrheadings at odd@right at foot}{#1}}
-\newcommand{\@@rofoot}[2][]{%
- \renewcommand*{\scrplain at odd@right at foot}{#1}%
- \renewcommand*{\scrheadings at odd@right at foot}{#2}}
-\newcommand{\cefoot}{\kernel at ifnextchar[{\@@cefoot}{\@cefoot}}
-\newcommand{\@cefoot}[1]{\renewcommand*{\scrheadings at even@middle at foot}{#1}}
-\newcommand{\@@cefoot}[2][]{%
- \renewcommand*{\scrplain at even@middle at foot}{#1}%
- \renewcommand*{\scrheadings at even@middle at foot}{#2}}
-\newcommand{\cofoot}{\kernel at ifnextchar[{\@@cofoot}{\@cofoot}}
-\newcommand{\@cofoot}[1]{\renewcommand*{\scrheadings at odd@middle at foot}{#1}}
-\newcommand{\@@cofoot}[2][]{%
- \renewcommand*{\scrplain at odd@middle at foot}{#1}%
- \renewcommand*{\scrheadings at odd@middle at foot}{#2}}
-\newcommand*{\clearscrheadings}{%
- \ihead{}\chead{}\ohead{}\ifoot{}\cfoot{}\ofoot{}}
-\newcommand*{\clearscrheadfoot}{%
- \ihead[]{}\chead[]{}\ohead[]{}\ifoot[]{}\cfoot[]{}\ofoot[]{}}
-\newcommand*{\clearscrplain}{%
- \renewcommand*{\scrplain at even@left at head}{}%
- \renewcommand*{\scrplain at even@middle at head}{}%
- \renewcommand*{\scrplain at even@right at head}{}%
- \renewcommand*{\scrplain at odd@left at head}{}%
- \renewcommand*{\scrplain at odd@middle at head}{}%
- \renewcommand*{\scrplain at odd@right at head}{}%
- \renewcommand*{\scrplain at even@left at foot}{}%
- \renewcommand*{\scrplain at even@middle at foot}{}%
- \renewcommand*{\scrplain at even@right at foot}{}%
- \renewcommand*{\scrplain at odd@left at foot}{}%
- \renewcommand*{\scrplain at odd@middle at foot}{}%
- \renewcommand*{\scrplain at odd@right at foot}{}%
-}
-\def\@tempa{koma}\ifx\scrheadings at style\@tempa
- \@ifclassloaded{scrlttr2}{%
- \ifcase\@pageat
- \lehead[\pagemark]{\pagemark}\lohead[\pagemark]{\pagemark}%
- \chead{\rightmark}%
- \rehead{\leftmark}\rohead{\leftmark}%
- \or
- \lehead{\leftmark}\lohead{\leftmark}%
- \chead[\pagemark]{\pagemark}%
- \rehead{\rightmark}\rohead{\rightmark}%
- \or
- \lehead{\leftmark}\lohead{\leftmark}%
- \chead{\rightmark}%
- \rehead[\pagemark]{\pagemark}\rohead[\pagemark]{\pagemark}%
- \or
- \lehead{\leftmark}\lohead{\leftmark}%
- \rehead{\rightmark}\rohead{\rightmark}%
- \lefoot[\pagemark]{\pagemark}\lofoot[\pagemark]{\pagemark}%
- \or
- \lehead{\leftmark}\lohead{\leftmark}%
- \rehead{\rightmark}\rohead{\rightmark}%
- \cfoot[\pagemark]{\pagemark}%
- \or
- \lehead{\leftmark}\lohead{\leftmark}%
- \rehead{\rightmark}\rohead{\rightmark}%
- \refoot[\pagemark]{\pagemark}\rofoot[\pagemark]{\pagemark}%
- \fi
- \let\ps at save@myheadings=\ps at save@headings
- }{%
- \ohead{\if at twoside\headmark\fi}%
- \chead{\if at twoside\else\headmark\fi}%
- \cfoot[\if at twoside\else\pagemark\fi]{\if at twoside\else\pagemark\fi}%
- \ofoot[\if at twoside\pagemark\fi]{\if at twoside\pagemark\fi}%
- }%
-\else\def\@tempa{standard}\ifx\scrheadings at style\@tempa
- \ihead{\headmark}
- \ohead{\pagemark}
- \cfoot[\pagemark]{}
- \else\PackageError{scrpage2}{unknown scrheadings style}%
- {Somehow \string\scrheadings at style was
- defined\MessageBreak
- as ``\scrheadings at style''.\MessageBreak
- scrpage2 doesn't know what to do.
- If you'll continue, pagestyle
- ``scrheadings''\MessageBreak
- will be predefined empty.}
-\fi\fi
-\begingroup\expandafter\expandafter\expandafter\endgroup\expandafter
-\ifx\csname chaptermark\endcsname\relax
- \begingroup\expandafter\expandafter\expandafter\endgroup\expandafter
- \ifx\csname sectionmark\endcsname\relax
- \ifx\@mkboth\markboth\@automarktrue\fi
- \else
- \ifx\sectionmark\@gobble\else
- \begingroup
- \def\@gobble#1{}\ifx\sectionmark\@gobble\else
- \aftergroup\@automarktrue
- \fi
- \endgroup
- \fi
- \fi
-\else
- \ifx\chaptermark\@gobble\else
- \begingroup
- \def\@gobble#1{}\ifx\chaptermark\@gobble\else
- \aftergroup\@automarktrue
- \fi
- \endgroup
- \fi
-\fi
-\InputIfFileExists{scrpage.cfg}
- {\typeout{*************************************^^J%
- * Local config file scrpage.cfg used^^J%
- *************************************}}
- {}
-\AtBeginDocument{%
- \ifdim\headheight=12pt
- \PackageWarningNoLine{scrpage2}%
- {seems you are using a constant headheight.\MessageBreak
- If you get overfull \string\vbox\space warnings at almost every%
- \MessageBreak
- page, you should increase headheight e.g. writing\MessageBreak
- \space\string\setlength{\string\headheight}{%
- 1.1\string\baselineskip}\MessageBreak
- into the preamble of your document.\MessageBreak
- A better solution would be to use typearea package}%
- \else\ifdim\headheight<1.07\baselineskip
- \PackageWarningNoLine{scrpage2}%
- {seems you are using a very small headheight.\MessageBreak
- If you get overfull \string\vbox\space warnings at almost every%
- \MessageBreak
- page, you should increase headheight e.g. writing\MessageBreak
- \space\string\setlength{\string\headheight}{%
- 1.1\string\baselineskip}\MessageBreak
- into the preamble of your document.\MessageBreak
- A better solution would be to use typearea package}%
- \fi\fi}
-%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
-\@ifundefined{KOMAScript}{%
- \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
- M\kern.05em A\kern.1em-\kern.1em Script}}}{}
-\endinput
-%%
-%% End of file `scrpage2.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrreport.cls 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrreport.cls 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -60,7 +60,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -77,7 +77,7 @@
\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
\edef\KOMALongClassFileName{\KOMALongClassFileName}
\ProvidesClass{\KOMALongClassName}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 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 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls 2020-04-21 21:21:23 UTC (rev 54825)
@@ -6,7 +6,7 @@
%%
%% scrkernel-version.dtx (with options: `class,report')
%% scrkernel-basics.dtx (with options: `class,load')
-%% scrkernel-listsof.dtx (with options: `class,book,prepare')
+%% scrkernel-listsof.dtx (with options: `class,report,prepare')
%% scrkernel-tocstyle.dtx (with options: `class,report,prepare')
%% scrkernel-sections.dtx (with options: `class,report,prepare')
%% scrkernel-compatibility.dtx (with options: `class,report,init')
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -121,16 +121,16 @@
report%
}
\ProvidesClass{\KOMAClassName}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
@@ -143,7 +143,7 @@
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: prepare)
\newif\if at openright
\@openrightfalse
@@ -219,7 +219,7 @@
\newcommand*{\size at paragraph}{}
\newcommand*{\size at subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr at gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -296,10 +296,11 @@
\@namedef{scr at v@3.27a}{17}
\@namedef{scr at v@3.28}{17}
\@namedef{scr at v@3.29}{17}
+\@namedef{scr at v@3.30}{17}
\@namedef{scr at v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: option)
\newif\if at scr@emulatestandardclasses
\let\scr at emulatestandardclassestrue\relax
@@ -374,7 +375,7 @@
\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 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: option)
\KOMA at key{draft}[true]{%
\KOMA at set@ifkey{draft}{@tempswa}{#1}%
@@ -430,7 +431,7 @@
\newcommand*{\@gr at gsffamily}{%
\if at egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
@@ -518,7 +519,7 @@
\BeforePackage{tex4ht}{%
\let\scr at defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: options)
\KOMA at key{twoside}[true]{%
\if at atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -581,7 +582,8 @@
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
\Ifstr{#1}{}{%
\Ifstr{#3}{BCOR}{%
- \PassOptionsToPackage{BCOR#2}{typearea}%
+ \Ifstrstart{#2}{=}{\OptionNotUsed}{%
+ \PassOptionsToPackage{BCOR#2}{typearea}}%
}{\scr at pti@nerr at r}%
}{\scr at pti@nerr at r}%
}
@@ -590,7 +592,8 @@
\def\@@DIV #1DIV#2DIV#3\@@DIV{%
\edef\@tempa{#1}\ifx\@tempa\@empty
\edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb
- \PassOptionsToPackage{DIV#2}{typearea}%
+ \Ifstrstart{#2}{=}{\OptionNotUsed}{%
+ \PassOptionsToPackage{DIV#2}{typearea}}%
\else\scr at pti@nerr at r\fi
\else\@BCOR\fi
}
@@ -838,7 +841,7 @@
\KOMA at DeclareDeprecatedOption{abstractoff}{abstract=false}
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: option)
\KOMA at key{open}{%
\KOMA at set@ncmdkey{open}{@tempa}{%
@@ -1483,7 +1486,7 @@
\csname FN at mf@prepare\endcsname
\ifhmode\spacefactor\@x at sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
%%% (run: option)
\newif\if at tocleft
\KOMA at key{toc}{%
@@ -2016,11 +2019,11 @@
\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openany}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
@@ -2027,7 +2030,7 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: body)
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
@@ -2504,13 +2507,13 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z 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 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2523,37 +2526,39 @@
\let\scr at pti@nerr at r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
\if at scr@emulatestandardclasses
- \ifnum\@lastdiv=\z@
- \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
- \ifdim \f at size\p@<10.5\p@
- \setlength{\@tempdimb}{345\p@}
- \else\ifdim \f at size\p@<11.5\p@
- \setlength{\@tempdimb}{360\p@}
+ \Ifstr{\@lastdiv}{areaset}{}{%
+ \ifnum\@lastdiv=\z@
+ \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
+ \ifdim \f at size\p@<10.5\p@
+ \setlength{\@tempdimb}{345\p@}
+ \else\ifdim \f at size\p@<11.5\p@
+ \setlength{\@tempdimb}{360\p@}
+ \else
+ \setlength{\@tempdimb}{390\p@}
+ \fi
+ \fi
+ \if at twocolumn
+ \ifdim\@textwidth>2\@tempdimb\relax
+ \setlength{\textwidth}{2\@tempdimb}
+ \fi
\else
- \setlength{\@tempdimb}{390\p@}
+ \ifdim\textwidth>\@tempdimb
+ \setlength{\textwidth}{\@tempdimb}
+ \fi
\fi
+ \@settopoint\textwidth
+ \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
+ \divide\@tempdima\baselineskip
+ \@tempcnta=\@tempdima
+ \setlength{\textheight}{\@tempcnta\baselineskip}
+ \addtolength{\textheight}{\topskip}
+ \edef\reserved at a{%
+ \noexpand\@areasetadvancedtrue
+ \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
+ \if at areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
+ }\reserved at a
\fi
- \if at twocolumn
- \ifdim\@textwidth>2\@tempdimb\relax
- \setlength{\textwidth}{2\@tempdimb}
- \fi
- \else
- \ifdim\textwidth>\@tempdimb
- \setlength{\textwidth}{\@tempdimb}
- \fi
- \fi
- \@settopoint\textwidth
- \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
- \divide\@tempdima\baselineskip
- \@tempcnta=\@tempdima
- \setlength{\textheight}{\@tempcnta\baselineskip}
- \addtolength{\textheight}{\topskip}
- \edef\reserved at a{%
- \noexpand\@areasetadvancedtrue
- \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
- \if at areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
- }\reserved at a
- \fi
+ }%
\fi
%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
@@ -3162,7 +3167,7 @@
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\providecommand*{\ifnumbered}{%
@@ -3491,7 +3496,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@sect\space}%
+ of \string\@sect}%
\fi
\def\@sect#1#2#3#4#5#6[#7]#8{%
\ifnum \scr at osectarg=\z@
@@ -3663,7 +3668,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@ssect\space}%
+ of \string\@ssect}%
\fi
\def\@ssect#1#2#3#4#5{%
\scr at ifundefinedorrelax{scr at s@ct@@nn at m@}{%
@@ -3737,7 +3742,7 @@
Please send information about this to\MessageBreak
the KOMA-Script maintainer!\MessageBreak
Maybe LaTeX will be broken by the redefinition\MessageBreak
- of \string\@xsect\space}%
+ of \string\@xsect}%
\fi
\def\@xsect#1{%
\@ifundefined{scr at sect@runin}{%
@@ -3936,6 +3941,9 @@
\@namedef{@@makes#1head}{\scr@@makeschapterhead{#1}}%
\@namedef{set#1preamble}{\set at preamble{#1}}%
}
+\newcommand*{\scr at dsc@style at chapter@subcommands}[1]{%
+ @#1, at s#1, at make#1head, at makes#1head,@@make#1head,@@makes#1head,set#1preamble%
+}
\newcommand*{\scr at dsc@style at part@options}{}
\DeclareSectionCommandStyleOption{part}{pagestyle}{%
\@namedef{\scr at dsc@current pagestyle}{#1}%
@@ -3959,6 +3967,9 @@
\@namedef{@end#1}{\scr@@endpart{#1}}%
\@namedef{set#1preamble}{\set at preamble{#1}}%
}
+\newcommand*{\scr at dsc@style at part@subcommands}[1]{%
+ @#1, at s#1, at end#1,set#1preamble%
+}
\newcommand*{\scr at dsc@style at section@neededoptionstest}{%
\scr at ifundefinedorrelax{scr@\scr at dsc@current @sectionindent}{%
\scr at declaresectioncommandwarning{\scr at dsc@current}%
@@ -4516,9 +4527,39 @@
\expandafter\scr at ifundefinedorrelax\expandafter{\reserved at a}{}{%
\@tempswafalse
\edef\reserved at b{\expandafter\string\csname \reserved at a\endcsname}%
- }
- }
+ }%
+ }%
\if at tempswa
+ \expandafter\let\expandafter\scr at dsc@current
+ \csname scr at tso@##2 at style\endcsname
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{%
+ \edef\scr at dsc@current{##1}%
+ \FamilyKeyStateProcessed
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{style}%
+ \@tempswatrue
+ \@ifundefined{scr at dsc@current}{}{%
+ \scr at ifundefinedorrelax{scr at dsc@style@\scr at dsc@current @subcommands}{%
+ }{%
+ \edef\reserved at b{%
+ \csname scr at dsc@style@\scr at dsc@current @subcommands\endcsname{#2}%
+ }%
+ \expandafter\@for\expandafter\reserved at a\expandafter:\expandafter=%
+ \reserved at b\do{%
+ \expandafter\scr at ifundefinedorrelax\expandafter{\reserved at a}{}{%
+ \@tempswafalse
+ \edef\reserved at b{%
+ \expandafter\string\csname \reserved at a\endcsname}%
+ }%
+ }%
+ }
+ }%
+ \let\scr at dsc@current\relax
+ \fi
+ \if at tempswa
\DeclareSectionCommand[{#1}]{#2}%
\else
\ClassError{\KOMAClassName}{%
@@ -5611,7 +5652,7 @@
\fi
\newcommand*{\scr at fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\newif\if at restonecol
\newcommand{\dictum}[2][]{\par%
@@ -7020,7 +7061,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
%%% (run: body)
\g at addto@macro{\numberline at numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -7100,7 +7141,7 @@
You should use the features of package `tocbasic'\MessageBreak
instead of \string\toc at heading.\MessageBreak
Definition of \string\toc at heading\space may be removed from\MessageBreak
- KOMA-Script soon, so it should not be used
+ KOMA-Script soon, so it should not be used%
}%
\chapter*{\contentsname}%
\@mkboth{\MakeMarkcase{\contentsname}}{\MakeMarkcase{\contentsname}}%
@@ -7139,7 +7180,7 @@
Loading of package `scrhack' may help to\MessageBreak
avoid this warning, if you are using a\MessageBreak
a package that still implements the\MessageBreak
- deprecated \string\float at listhead\space interface
+ deprecated \string\float at listhead\space interface%
}%
}
\newcommand*{\scr at float@addtolists at warning}{%
@@ -7156,7 +7197,7 @@
Loading of package `scrhack' may help to\MessageBreak
avoid this warning, if you are using a\MessageBreak
a package that still implements the\MessageBreak
- deprecated \string\float at addtolist\space interface
+ deprecated \string\float at addtolist\space interface%
}%
\global\let\scr at float@addtolists at warning\relax
}
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: 10pt)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: 11pt)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
\ProvidesFile{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrtime.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrtime.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -74,11 +74,11 @@
%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package
(time of LaTeX run)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -39,7 +39,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrwfile.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrwfile.dtx 3453 2020-02-25 07:33:30Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrwfile}
[2013/08/05 v0.1f-alpha KOMA-Script package (write and clone files)]
@@ -217,7 +217,7 @@
\Ifattoclist{#3}{%
\PackageWarning{scrwfile}{`#3' already under control of
tocbasic.\MessageBreak
- Nevertheless features will be set
+ Nevertheless features will be set%
}%
}{%
\addtotoclist[TOCclone]{#3}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/setspace.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/setspace.hak 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/setspace.hak 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\ProvidesFile{setspace.hak}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
scrhack part
(hacking package
setspace)%
]
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\scr at ifexpected{\onehalfspacing}{%
\long\def\onehalfspacing{%
\setstretch{1.25}% default
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/standardsections.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/standardsections.hak 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/standardsections.hak 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,15 +62,15 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\ProvidesFile{standardsections.hak}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
scrhack part
(defining standard LaTeX class section headings)%
]
-%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $
+%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $
\PackageWarningNoLine{scrhack}{%
You are loosing every kind of support because of\MessageBreak
using the dangerous standard classes sections hack!\MessageBreak
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -53,24 +53,24 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $
+%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package
(handling toc-files)%
]
-%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $
+%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: prepare)
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: prepare)
-%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $
+%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: option)
\ProcessOptions\relax
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: option)
-%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $
+%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: body)
\RequirePackage{scrbase}
\AfterPackage*{multitoc}{%
@@ -841,7 +841,7 @@
\PackageWarning{tocbasic}{%
deprecated option `level'.\MessageBreak
You should replace option `level' by option\MessageBreak
- `tocentrylevel'
+ `tocentrylevel'%
}%
\l at addto@macro\tb at nt@tocstyle at options{,level={##1}}%
\FamilyKeyStateProcessed
@@ -2778,7 +2778,7 @@
%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: style,dottedtocline)
\CloneTOCEntryStyle{dottedtocline}{default}
-%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $
+%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: exit)
\AtBeginDocument{%
\@ifundefined{MakeMarkcase}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/typearea.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/typearea.sty 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/typearea.sty 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -70,23 +70,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2020/01/24 v3.29 KOMA-Script
+ 2020/04/19 v3.30 KOMA-Script
package
(type area)]
-%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: init)
\providecommand*
{\scr at compatibility}{\scr at v@last}
@@ -164,12 +164,14 @@
\@namedef{scr at v@3.27a}{17}
\@namedef{scr at v@3.28}{17}
\@namedef{scr at v@3.29}{17}
+\@namedef{scr at v@3.30}{17}
\@namedef{scr at v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: init)
\providecommand\ta at divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}}
\providecommand\ta at divlistelse{1}
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+\newcommand*{\@lastdiv}{\z@}\let\@lastdiv\relax
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: option)
\KOMA at key{version}[last]{%
\scr at ifundefinedorrelax{scr at v@#1}{%
@@ -224,7 +226,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 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: options)
\providecommand*{\PaperNameToSize}[2][warning]{%
\Ifstr{#2}{letter}{%
@@ -817,20 +819,35 @@
\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}}%
\KOMA at key{DIV}[calc]{%
\edef\@tempa{#1}%
- \def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv\fi
+ \def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv
+ \ifx\@tempa\relax\def\@tempa{current}\fi
+ \fi
\def\@tempb{current}\ifx\@tempa\@tempb\else
\def\@tempb{default}\ifx\@tempa\@tempb\ta at div=\z@ \else
\def\@tempb{calc}\ifx\@tempa\@tempb\ta at div=\tw@ \else
\def\@tempb{classic}\ifx\@tempa\@tempb\ta at div=\thr@@ \else
- \ta at div=\@tempa
+ \expandafter\def\expandafter\@tempa\expandafter{\expandafter0\@tempa}%
+ \afterassignment\movet at reserved@a at to@nnil
+ \@tempcnta=\@tempa\relax\@nnil
+ \def\@tempb{\relax}\ifx\reserved at a\@tempb
+ \ta at div=\@tempcnta
+ \edef\@tempa{\the\ta at div}%
+ \else
+ \let\@tempa\relax
+ \fi
\fi
\fi
\fi
\fi
- \FamilyKeyStateProcessed
- \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{DIV}{#1}%
+ \ifx\@tempa\relax
+ \FamilyKeyStateUnknownValue
+ \else
+ \FamilyKeyStateProcessed
+ \KOMA at kav@xreplacevalue{.typearea.\scr at pkgextension}{DIV}{\@tempa}%
+ \fi
}
\AtEndOfPackage{%
\KOMA at key{DIV}{%
@@ -974,9 +991,9 @@
\KOMAExecuteOptions{twoside=false}
\fi
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: body)
\newcommand*{\ta at divfor}[1]{%
\ta at div=\z@
@@ -1118,7 +1135,7 @@
marginpar (\the\marginparwidth) while using option\MessageBreak
`mpinclude'.\MessageBreak
Because of this, I'm exchanging the values.\MessageBreak
- You should increase DIV to avoid such problems.\MessageBreak
+ You should increase DIV to avoid such problems%
}%
\@tempskipa=\marginparwidth
\marginparwidth=\textwidth
@@ -1278,14 +1295,16 @@
\fi
\edef\@tempa{#2}%
\def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv
- \ifx\csname @tempa\endcsname\relax
- \def\@tempa{current}%
- \fi
+ \ifx\@tempa\relax \def\@tempa{current}\fi
\fi
+ \Ifstr{\@tempa}{current}{%
+ \Ifstr{\@lastdiv}{areaset}{\let\@tempa\@lastdiv}{}%
+ }{}%
\def\@tempb{areaset}\ifx\@tempa\@tempb
\areaset[current]{\textwidth}{\textheight}%
\else
- \def\@tempb{current}\ifx\@tempa\@tempb\else
+ \def\@tempb{current}\ifx\@tempa\@tempb
+ \else
\def\@tempb{default}\ifx\@tempa\@tempb\ta at div=\z@ \else
\def\@tempb{calc}\ifx\@tempa\@tempb\ta at div=\tw@ \else
\def\@tempb{classic}\ifx\@tempa\@tempb\ta at div=\thr@@ \else
@@ -1714,7 +1733,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 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
%%% (run: final)
\typearea[current]{current}
%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/visualize.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/visualize.lco 2020-04-21 18:43:36 UTC (rev 54824)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/visualize.lco 2020-04-21 21:21:23 UTC (rev 54825)
@@ -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 3449 2020-01-24 07:28:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $
%%% (run: head)
\ProvidesFile{%
visualize%
@@ -80,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z 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 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $
%%% (run: body)
\endinput
%%
More information about the tex-live-commits
mailing list.