summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-29 22:32:58 +0000
committerKarl Berry <karl@freefriends.org>2017-01-29 22:32:58 +0000
commite02235dda0e68d2131b9cf111af5448fa125ad58 (patch)
tree37ea12425820b8b346764911b170eefcc0a68b44 /Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
parent687ffbc778abf7b367ab1c6ed91c016e8138c2ad (diff)
koma-script (29jan17)
git-svn-id: svn://tug.org/texlive/trunk@43084 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls161
1 files changed, 94 insertions, 67 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index d2f8649e0d7..fc190203355 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -71,7 +71,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -93,7 +93,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -108,12 +108,12 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2016/06/14 v3.21 KOMA-Script
+ 2017/01/03 v3.22 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -214,7 +214,8 @@
\@namedef{scr@v@3.19a}{15}
\@namedef{scr@v@3.20}{15}
\@namedef{scr@v@3.21}{15}
-\@namedef{scr@v@last}{15}
+\@namedef{scr@v@3.22}{16}
+\@namedef{scr@v@last}{16}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
}
@@ -283,7 +284,7 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $
\newcommand*\@ptsize{%
12%
}
@@ -370,7 +371,7 @@
}
%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -748,8 +749,8 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
-%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -819,8 +820,8 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
-%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
\newcommand*{\@alignfrom}{0}
@@ -1375,7 +1376,7 @@
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
\begingroup
@@ -1387,7 +1388,7 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -1794,15 +1795,15 @@
\ClassError{\KOMAClassName}{undefined old font command `\string#1'}{%
You should note that since 1994 LaTeX2e provides a new font selection
scheme\MessageBreak
- called NFSS2 with several new, combinable font commands. New
+ called NFSS2 with several new, combinable font commands.
KOMA-Script\MessageBreak
- classes have defined the old font commands like `\string#1'
+ classes had defined the old font commands like `\string#1'
only for compatibility\MessageBreak
with old LaTeX 2.09 document styles of Script 2.0. Nevertheless,
these\MessageBreak
- commands are deprecated and undocumented at least since
- 2003. Since 2013\MessageBreak
- KOMA-Script classes warn abouts soon removement of these deprecated
+ commands are deprecated and undocumented at least since 2003. Since
+ 2013\MessageBreak
+ KOMA-Script classes warned about soon removement of these deprecated
commands.\MessageBreak
Now, after two decades of LaTeX2e and NFSS2, these commands will not
work any\MessageBreak
@@ -1832,11 +1833,11 @@
You should note, that since 1994 LaTeX2e provides a\MessageBreak
new font selection scheme called NFSS2 with several\MessageBreak
new, combinable font commands. New KOMA-Script classes\MessageBreak
- have defined the old font commands like `\string#1' only for\MessageBreak
+ defined the old font commands like `\string#1' only for\MessageBreak
compatibility with LaTeX 2.09 document styles of\MessageBreak
Script 2.0. These commands are deprecated and\MessageBreak
undocumented at least since 2003. Since 2013,\MessageBreak
- KOMA-Script classes warn about soon removement of\MessageBreak
+ KOMA-Script classes warned about soon removement of\MessageBreak
these deprecated commands. Now, after two decades of\MessageBreak
LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak
not work any longer. If loading a package results in\MessageBreak
@@ -2835,7 +2836,7 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -3069,11 +3070,11 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -3126,28 +3127,46 @@
\ftn@rule@test@values
}
\newcommand\deffootnote[4][]{%
- \long\def\@makefntext##1{%
- \setlength{\@tempdimc}{#3}%
- \def\@tempa{#1}\ifx\@tempa\@empty
- \@setpar{\@@par
- \@tempdima = \hsize
- \addtolength{\@tempdima}{-#2}%
- \parshape \@ne #2 \@tempdima}%
- \else
- \addtolength{\@tempdimc}{#2}%
- \addtolength{\@tempdimc}{-#1}%
- \@setpar{\@@par
- \@tempdima = \hsize
- \addtolength{\@tempdima}{-#1}%
- \@tempdimb = \hsize
- \addtolength{\@tempdimb}{-#2}%
- \parshape \tw@ #1 \@tempdima #2 \@tempdimb
+ \expandafter\ifnum\scr@v@is@ge{3.22}\relax
+ \long\def\@makefntext##1{%
+ \leftskip #2
+ \l@addto@macro\@trivlist{%
+ \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi
}%
- \fi
- \par
- \parindent\@tempdimc\noindent
- \ftn@font\hbox to \z@{\hss\@@makefnmark}##1%
- }%
+ \parindent #3\noindent
+ \IfArgIsEmpty{#1}{}{%
+ \hskip \dimexpr #1-#2\relax
+ }%
+ \ftn@font\hbox to \z@{\hss\@@makefnmark}##1%
+ }%
+ \else
+ \ClassInfo{\KOMAClassName}{%
+ Using old \string\@makefntext\space due to compatibility
+ level\MessageBreak
+ less than 3.22}%
+ \long\def\@makefntext##1{%
+ \setlength{\@tempdimc}{#3}%
+ \def\@tempa{#1}\ifx\@tempa\@empty
+ \@setpar{\@@par
+ \@tempdima = \hsize
+ \addtolength{\@tempdima}{-#2}%
+ \parshape \@ne #2 \@tempdima}%
+ \else
+ \addtolength{\@tempdimc}{#2}%
+ \addtolength{\@tempdimc}{-#1}%
+ \@setpar{\@@par
+ \@tempdima = \hsize
+ \addtolength{\@tempdima}{-#1}%
+ \@tempdimb = \hsize
+ \addtolength{\@tempdimb}{-#2}%
+ \parshape \tw@ #1 \@tempdima #2 \@tempdimb
+ }%
+ \fi
+ \par
+ \parindent\@tempdimc\noindent
+ \ftn@font\hbox to \z@{\hss\@@makefnmark}##1%
+ }%
+ \fi
\def\@@makefnmark{\hbox{\ftnm@font{#4}}}%
}
\newcommand*{\ftn@font}{\normalfont}
@@ -3210,7 +3229,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $
\setlength{\leftmargini}{2.5em}
\setlength{\leftmarginii}{2.2em}
\setlength{\leftmarginiii}{1.87em}
@@ -3305,22 +3324,24 @@
}
\newenvironment{addmargin*}{%
\@tempswafalse
- \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi
- \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
+ \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi
+ \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}\fi
\@addmargin
}{%
- \unskip\nobreak\ifthispageodd{}{}%
- \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else
- \ClassWarning{\KOMAClassName}{%
- page break inside `addmargin*' environment.\MessageBreak
- A `addmargin*' environment starting on page
- \scr@addmargin@startpage\MessageBreak
- ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak
- This will result in potential wrong margins on\MessageBreak
- every other page.\MessageBreak
- So maybe you should change the `addmargin*'\MessageBreak
- environment, that ends%
- }%
+ \if@twoside
+ \unskip\nobreak\ifthispageodd{}{}%
+ \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else
+ \ClassWarning{\KOMAClassName}{%
+ page break inside `addmargin*' environment.\MessageBreak
+ A `addmargin*' environment starting on page
+ \scr@addmargin@startpage\MessageBreak
+ ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak
+ This will result in potential wrong margins on\MessageBreak
+ every other page.\MessageBreak
+ So maybe you should change the `addmargin*'\MessageBreak
+ environment, that ends%
+ }%
+ \fi
\fi
\advance\@listdepth\@ne
\endlist
@@ -3339,20 +3360,26 @@
\setlength{\listparindent}{\parindent}%
\setlength{\itemsep}{\parskip}%
\setlength{\itemindent}{\z@}%
+ \setlength{\@tempskipa}{\topsep}%
\setlength{\topsep}{\z@}%
\setlength{\parsep}{\parskip}%
+ \setlength{\@tempskipb}{\partopsep}%
\setlength{\partopsep}{\z@}%
\let\makelabel\@gobble
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
}%
+ \expandafter\ifnum\scr@v@is@ge{3.22}%
+ \setlength{\topsep}{\@tempskipa}%
+ \setlength{\partopsep}{\@tempskipb}%
+ \fi
\item\is@thispageodd@setlabel\nobreak\ignorespaces
}
\newcommand*\descfont{\@gr@gsffamily\bfseries}
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firsthead.\MessageBreak
@@ -3367,7 +3394,7 @@
{\centering\usekomafont{fromaddress}{%
\ifkomavarempty{fromname}{}{%
{\usekomafont{fromname}%
- {\ignorespaces\usekomavar{fromname}}}\\[-8pt]
+ {\ignorespaces\usekomavar{fromname}}\\[-8pt]}
{\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\
}%
\ifkomavarempty{fromaddress}{}{%
@@ -3922,8 +3949,8 @@
\addtolengthplength[-2]{\@tempdima}{toaddrindent}%
\vbox{\hsize\@tempdima\raggedright
\usekomafont{addressee}{%
- \usekomafont{toname}{\usekomavar{toname}\\}%
- \usekomafont{toaddress}{\usekomavar{toaddress}}}}%
+ {\usekomafont{toname}{\usekomavar{toname}\\}}%
+ {\usekomafont{toaddress}{\usekomavar{toaddress}\endgraf}}}}%
\vfil\null\vskip-\baselineskip}%
{address field}{toaddrheight}%
{\begin{letter} or you\MessageBreak
@@ -4071,8 +4098,8 @@
}%
\raggedright
\usekomafont{addressee}{%
- \usekomafont{toname}{\usekomavar{toname}\\}%
- \usekomafont{toaddress}{\usekomavar{toaddress}}}}%
+ {\usekomafont{toname}{\usekomavar{toname}\\}}%
+ {\usekomafont{toaddress}{\usekomavar{toaddress}\endgraf}}}}%
\fi
\vss\null}%
{address field}{toaddrheight}%
@@ -4574,7 +4601,7 @@
\fi\noindent%
\begingroup
\parbox[t]{\textwidth}{%
- \ifkomavarempty{ccseparator}{}{%
+ \ifkomavarempty*{ccseparator}{}{%
\@hangfrom{%
\strut\usekomavar*{ccseparator}\usekomavar{ccseparator}}%
}%