From 66279a58ec36789c4d363e2d4598176d99f43c66 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 25 Jul 2020 21:47:49 +0000 Subject: koma-script (25jul20) git-svn-id: svn://tug.org/texlive/trunk@55944 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/koma-script/README | 64 +- .../texmf-dist/doc/latex/koma-script/manifest.txt | 2 +- .../texmf-dist/doc/latex/koma-script/scrguide.pdf | Bin 3258033 -> 3259445 bytes .../texmf-dist/doc/latex/koma-script/scrguien.html | 1840 ++++++++-------- .../texmf-dist/doc/latex/koma-script/scrguien.pdf | Bin 3172298 -> 3178504 bytes .../doc/latex/koma-script/scrlayer-fancyhdr.pdf | Bin 195988 -> 195988 bytes .../texmf-dist/doc/latex/koma-script/tocstyle.pdf | Bin 254508 -> 0 bytes .../texmf-dist/source/latex/koma-script/Makefile | 9 +- .../doc/english/scrbookreportarticle.tex | 45 +- .../latex/koma-script/doc/english/tocbasic.tex | 52 +- .../latex/koma-script/doc/english/typearea.tex | 8 +- .../latex/koma-script/doc/ngerman/tocbasic.tex | 56 +- .../source/latex/koma-script/doc/scrguide.pdf | Bin 3258033 -> 3259445 bytes .../source/latex/koma-script/doc/scrguien.html | 1840 ++++++++-------- .../source/latex/koma-script/doc/scrguien.pdf | Bin 3172298 -> 3178504 bytes .../source/latex/koma-script/scrhack.dtx | 11 +- .../latex/koma-script/scrkernel-compatibility.dtx | 16 +- .../latex/koma-script/scrkernel-miscellaneous.dtx | 12 +- .../latex/koma-script/scrkernel-sections.dtx | 104 +- .../latex/koma-script/scrkernel-tocstyle.dtx | 224 +- .../latex/koma-script/scrkernel-typearea.dtx | 29 +- .../source/latex/koma-script/scrkernel-version.dtx | 4 +- .../source/latex/koma-script/tocbasic.dtx | 17 +- .../source/latex/koma-script/tocstyle.dtx | 2309 -------------------- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 4 +- .../texmf-dist/tex/latex/koma-script/DIN5008A.lco | 4 +- .../texmf-dist/tex/latex/koma-script/DIN5008B.lco | 4 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 4 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/NF.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/SN.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 4 +- .../tex/latex/koma-script/UScommercial9.lco | 4 +- .../tex/latex/koma-script/UScommercial9DW.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/float.hak | 10 +- .../texmf-dist/tex/latex/koma-script/floatrow.hak | 10 +- .../texmf-dist/tex/latex/koma-script/hyperref.hak | 10 +- .../texmf-dist/tex/latex/koma-script/listings.hak | 10 +- Master/texmf-dist/tex/latex/koma-script/lscape.hak | 10 +- .../texmf-dist/tex/latex/koma-script/nomencl.hak | 13 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 115 +- .../tex/latex/koma-script/scrarticle.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 123 +- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 6 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 32 +- .../tex/latex/koma-script/scrfontsizes.sty | 6 +- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 12 +- .../texmf-dist/tex/latex/koma-script/scrjura.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 8 +- .../tex/latex/koma-script/scrlayer-scrpage.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlayer.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrletter.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrletter.sty | 16 +- .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 46 +- .../texmf-dist/tex/latex/koma-script/scrreport.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 123 +- .../tex/latex/koma-script/scrsize10pt.clo | 4 +- .../tex/latex/koma-script/scrsize11pt.clo | 4 +- .../tex/latex/koma-script/scrsize12pt.clo | 4 +- .../texmf-dist/tex/latex/koma-script/scrtime.sty | 6 +- .../texmf-dist/tex/latex/koma-script/setspace.hak | 10 +- .../tex/latex/koma-script/standardsections.hak | 10 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 161 +- .../texmf-dist/tex/latex/koma-script/tocstyle.sty | 958 -------- .../texmf-dist/tex/latex/koma-script/typearea.sty | 25 +- .../texmf-dist/tex/latex/koma-script/visualize.lco | 4 +- 74 files changed, 2890 insertions(+), 5586 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/koma-script/tocstyle.pdf delete mode 100644 Master/texmf-dist/source/latex/koma-script/tocstyle.dtx delete mode 100644 Master/texmf-dist/tex/latex/koma-script/tocstyle.sty diff --git a/Master/texmf-dist/doc/latex/koma-script/README b/Master/texmf-dist/doc/latex/koma-script/README index 5c03e26ff32..0b37a62c414 100644 --- a/Master/texmf-dist/doc/latex/koma-script/README +++ b/Master/texmf-dist/doc/latex/koma-script/README @@ -1,5 +1,5 @@ -KOMA-Script 2020/04/19 v3.30 +KOMA-Script 2020/07/22 v3.31 Copyright (c) Markus Kohm , 1994-2020 This material is subject to the LaTeX Project Public License. See @@ -58,7 +58,7 @@ Requires: scrkbase - internal KOMA-Script package Recommended: scrlayer-scrpage - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrarticle - wrapper class to scrartcl ------------------------------------------------------------------------------ @@ -73,7 +73,7 @@ Abstract: scrreport is a very simple wrapper class to scrartcl. Is has Requires: scrartcl.cls - KOMA-Script class License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrbase - basic features for KOMA-Script, e.g. conditionals and key=value ------------------------------------------------------------------------------ @@ -112,7 +112,7 @@ Requires: keyval - key=value package from the graphics bundle manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrbook - versatile class may be used as a drop-in replacement of book ------------------------------------------------------------------------------ @@ -132,7 +132,7 @@ Requires: scrkbase - internal KOMA-Script package typearea - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrdate - calender date operations, e.g. calculation of the day of the week ------------------------------------------------------------------------------ @@ -151,7 +151,7 @@ Requires: scrkbase - KOMA-Script package for some basic features. manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrdoc - internal source documentation class of KOMA-Script ------------------------------------------------------------------------------ @@ -180,7 +180,7 @@ Requires: scrkbase - internal package with some basics of KOMA-Script etoolbox - tool-box for LaTeX programming using e-TeX License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrfontsizes - package to generate a KOMA-Script font size file ------------------------------------------------------------------------------ @@ -192,7 +192,7 @@ Abstract: scrfontsizes is a LaTeX package of the KOMA-Script bundle. Requires: scrextend - some KOMA-Script features for other classes License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrhack - patch some isues with other packages ------------------------------------------------------------------------------ @@ -210,7 +210,7 @@ Requires: scrkbase - internal KOMA-Script package with basics xpatch - extending etoolbox patching commands License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrjura - contract environment for advocates and scholary persons in law ------------------------------------------------------------------------------ @@ -226,7 +226,7 @@ Requires: scrkbase - internal KOMA-Script package with basics tocbasic - features for helper files and float environments License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrkbase - internal basic features for KOMA-Script classes and packages ------------------------------------------------------------------------------ @@ -241,7 +241,7 @@ Requires: scrbase - KOMA-Script package for some basic features. manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrlayer-fancyhdr - combining scrlayer with fancyhdr ------------------------------------------------------------------------------ @@ -301,7 +301,7 @@ Abstract: scrlayer-scrpage is a LaTeX package of the KOMA-Script Requires: scrlayer.sty License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrlayer - defining layers and controlling page headers and footers ------------------------------------------------------------------------------ @@ -326,7 +326,7 @@ Abstract: scrlayer is a LaTeX package of the KOMA-Script bundle. Requires: scrkbase.sty License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrletter - wrapper class to scrlttr2 ------------------------------------------------------------------------------ @@ -341,7 +341,7 @@ Abstract: scrreport is a very simple wrapper class to scrlttr2. Is has Requires: scrlttr2.cls - KOMA-Script class License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrletter - letter extention to KOMA-Script classes ------------------------------------------------------------------------------ @@ -356,7 +356,7 @@ Requires: scrkbase - internal KOMA-Script package Recommended: marvosym - package by Martin Vogel providing symbols License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrlfile - control of package dependencies ------------------------------------------------------------------------------ @@ -374,7 +374,7 @@ Abstract: scrlfile is a LaTeX package of the KOMA-Script bundle. It Requires: License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrlttr2 - versatile letter class with separation of text area and note paper ------------------------------------------------------------------------------ @@ -407,7 +407,7 @@ Requires: scrkbase - internal KOMA-Script package Recommended: marvosym - package by Martin Vogel providing symbols License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrreport - wrapper class to scrreprt ------------------------------------------------------------------------------ @@ -422,7 +422,7 @@ Abstract: scrreport is a very simple wrapper class to scrreprt. Is has Requires: scrreprt.cls - KOMA-Script class License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrreprt - versatile class may be used as a drop-in replacement of report ------------------------------------------------------------------------------ @@ -442,7 +442,7 @@ Requires: scrkbase - internal KOMA-Script package typearea - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrtime - show the time of the LaTeX run ------------------------------------------------------------------------------ @@ -454,7 +454,7 @@ Abstract: scrtime is a LaTeX package of the KOMA-Script bundle. It Requires: scrkbase - internal package with some basics of KOMA-Script License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== scrwfile - Spare write handles for helper files to avoid `No room' messages ------------------------------------------------------------------------------ @@ -508,27 +508,7 @@ Abstract: tocbasic is a LaTeX package of the KOMA-Script bundle. The Requires: scrbase - KOMA-Script package for some basic features. License: LPPL 1.3c or later State: Author maintained -Version: 2020/04/19 v3.30 -============================================================================== -tocstyle - Control layout of table of contents, list of figures etc. ------------------------------------------------------------------------------- -Maintainer: Markus Kohm -E-Mail: komascript at gmx info -Abstract: tocstyle is a LaTeX package of the KOMA-Script bundle. - When the main classes of the KOMA-Script bundle were created, - their author had several ideas for formatting the table of - contents and lists of floats, but almost none of them were - implemented. One reason was that the KOMA-Script author - didn't like to change the LaTeX kernel in a class, because - this could result in several problems with other packages. - The package tocstyle will fill the gap. If it conflicts - with another package, you can simply decide not to use it. - - The current release is only a proof of concept. -Requires: -License: LPPL 1.3c or later -State: Experimental and deprecated -Version: 2019/10/09 v0.2j-alpha deprecated package (versatile toc styles) +Version: 2020/07/22 v3.31 ============================================================================== typearea - Calculating typeing area and margins depending on typographic rules ------------------------------------------------------------------------------ @@ -549,5 +529,5 @@ Abstract: Many LaTeX classes, including the standard classes, present Requires: scrkbase - internal basic features for KOMA-Script packages License: LPPL 1.3c or later State: Autor maintained -Version: 2020/04/19 v3.30 +Version: 2020/07/22 v3.31 ============================================================================== diff --git a/Master/texmf-dist/doc/latex/koma-script/manifest.txt b/Master/texmf-dist/doc/latex/koma-script/manifest.txt index 210e219a681..dae30544767 100644 --- a/Master/texmf-dist/doc/latex/koma-script/manifest.txt +++ b/Master/texmf-dist/doc/latex/koma-script/manifest.txt @@ -35,7 +35,7 @@ % Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien. % ====================================================================== % -% CONTENTS OF THE KOMA-SCRIPT RELEASE 2020/04/19 v3.30 +% CONTENTS OF THE KOMA-SCRIPT RELEASE 2020/07/22 v3.31 % ------------------------------------------------------ % % diff --git a/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf b/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf index 4a29f90884e..e508b48c3ea 100644 Binary files a/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf and b/Master/texmf-dist/doc/latex/koma-script/scrguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/koma-script/scrguien.html b/Master/texmf-dist/doc/latex/koma-script/scrguien.html index 7e3ae170307..110875b259f 100644 --- a/Master/texmf-dist/doc/latex/koma-script/scrguien.html +++ b/Master/texmf-dist/doc/latex/koma-script/scrguien.html @@ -19,980 +19,980 @@

Options

Commands

Environments

Lengths

Pseudolengths

Variables

Page Styles

Counter

Styles for the float Package

Options

Commands

Environments

Lengths

Pseudolengths

Variables

Page Styles

Counter

Styles for the float Package

%%% using: package,identify %%%% using: package,option %%%% using: package,body @@ -71,7 +70,7 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2020-04-08 11:34:56 +0200 (Wed, 08 Apr 2020) $ + \filedate$Date: 2020-07-08 10:45:20 +0200 (Wed, 08 Jul 2020) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1962 $ \endgroup @@ -1065,16 +1064,16 @@ % % \begin{macro}{\scr@hack@nomencl@head} % \changes{v3.23}{2017/03/31}{Überschrift für \texttt{thenomenclature} unter -% Verwendung von \textsf{tocbasic}}%^^A +% Verwendung von \textsf{tocbasic}}%^^A +% \changes{v3.31}{2020/07/08}{internal \cs{list@fname} eliminated}%^^A % Im Gegensatz zu Gleitumgebungen benötigen wir hier keine Gruppe, weil % \texttt{thenomenclature} bereits die Gruppe bereitstellt. % \begin{macrocode} %<*nomencl&body> \newcommand*{\scr@hack@nomencl@head}{% \providecommand*{\listofnlsname}{\nomname}% - \let\list@fname\listofnlsname \def\@currext{nls}% - \tocbasic@listhead{\list@fname}% + \tocbasic@listhead{\nomname}% } % % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx index d85f22aca9c..8fbc5418914 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx @@ -1,8 +1,8 @@ -% \CheckSum{223} +% \CheckSum{224} % \iffalse meta-comment % ====================================================================== % scrkernel-compatibility.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-compatibility.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-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%%% (run: identify) %%%% (run: init) %

tocindent=0pt,% % tocindent=1.5em,% %
tocnumwidth=1.5em% @@ -6309,6 +6382,7 @@ beforeskip=3.25ex \@plus1ex \@minus.2ex,% afterskip=-1em,% %
tocstyle=subsection,% + tocindentfollows=subsubsection,% % tocstyle=section,% %
tocindent=7.0em,% % tocindent=10em,% diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx index c42af21aeba..d5e1f14710a 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx @@ -1,8 +1,7 @@ -% \CheckSum{1936} % \iffalse meta-comment % ====================================================================== % scrkernel-tocstyle.dtx -% Copyright (c) Markus Kohm, 2015-2019 +% Copyright (c) Markus Kohm, 2015-2020 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +19,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-tocstyle.dtx -% Copyright (c) Markus Kohm, 2015-2019 +% Copyright (c) Markus Kohm, 2015-2020 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,7 +54,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ % The runs of run-time file generation: %%%% (run: preidentify) % - everything that is needed before selfidentification of resulting files @@ -80,9 +79,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-19 10:37:46 +0100 (Tue, 19 Nov 2019) $ + \filedate$Date: 2020-06-11 16:57:03 +0200 (Thu, 11 Jun 2020) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 2254 $ + \filerevision$Revision: 3507 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-tocstyle.dtx}% @@ -353,6 +352,97 @@ % \end{macrocode} % \end{macro}%^^A \@RelaxTOCEntryOptions % +% \selectlanguage{english} +% \begin{macro}{\@DefineTOCEntryListOption} +% \changes{v3.31}{2020/06/11}{new (internal)}%^^A +% Use \cs{DefineTOCEntryOption} to define an option that represents a list. +% It has following parameters: +% \begin{description} +% \item[\marg{style}: \meta{string},] name of the entry style +% \item[\marg{option}: \meta{string},] name of the option +% \item[\oarg{default}: \meta{string},] default value of the option +% \item[\marg{prefix}: \meta{string},] prefix of the macro to be defined +% \item[\marg{postfix}: \meta{string},] postfix of the macro to be defined +% \item[\marg{description}: \meta{String},] short description of the option +% \item[\oarg{init}: \meta{code},] initialization of the option +% \end{description} +% Between the \meta{prefix} and \meta{postfix} automatically +% \cs{scr@dte@current} will be added. A copy option using ``\texttt{:=}'' +% instead of ``\texttt{=}'' and an add (append) option using ``\texttt{+=}'' +% instead of ``\texttt{=}'' is also defined. +% \begin{macrocode} +%<*body> +\newcommand*{\@DefineTOCEntryListOption}[2]{% + \kernel@ifnextchar [%] + {\@DefineTOCEntryListOptionWithDefault{#1}{#2}} + {\@DefineTOCEntryListOptionWithoutDefault{#1}{#2}}% +} +% \end{macrocode} +% \begin{macro}{\@DefineTOCEntryListOptionWithoutDefault} +% \changes{v3.31}{2020/06/11}{new (internal)}%^^A +% This is the case without default value. So we only have to define +% the three internal options, that manipulate a macro. +% \begin{macrocode} +\newcommand*{\@DefineTOCEntryListOptionWithoutDefault}[5]{% + \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4}{#2}{#5}% + \@DefineTOCEntryOption{#1}{#2}{% + \expandafter\protected@edef\csname #3\scr@dte@current#4\endcsname{##1}% + \FamilyKeyStateProcessed + }% + \DefineFamilyKey[.dte]{KOMAarg}{#2:}{% + \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{% + \expandafter\let + \csname #3\scr@dte@current#4\expandafter\endcsname + \csname #3##1#4\endcsname + \FamilyKeyStateProcessed + }% + }% + \DefineFamilyKey[.dte]{KOMAarg}{#2+}{% + \expandafter\protected@edef\csname #2\scr@dte@current#4\endcsname{% + \csname #2\scr@dte@current#4\endcsname,##1}% + \FamilyKeyStateProcessed + }% + \edef\scr@dte@doopts{% + \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}\noexpand\do{#2+}% + }% +} +% \end{macrocode} +% \end{macro}%^^A \@DefineTOCEntryListOptionWithoutDefault +% \begin{macro}{\@DefineTOCEntryListOptionWithDefault} +% \changes{v3.31}{2020/06/11}{new (internal)}%^^A +% This is the case with a default value. It's almost the same, but the +% argument numbers and using \cs{DefineFamilyKey} with optional argument. +% \begin{macrocode} +\newcommand*{\@DefineTOCEntryListOptionWithDefault}{} +\def\@DefineTOCEntryListOptionWithDefault#1#2[#3]#4#5#6{% + \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5}{#2}{#6}% + \@DefineTOCEntryOption{#1}{#2}[{#3]}{% + \expandafter\protected@edef\csname #4\scr@dte@current#5\endcsname{##1}% + \FamilyKeyStateProcessed + }% + \DefineFamilyKey[.dte]{KOMAarg}{#2:}{% + \scr@ifundefinedorrelax{#4##1#5}{\FamilyKeyStateUnknownValue}{% + \expandafter\let + \csname #4\scr@dte@current#5\expandafter\endcsname + \csname #4##1#5\endcsname + \FamilyKeyStateProcessed + }% + }% + \DefineFamilyKey[.dte]{KOMAarg}{#2+}{% + \expandafter\protected@edef\csname #4\scr@dte@current#5\endcsname{% + \csname #4\scr@dte@current#5\endcsname,##1}% + \FamilyKeyStateProcessed + }% + \edef\scr@dte@doopts{% + \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}\noexpand\do{#2+}% + }% +} +% +% \end{macrocode} +% \end{macro}%^^A \@DefineTOCEntryListOptionWithDefault +% \end{macro}%^^A \@DefineTOCEntryListOption +% \selectlanguage{ngerman} +% % \begin{macro}{\@DefineTOCEntryLengthOption} % \changes{v3.20}{2015/12/04}{neu (intern)}%^^A % Verwendet \cs{DefineTOCEntryOption}, um eine Option zu definieren, die ein @@ -360,7 +450,7 @@ % \begin{description} % \item[\marg{Stil}: \meta{String},] Name des Eintragsstils % \item[\marg{Option}: \meta{String},] Name der Option -% \item[\oarg{Wert}:] der Säumniswert der Option +% \item[\oarg{Wert}: \meta{Länge},] der Säumniswert der Option % \item[\marg{Prefix}: \meta{String},] Präfix des zu definierenden Makros % \item[\marg{Postfix}: \meta{String},] Postfix des zu definierenden Makros % \item[\marg{Erklärung}: \meta{String},] Erklärung der Option @@ -1067,6 +1157,7 @@ \def\DefineTOCEntryCommandOption{\@DefineTOCEntryCommandOption{#1}}% \def\DefineTOCEntryIfOption{\@DefineTOCEntryIfOption{#1}}% \def\DefineTOCEntryLengthOption{\@DefineTOCEntryLengthOption{#1}}% + \def\DefineTOCEntryListOption{\@DefineTOCEntryListOption{#1}}% \def\DefineTOCEntryNumberOption{\@DefineTOCEntryNumberOption{#1}}% \def\DefineTOCEntryOption{\@DefineTOCEntryOption{#1}}% \def\AddToDeclareTOCEntryStylePreCheckNeeds{% @@ -1081,6 +1172,7 @@ \let\AddToDeclareTOCEntryStylePreCheckNeeds\relax \let\DefineTOCEntryOption\relax \let\DefineTOCEntryNumberOption\relax + \let\DefineTOCEntryListOption\relax \let\DefineTOCEntryLengthOption\relax \let\DefineTOCEntryIfOption\relax \let\DefineTOCEntryCommandOption\relax @@ -1450,12 +1542,29 @@ %<*tocline> %%% (run: style,tocline) \DeclareTOCEntryStyle{tocline}[{% +% +% \end{macrocode} +% \selectlanguage{english}%^^A +% \changes{v3.31}{2020/06/09}{style \texttt{toctext} has also option +% \texttt{beforeskip}}%^^A +% \selectlanguage{ngerman}%^^A +% \begin{macrocode} +%<*tocline|toctext> \DefineTOCEntryLengthOption{beforeskip}% {scr@tso@}{@beforeskip}{vertical skip before the entry}% +% +%<*tocline> \DefineTOCEntryIfOption{breakafternumber}% {scr@tso@}{@breakafternumber}{line break after number flag}% \DefineTOCEntryIfOption{dynnumwidth}% {scr@tso@}{@dynnumwidth}{dynamic number width flag}% +% \end{macrocode} +% \changes{v3.31}{2020/06/08}{option for indent follows list}%^^A +% \begin{macrocode} + \DefineTOCEntryListOption{indentfollows}% + {scr@tso@}{@indentfollows}{list of levels that define the indent}% + \DefineTOCEntryIfOption{dynindent}% + {scr@tso@}{@dynindent}{dynamic indent width flag}% % %<*tocline|toctext> \DefineTOCEntryCommandOption{entryformat}% @@ -1864,6 +1973,20 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{\glueexpr \z@ plus .2\p@\relax}% }{}% +% +% \end{macrocode} +% \selectlanguage{english}%^^A +% \changes{v3.31}{2020/06/09}{\texttt{beforeskip} default also for style +% \texttt{toctext}}%^^A +% For style \texttt{toctext} a default without glue is used to stay +% compatible. +% \selectlanguage{ngerman}%^^A +% \begin{macrocode} +%<*toctext> + \expandafter\providecommand\expandafter*% + \csname scr@tso@#1@beforeskip\endcsname{\z@}% +% +%<*tocline> % \end{macrocode} % Es ist gut zu wissen, wie breit die breiteste Nummer ist, damit wir % ggf. prüfen können, ob entsprechende Bedingungen eingehalten werden. @@ -2014,6 +2137,22 @@ \csname scr@tso@#1@pagenumberbox\endcsname[1]{% \hb@xt@\@nameuse{scr@dte@pagenumberwidth}{\hfil ##1}}% \expandafter\providecommand\csname Ifscr@tso@#1@dynnumwidth\endcsname[2]{##2}% +% \end{macrocode} +% \selectlanguage{english}% +% \changes{v3.31}{2020/06/08}{init indent follows list}%^^A +% This command defines a list of levels that specify the indent (if not empty). +% \selectlanguage{ngerman}%^^A +% \begin{macrocode} + \expandafter\providecommand\csname Ifscr@tso@#1@dynindent\endcsname[2]{##2}% + \scr@ifundefinedorrelax{scr@tso@#1@indentfollows}{% + \Ifstrstart{#1}{sub}{% + \expandafter\edef\csname scr@tso@#1@indentfollows\endcsname{% + \scr@dte@nosub{#1}% + }% + }{% + \expandafter\let\csname scr@tso@#1@indentfollows\endcsname\@empty + }% + }{}% % % \end{macrocode} % \changes{v3.27}{2019/07/08}{Initialisierung von \texttt{raggedentry}}%^^A @@ -2216,6 +2355,49 @@ \else \tocbasic@DependOnPenaltyAndTOCLevel{#1}% \addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax +% \end{macrocode} +% \selectlanguage{english}% +% \changes{v3.31}{2020/06/08}{code for indent following list processing}%^^A +% If a indent following list exists and the depth of an entry is lower than +% the depth of the current entry, use the maximum of the ident + number width +% for the indent of this entry. +% \selectlanguage{ngerman}%^^A +% \begin{macrocode} + \@nameuse{Ifscr@tso@#1@dynindent}{% + \expandafter\ifx\csname scr@tso@#1@indentfollows\endcsname\@empty + \PackageWarning{tocbasic}{`dynindent' for `#1' not available}% + \else + \edef\reserved@a{\@nameuse{scr@tso@#1@indentfollows}}% + \@for \reserved@a:=\reserved@a\do {% + \scr@trim@spaces\reserved@a + \ifx\reserved@a\@empty\else + \scr@ifundefinedorrelax{\reserved@a tocdepth}{% + }{% + \ifnum \@nameuse{\reserved@a tocdepth}<\@nameuse{#1tocdepth}% + \@tempdima\@nameuse{scr@tso@\reserved@a @indent}\relax + \@nameuse{Ifscr@tso@\reserved@a @dynnumwidth}{% + \scr@ifundefinedorrelax + {scr@dte@\reserved@a @lastmaxnumwidth}{% + \advance\@tempdima + \@nameuse{scr@tso@\reserved@a @numwidth}\relax + }{% + \advance\@tempdima + \@nameuse{scr@dte@\reserved@a @lastmaxnumwidth}\relax + }% + }{% + \advance\@tempdima + \@nameuse{scr@tso@\reserved@a @numwidth}\relax + }% + \ifdim \@tempdima>\@nameuse{scr@tso@#1@indent}\relax + \expandafter\edef\csname scr@tso@#1@indent\endcsname + {\the\@tempdima}% + \fi + \fi + }% + \fi + }% + \fi + }{}% {% \Iftocfeature{\@currext}{noindent}{% \leftskip \z@ @@ -2442,8 +2624,11 @@ \@nameuse{scr@tso@#1@onstartentry}% \else % \end{macrocode} -% In v-mode it is a new text entry. +% \changes{v3.31}{2020/06/09}{use of option \texttt{beforeskip}}%^^A +% In v-mode it is a new text entry. Before leaving v-mode the vertical space +% is added. % \begin{macrocode} + \addvspace{\@nameuse{scr@tso@#1@beforeskip}}% \leavevmode % \end{macrocode} % The paragraph end has to be prepared to eventually change the right @@ -2471,8 +2656,27 @@ }% \rightskip \@nameuse{scr@tso@#1@rightindent}\relax \parfillskip \z@ \@plus 1fill\relax - \edef\@noitemerr{\unexpanded{\par\def\@noitemerr}% - {\unexpanded\expandafter{\@noitemerr}}}% +% \end{macrocode} +% \changes{v3.31}{2020/06/09}{redefinition of \cs{addvspace}}%^^A +% \changes{v3.31}{2020/06/09}{redefinition of \cs{addpenalty}}%^^A +% Now, make sure, that the first non-\texttt{toctext} entry does do a \cs{par} +% before it uses \cs{addpenalty} or \cs{addvspace}. Before version~3.31 this +% has been done by redefining \cs{@noitemerr} but this does not work, because +% it ignores the argument of \cs{addpenalty} or \cs{addvspace}. So, this more +% dangerous solution has been made, that redefines \cs{addvspace} and +% \cs{addpenalty} locally. +% \begin{macrocode} + \ifx\addvspace\scr@dte@xaddvspace\else + \let\scr@dte@saddvspace\addvspace + \def\scr@dte@xaddvspace{% + \let\addvspace\scr@dte@saddvspace\par\addvspace}% + \let\addvspace\scr@dte@xaddvspace + \fi + \ifx\addpenalty\scr@dte@xaddpenalty\else + \let\scr@dte@saddpenalty\addpenalty + \def\scr@dte@xaddpenalty{% + \let\addpenalty\scr@dte@saddpenalty\par\addpenalty}% + \fi % \end{macrocode} % Finally the init code of the first entry has to be used. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx index 3c6f846094f..ec6e89babfb 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx @@ -1,4 +1,3 @@ -% \CheckSum{2945} % \iffalse meta-comment % ====================================================================== % scrkernel-typearea.dtx @@ -55,7 +54,7 @@ % Right brace \} Tilde \~} % % \iffalse meta-comment -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%%% (run: identify) %%%% (run: init) %%%% (run: options) @@ -66,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: 2020-03-24 13:12:02 +0100 (Tue, 24 Mar 2020) $ + \filedate$Date: 2020-04-27 15:04:43 +0200 (Mon, 27 Apr 2020) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3470 $ + \filerevision$Revision: 3488 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-typearea.dtx}[% @@ -3127,8 +3126,6 @@ % \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. @@ -3152,10 +3149,17 @@ % \cs{ProcessOptions}). % \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 +% \changes{v3.30}{2020/03/24}{avoid error message for unknown \texttt{BCOR} +% value to \cs{documentclass}}%^^A +% \changes{v3.31}{2020/04/27}{improved valid value recognization}%^^A % \begin{macrocode} %<*class> - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{BCOR#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifdimen{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifdimen{#2}{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }% % %<*package> \Ifdimen{#2}{% @@ -3183,6 +3187,7 @@ % \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 +% \changes{v3.31}{2020/04/27}{improved valid value recognization}%^^A % Die grundsätzliche Funktion ist die gleiche wie bei \cs{@BCOR}, % \cs{@@BCOR}. % \begin{macrocode} @@ -3192,8 +3197,12 @@ \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb %<*class> - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{DIV#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifnumber{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifnumber{#2}{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }% % %<*package> \Ifnumber{#2}{% diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx index b3aa943e37c..5e85b34b823 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx @@ -55,7 +55,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ % \fi % % \iffalse @@ -123,7 +123,7 @@ \fi % \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx index 8f25f2cd759..eae0e3ed917 100644 --- a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx +++ b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx @@ -1,4 +1,3 @@ -% \CheckSum{1643} % \iffalse meta-comment % ====================================================================== % tocbasic.dtx @@ -55,7 +54,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ %%%% (run: identify) %%%% (run: prepare) %