From 9a6785706ed1238169de63236cf1ade3038a8315 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 3 Jan 2019 21:58:12 +0000
Subject: koma-script (3jan19)

git-svn-id: svn://tug.org/texlive/trunk@49587 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/latex/koma-script/scrlttr2.cls  | 134 +++++++++++++--------
 1 file changed, 83 insertions(+), 51 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 cd0673ef20c..60b76ecb46c 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 2674 2017-09-07 09:35:17Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3050 2018-12-30 14:36:55Z kohm $
 \begingroup
   \catcode`\@11\relax
   \ifx\KOMAScriptVersion\undefined
@@ -95,7 +95,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2018/12/30 v3.26a KOMA-Script}%
 \endgroup
 \providecommand*{\scr@clsextension}{\@clsextension}
 \AtBeginDocument{%
@@ -110,13 +110,13 @@
 \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
 \edef\KOMAClassFileName{\KOMAClassFileName}
 \ProvidesClass{\KOMAClassName}[%
-  2018/03/30 v3.25 KOMA-Script
+  2018/12/30 v3.26a KOMA-Script
   document class (\ClassName)%
 ]
-%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3043 2018-11-06 07:50:06Z kohm $
 %%%            (run: load)
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3050 2018-12-30 14:36:55Z kohm $
 %%%            (run: init)
 \newcommand*
   {\scr@compatibility}{\scr@v@last}
@@ -186,10 +186,12 @@
 \@namedef{scr@v@3.23}{16}
 \@namedef{scr@v@3.24}{16}
 \@namedef{scr@v@3.25}{17}
+\@namedef{scr@v@3.26}{17}
+\@namedef{scr@v@3.26a}{17}
 \@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
 %%%            (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3050 2018-12-30 14:36:55Z kohm $
 %%%            (run: option)
 \KOMA@key{version}[last]{%
   \scr@ifundefinedorrelax{scr@v@#1}{%
@@ -239,7 +241,7 @@
 \newcommand*{\scr@v@is@ge}[1]{%
   \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
 }
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
 %%%            (run: option)
 \KOMA@key{draft}[true]{%
   \KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -293,7 +295,7 @@
 \newcommand*{\@gr@gsffamily}{%
   \if@egregdoesnotlikesansseriftitles\else\sffamily\fi
 }
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
 %%%            (run: option)
 \newcommand*{\lco@test}{%
   \IfFileExists{\CurrentOption.lco}{%
@@ -311,7 +313,7 @@
 }
 \AtEndOfClass
   {\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
 %%%            (run: option)
 \newif\if@orgdate\@orgdatetrue
 \KOMA@key{numericaldate}[true]{%
@@ -327,7 +329,7 @@
 }{orgdate}{true}
 \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
 \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
 %%%            (run: option)
 \newcommand*\@ptsize{%
   12%
@@ -415,9 +417,9 @@
 }
 %%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
 %%%            (run: option)
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2753 2017-11-29 08:58:32Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2980 2018-04-26 12:06:09Z kohm $
 %%%            (run: option)
-%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
 %%%            (run: options)
 \KOMA@key{twoside}[true]{%
   \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -799,7 +801,7 @@
 \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
 %%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
 %%%            (run: option)
-%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
 %%%            (run: option)
 \KOMA@key{footnotes}{%
   \ifx\@footnotemark\scr@saved@footnotemark
@@ -872,7 +874,7 @@
   \relax}
 %%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
 %%%            (run: option)
-%%% From File: $Id: scrkernel-notepaper.dtx 2700 2017-11-15 07:19:59Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
 %%%            (run: option)
 \KOMA@ifkey{firsthead}{@firsthead}
 \KOMAExecuteOptions{firsthead=true}
@@ -1267,7 +1269,7 @@
     \KOMA@kav@xadd{.%
       \KOMAClassFileName
     }{subject}{\if@subjafter after\else before\fi opening}%
-    \ifx\subject@format\undeline
+    \ifx\subject@format\underline
       \KOMA@kav@add{.%
         \KOMAClassFileName
       }{subject}{underlined}%
@@ -1424,13 +1426,13 @@
 }{symbolicnames}{false}%
 %%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
 %%%            (run: option)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
 %%%            (run: execoption)
 \KOMAExecuteOptions{%
   parskip=false,%
 }
 \KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3050 2018-12-30 14:36:55Z kohm $
 %%%            (run: body)
 \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
   \newcommand*{\@setif}[2][]{%
@@ -1443,7 +1445,7 @@
     \expandafter\endgroup\@tempa
   }%
 \fi
-%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
 %%%            (run: body)
 \newcommand*\scr@setlength[4]{%
   \expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -1918,7 +1920,7 @@
   \@nomath\sfb}
 \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
 \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
 %%%            (run: body)
 \setlength{\skip\@mpfootins}{\skip\footins}
 \setlength\fboxsep{3\p@}
@@ -2030,21 +2032,7 @@
   `parskip' with one of it's several values}
 \scr@package@not@recommended{titleps}{%
   package `scrlayer-scrpage'}
-\scr@package@not@recommended{titlesec}{%
-  the package only\MessageBreak
-  if you really need it, because it breaks several\MessageBreak
-  KOMA-Script features, i.e., option `headings' and\MessageBreak
-  the extended optional argument of the section\MessageBreak
-  commands}
-\scr@package@not@recommended{tocbibind}{%
-  options like `listof=totoc'\MessageBreak
-  or `bibliography=totoc', or commands like\MessageBreak
-  `\string\setuptoc{toc}{totoc}' instead of this package,\MessageBreak
-  because it breaks several KOMA-Script features of\MessageBreak
-  the list of figures, list of tables, bibliography,\MessageBreak
-  index and the running head%
-}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
 %%%            (run: body)
 \newcommand*{\LoadLetterOption}[1]{%
   \@ifundefined{@restore@catcode@level}%
@@ -2062,7 +2050,7 @@
   \@tempcnta=\@restore@catcode@level\relax
   \advance\@tempcnta by \@ne\relax
   \edef\@restore@catcode@level{\the\@tempcnta}%
-  \KV@@sp@def\reserved@a{#1}%
+  \scr@sp@def\reserved@a{#1}%
   \edef\reserved@a{%
     \noexpand\edef\noexpand\scr@currentlco{\reserved@a}%
     \noexpand\InputIfFileExists{\reserved@a.lco}{%
@@ -2116,7 +2104,7 @@
 \newcommand*{\lco@RequirePackage}[2][]{%
   \begingroup
     \@for\reserved@a:=#2\do{%
-      \expandafter\KV@@sp@def\expandafter\reserved@a\expandafter{\reserved@a}%
+      \scr@trim@spaces\reserved@a
       \scr@ifundefinedorrelax{ver@\reserved@a.\scr@pkgextension}{%
         \ClassError{\KOMAClassName}{%
           lco-file `\scr@currentlco' can be used only in preamble%
@@ -2136,11 +2124,10 @@
   \begingroup
     \def\reserved@a{\endgroup}%
     \@for\reserved@b:=#1\do{%
+      \scr@trim@spaces\reserved@b
       \ifx\reserved@b\@empty\else
-        \ifx\reserved@b\space\else
-          \edef\reserved@a{\expandafter\unexpanded\expandafter{\reserved@a
-              \LoadLetterOption}{\reserved@b}\relax}%
-        \fi
+        \edef\reserved@a{\expandafter\unexpanded\expandafter{\reserved@a
+            \LoadLetterOption}{\reserved@b}\relax}%
       \fi
     }%
   \reserved@a
@@ -2219,7 +2206,7 @@
 \newcommand*{\LetterOptionNeedsPapersize}[2]{%
   \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
 }
-%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
 %%%            (run: body)
 \newcommand*{\g@addnumerical@date}[2]{%
   \@ifundefined{date#1}{%
@@ -2917,7 +2904,7 @@
     }%
   \endgroup
 }
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2753 2017-11-29 08:58:32Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2980 2018-04-26 12:06:09Z kohm $
 %%%            (run: body)
 \newcommand*{\@newplength}[1]{%
   \@ifundefined{ltr@len@#1}{%
@@ -2935,6 +2922,7 @@
       Don't use this KOMA-Script internal macro}%
     }%
   }
+\newcommand*{\newplength}{\@newplength}
 \newcommand*{\useplength}[1]{%
   \glueexpr \csname ltr@len@#1\endcsname\relax}%
 \newcommand*{\setlengthtoplength}[3][]{%
@@ -2947,9 +2935,52 @@
     \edef\@tempa{\noexpand\endgroup%
       \noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*%
       \noexpand\csname ltr@len@#2\noexpand\endcsname{\the\@tempskipa}%
-      }%
-    \@tempa%
-  }
+    }%
+  \@tempa
+}
+\newcommand*{\setplength}{\@setplength}
+\newcommand*{\setplengthtowidth}[3][]{%
+  \begingroup
+    \settowidth{\@tempdima}{#3}%
+    \setlength{\@tempdima}{#1\@tempdima}%
+    \edef\@tempa{\noexpand\endgroup
+      \noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*%
+      \noexpand\csname ltr@len@#2\noexpand\endcsname{\the\@tempdima}%
+    }%
+  \@tempa
+}
+\newcommand*{\setplengthtoheight}[3][]{%
+  \begingroup
+    \settoheight{\@tempdima}{#3}%
+    \setlength{\@tempdima}{#1\@tempdima}%
+    \edef\@tempa{\noexpand\endgroup
+      \noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*%
+      \noexpand\csname ltr@len@#2\noexpand\endcsname{\the\@tempdima}%
+    }%
+  \@tempa
+}
+\newcommand*{\setplengthtodepth}[3][]{%
+  \begingroup
+    \settodepth{\@tempdima}{#3}%
+    \setlength{\@tempdima}{#1\@tempdima}%
+    \edef\@tempa{\noexpand\endgroup
+      \noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*%
+      \noexpand\csname ltr@len@#2\noexpand\endcsname{\the\@tempdima}%
+    }%
+  \@tempa
+}
+\newcommand*{\setplengthtototalheight}[3][]{%
+  \begingroup
+    \settoheight{\@tempdima}{#3}%
+    \settodepth{\@tempdimb}{#3}%
+    \addtolength{\@tempdima}{\@tempdimb}%
+    \setlength{\@tempdima}{#1\@tempdima}%
+    \edef\@tempa{\noexpand\endgroup
+      \noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*%
+      \noexpand\csname ltr@len@#2\noexpand\endcsname{\the\@tempdima}%
+    }%
+  \@tempa
+}
 \newcommand*{\addtolengthplength}[3][]{%
   \begingroup%
     \setlengthtoplength[{#1}]{\@tempskipa}{#3}%
@@ -2968,7 +2999,8 @@
       }%
     \@tempa%
   }
-%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
+\newcommand*{\addtoplength}{\@addtoplength}
+%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
 %%%            (run: body)
 \let\@BCOR                =\relax
 \let\@@BCOR               =\relax
@@ -3209,7 +3241,7 @@
 \newcommand\marginline[1]{%
   \marginpar[\raggedleft{#1}]{\raggedright #1}%
 }
-%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
 %%%            (run: body)
 \renewcommand*\footnoterule{%
   \normalsize\ftn@rule@test@values
@@ -3330,7 +3362,7 @@
   \kern-\multiplefootnotemarker
   \kern\multiplefootnotemarker\relax
 }
-\@ifundefined{FN@mf@prepare}{}{}
+\@ifundefined{FN@mf@prepare}{\let\FN@mf@prepare\relax}{}
 \newcommand{\scr@saved@footnotetext}{}
 \let\scr@saved@footnotetext\@footnotetext
 \renewcommand{\@footnotetext}[1]{%
@@ -3518,7 +3550,7 @@
 \newcommand*{\scr@fnt@descriptionlabel}{\descfont}
 \newkomafont{labelinglabel}{}
 \newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 2700 2017-11-15 07:19:59Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
 %%%            (run: body)
 \newcommand*{\@firsthead}{%
   \ClassWarning{scrlttr2}{%
@@ -4837,7 +4869,7 @@
     \string\date\space changes the internal \string\LaTeX\space date
     only.\MessageBreak
     You should note that this changes the default\MessageBreak
-    value of variable `date' only as long as someone\MessageBreak
+    value of variable `date' only as long as nobody\MessageBreak
     uses `\string\setkomavar` to change the content of\MessageBreak
     variable `date'.\MessageBreak
     Therefore, usage of `\string\setkomavar' is recommended\MessageBreak
-- 
cgit v1.2.3

