From 66279a58ec36789c4d363e2d4598176d99f43c66 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
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
---
 .../texmf-dist/tex/latex/koma-script/scrlttr2.cls  | 46 +++++++++++++---------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls')

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 60729877530..5f75c727961 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -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 3481 2020-04-19 09:52:23Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $
 \begingroup
   \catcode`\@11\relax
   \ifx\KOMAScriptVersion\undefined
@@ -95,7 +95,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}%
 \endgroup
 \providecommand*{\scr@clsextension}{\@clsextension}
 \AtBeginDocument{%
@@ -110,13 +110,13 @@
   letter%
 }
 \ProvidesClass{\KOMAClassName}[%
-  2020/04/19 v3.30 KOMA-Script
+  2020/07/22 v3.31 KOMA-Script
   document class (\ClassName)%
 ]
 %%% 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 3451 2020-02-24 16:22:41Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $
 %%%            (run: init)
 \newcommand*
   {\scr@compatibility}{\scr@v@last}
@@ -194,10 +194,11 @@
 \@namedef{scr@v@3.28}{17}
 \@namedef{scr@v@3.29}{17}
 \@namedef{scr@v@3.30}{17}
-\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $
+\@namedef{scr@v@3.31}{18}
+\@namedef{scr@v@last}{18}
+%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $
 %%%            (run: init)
-%%% 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: option)
 \KOMA@key{version}[last]{%
   \scr@ifundefinedorrelax{scr@v@#1}{%
@@ -247,7 +248,7 @@
 \newcommand*{\scr@v@is@ge}[1]{%
   \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
 }
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $
 %%%            (run: option)
 \KOMA@key{draft}[true]{%
   \KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -425,7 +426,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 3470 2020-03-24 12:12:02Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $
 %%%            (run: options)
 \KOMA@key{twoside}[true]{%
   \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -487,8 +488,12 @@
 \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
   \Ifstr{#1}{}{%
     \Ifstr{#3}{BCOR}{%
-      \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}%
+      }%
     }{\scr@pti@nerr@r}%
   }{\scr@pti@nerr@r}%
 }
@@ -497,8 +502,12 @@
 \def\@@DIV #1DIV#2DIV#3\@@DIV{%
   \edef\@tempa{#1}\ifx\@tempa\@empty
     \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb
-      \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}%
+      }%
     \else\scr@pti@nerr@r\fi
   \else\@BCOR\fi
 }
@@ -1477,13 +1486,13 @@
 \newcommand*{\scr@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 3453 2020-02-25 07:33:30Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $
 %%%            (run: execoption)
 \KOMAExecuteOptions{%
   parskip=false,%
 }
 \KOMAProcessOptions\relax
-%%% 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: body)
 \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
   \newcommand*{\@setif}[2][]{%
@@ -1971,7 +1980,7 @@
   \@nomath\sfb}
 \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
 \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $
 %%%            (run: body)
 \setlength{\skip\@mpfootins}{\skip\footins}
 \setlength\fboxsep{3\p@}
@@ -2020,7 +2029,8 @@
 \newcommand*{\is@thispageodd@setlabel}{}
 \newif\ifthispagewasodd
 \providecommand*{\ifthispageodd}{%
-  \PackageWarning{scrbase}{Usage of deprecated command
+  \ClassWarning{\KOMAClasSName}{%
+    Usage of deprecated command
     `\string\ifthispageodd'.\MessageBreak
     The command has been renamed because of a\MessageBreak
     recommendation of The LaTeX Project Team.\MessageBreak
@@ -3121,7 +3131,7 @@
     \@tempa%
   }
 \newcommand*{\addtoplength}{\@addtoplength}
-%%% 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: body)
 \let\@BCOR                =\relax
 \let\@@BCOR               =\relax
-- 
cgit v1.2.3

