summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrletter.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrletter.sty406
1 files changed, 214 insertions, 192 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
index 7919eec60fd..86b25a5dc81 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
@@ -7,7 +7,6 @@
%% scrkernel-version.dtx (with options: `package,letter')
%% scrkernel-basics.dtx (with options: `load')
%% scrkernel-miscellaneous.dtx (with options: `package,letter,init')
-%% scrkernel-compatibility.dtx (with options: `package,letter,init')
%% scrkernel-typearea.dtx (with options: `package,letter,init')
%% scrkernel-miscellaneous.dtx (with options: `package,letter,option')
%% scrkernel-letterclassoptions.dtx (with options: `package,letter,option')
@@ -30,7 +29,7 @@
%% scrkernel-circularletters.dtx (with options: `package,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -58,11 +57,11 @@
%%
%% 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 may
+%% 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: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -84,20 +83,20 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
\ProvidesPackage{scrletter}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
letter package extending any KOMA-Script class%
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
\scr@ifundefinedorrelax{KOMAClassName}{%
\PackageWarningNoLine{scrletter}{%
@@ -121,85 +120,11 @@
}
\providecommand*{\par@updaterelative}{}
}{}
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
-\providecommand*
- {\scr@compatibility}{\scr@v@last}
-\@namedef{scr@v@first}{0}
-\@namedef{scr@v@2.9}{0}
-\@namedef{scr@v@2.9t}{0}
-\@namedef{scr@v@2.9u}{1}
-\@namedef{scr@v@2.95}{2}
-\@namedef{scr@v@2.95a}{2}
-\@namedef{scr@v@2.95b}{2}
-\@namedef{scr@v@2.96}{2}
-\@namedef{scr@v@2.96a}{3}
-\@namedef{scr@v@2.97}{3}
-\@namedef{scr@v@2.97a}{3}
-\@namedef{scr@v@2.97b}{3}
-\@namedef{scr@v@2.97c}{4}
-\@namedef{scr@v@2.97d}{5}
-\@namedef{scr@v@2.97e}{6}
-\@namedef{scr@v@2.98}{6}
-\@namedef{scr@v@2.98a}{6}
-\@namedef{scr@v@2.98b}{6}
-\@namedef{scr@v@2.98c}{7}
-\@namedef{scr@v@3.00}{8}
-\@namedef{scr@v@3.01}{8}
-\@namedef{scr@v@3.01a}{8}
-\@namedef{scr@v@3.01b}{9}
-\@namedef{scr@v@3.01c}{9}
-\@namedef{scr@v@3.02}{9}
-\@namedef{scr@v@3.02b}{9}
-\@namedef{scr@v@3.02c}{10}
-\@namedef{scr@v@3.03}{10}
-\@namedef{scr@v@3.03a}{10}
-\@namedef{scr@v@3.03b}{10}
-\@namedef{scr@v@3.04}{10}
-\@namedef{scr@v@3.04a}{10}
-\@namedef{scr@v@3.05}{10}
-\@namedef{scr@v@3.05a}{10}
-\@namedef{scr@v@3.06}{10}
-\@namedef{scr@v@3.07}{10}
-\@namedef{scr@v@3.08}{10}
-\@namedef{scr@v@3.08a}{10}
-\@namedef{scr@v@3.08b}{10}
-\@namedef{scr@v@3.09}{10}
-\@namedef{scr@v@3.09a}{10}
-\@namedef{scr@v@3.10}{10}
-\@namedef{scr@v@3.10a}{10}
-\@namedef{scr@v@3.10b}{10}
-\@namedef{scr@v@3.11}{10}
-\@namedef{scr@v@3.11a}{10}
-\@namedef{scr@v@3.11b}{10}
-\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@3.13}{12}
-\@namedef{scr@v@3.13a}{13}
-\@namedef{scr@v@3.14}{13}
-\@namedef{scr@v@3.15}{14}
-\@namedef{scr@v@3.16}{14}
-\@namedef{scr@v@3.17}{15}
-\@namedef{scr@v@3.17a}{15}
-\@namedef{scr@v@3.17c}{15}
-\@namedef{scr@v@3.18}{15}
-\@namedef{scr@v@3.18a}{15}
-\@namedef{scr@v@3.19}{15}
-\@namedef{scr@v@3.19a}{15}
-\@namedef{scr@v@3.20}{15}
-\@namedef{scr@v@3.21}{15}
-\@namedef{scr@v@3.22}{16}
-\@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@3.26b}{17}
-\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
-%%% (run: init)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -217,7 +142,7 @@
}
\AtEndOfPackage
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
@@ -233,15 +158,15 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2980 2018-04-26 12:06:09Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -469,6 +394,7 @@
\expandafter\in@@#1#2\in@\in@@
}
\newif\if@refwide
+\newif\if@refline\@reflinetrue
\newcommand*{\@datepos}{1}
\KOMA@key{refline}[wide]{%
\begingroup
@@ -476,12 +402,15 @@
{dateleft}{2},{leftdate}{2},%
{dateright}{3},{rightdate}{3},%
{nodate}{4}%
+ ,{no}{5},{off}{5},{false}{5}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\aftergroup\FamilyKeyStateProcessed
- \ifcase\@tempa
+ \ifcase\@tempa% wide
\endgroup
\@refwidetrue
+ \@reflinetrue
+ \KOMA@kav@remove{.scrletter.\scr@pkgextension}{refline}{false}%
\KOMA@kav@remove{.%
scrletter.\scr@pkgextension
}{refline}{wide}%
@@ -491,9 +420,11 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{refline}{wide}%
- \or
+ \or% narrow
\endgroup
\@refwidefalse
+ \@reflinetrue
+ \KOMA@kav@remove{.scrletter.\scr@pkgextension}{refline}{false}%
\KOMA@kav@remove{.%
scrletter.\scr@pkgextension
}{refline}{wide}%
@@ -503,7 +434,7 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{refline}{narrow}%
- \or
+ \or% dateleft
\endgroup
\def\@datepos{2}%
\KOMA@kav@remove{.%
@@ -518,7 +449,7 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{refline}{dateleft}%
- \or
+ \or% dateright
\endgroup
\def\@datepos{1}%
\KOMA@kav@remove{.%
@@ -533,7 +464,7 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{refline}{dateright}%
- \or
+ \or% nodate
\endgroup
\def\@datepos{0}%
\KOMA@kav@remove{.%
@@ -548,6 +479,12 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{refline}{nodate}%
+ \or% false
+ \endgroup
+ \@reflinefalse
+ \KOMA@kav@remove{.scrletter.\scr@pkgextension}{refline}{wide}%
+ \KOMA@kav@remove{.scrletter.\scr@pkgextension}{reline}{narrow}%
+ \KOMA@kav@add{.scrletter.\scr@pkgextension}{refline}{false}%
\fi
\else
\endgroup
@@ -710,68 +647,103 @@
\newif\if@scrsymbols
\KOMA@key{symbolicnames}[true]{%
\KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}%
- \KOMA@kav@replacebool{.%
- scrletter.\scr@pkgextension
- }{symbolicnames}{@scrsymbols}%
- \if@scrsymbols
- \if@atdocument
- \begingroup
- \@tempswafalse
- \scr@ifundefinedorrelax{Telefon}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{FAX}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{Email}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{Mobilefone}{\@tempswatrue}{%
- }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \def\scr@symbols@font{marvosym}%
+ \else
+ \KOMA@set@ncmdkey{symbolicnames}{reserved@a}{%
+ {marvosym}{0},%
+ {fontawesome}{1},{awesome}{1},%
+ }{#1}%
+ \ifx \FamilyKeyState\FamilyKeyStateProcessed
+ \@scrsymbolstrue
+ \ifcase \number\reserved@a
+ \def\scr@symbols@font{marvosym}%
+ \else
+ \def\scr@symbols@font{fontawesome}%
+ \fi
+ \fi
+ \fi
+ \ifx \FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ scrletter.\scr@pkgextension
+ }{symbolicnames}{#1}%
+ \if@scrsymbols
+ \ifstr{\scr@symbols@font}{marvosym}{%
+ \def\scr@symbol@phone{\Telefon}%
+ \def\scr@symbol@fax{\FAX}%
+ \def\scr@symbol@email{\Email}%
+ \def\scr@symbol@mobilephone{\Mobilefone}%
+ \def\scr@symbol@www{\@empty}%
+ }{%
+ \def\scr@symbol@phone{\faPhone}%
+ \def\scr@symbol@fax{\faFax}%
+ \def\scr@symbol@email{\faEnvelopeO}%
+ \def\scr@symbol@mobilephone{\faMobilePhone}%
+ \def\scr@symbol@www{\faGlobe}%
+ }%
+ \if@atdocument
+ \begingroup
+ \@tempswafalse
+ \expandafter\ifdefined\scr@symbol@phone\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@fax\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@email\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@mobilephone\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@www\else\@tempswatrue\fi
+ \if@tempswa
+ \aftergroup\@scrsymbolsfalse
+ \PackageWarning{scrletter}{%
+ Option `symbolicnames=#1'
+ ignorred.\MessageBreak
+ You've tried to set option `symbolicnames'\MessageBreak
+ after \string\begin{document}, but without\MessageBreak
+ loading package `\scr@symbols@font' before.\MessageBreak
+ You should either switch on option\MessageBreak
+ `symbolicnames' before \string\begin{document}\MessageBreak
+ or load package `\scr@letter@symbols@font' in the
+ document\MessageBreak
+ preamble to avoid this warning%
}%
- }%
- }%
- \if@tempswa
- \aftergroup\@scrsymbolsfalse
- \PackageWarning{scrletter}{%
- Option `symbolicnames'
- ignorred.\MessageBreak
- You've tried to set option `symbolicnames'\MessageBreak
- after \string\begin{document}, but without\MessageBreak
- loading package `marvosym' before.\MessageBreak
- You should either switch on option\MessageBreak
- `symbolicnames' before \string\begin{document}\MessageBreak
- or load package `marvosym' in the document\MessageBreak
- preamble to avoid this warning%
- }%
- \fi
- \endgroup
- \else
- \ifx\@fileswith@pti@ns\@badrequireerror
- \ifstr{\@currext}{\@clsextension}{%
- \expandafter\AtEndOfClass
- }{%
- \ifstr{\@currext}{\@pksextension}{%
- \expandafter\AtEndOfPackage
+ \fi
+ \endgroup
+ \else
+ \ifx\@fileswith@pti@ns\@badrequireerror
+ \ifstr{\@currext}{\@clsextension}{%
+ \expandafter\AtEndOfClass
}{%
- \expandafter\AtBeginDocument
+ \ifstr{\@currext}{\@pkgextension}{%
+ \expandafter\AtEndOfPackage
+ }{%
+ \expandafter\AtBeginDocument
+ }%
}%
- }%
- \else
- \expandafter\@firstofone
+ \else
+ \expandafter\@firstofone
+ \fi
+ {\RequirePackage{\scr@symbols@font}}%
\fi
- {\RequirePackage{marvosym}}%
\fi
\fi
}
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{symbolicnames}{false}%
-%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+\newcommand*{\scr@symbols@font}{}
+\newcommand*{\scr@symbol@phone}{\undefined}
+\newcommand*{\scr@symbol@fax}{\undefined}
+\newcommand*{\scr@symbol@email}{\undefined}
+\newcommand*{\scr@symbol@mobilephone}{\undefined}
+\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 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
@@ -943,7 +915,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
@@ -1024,7 +996,7 @@
english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\bankname{Bank account}%
\g@addnumerical@date{american}{\number\month/\number\day/\number\year}%
- \g@addnumerical@date{australien}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{australian}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{british}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{canadian}{\number\year/\number\month/\number\day}%
\g@addnumerical@date{english}{\number\day/\number\month/\number\year}%
@@ -1514,7 +1486,7 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\newkomavar}{%
\kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
@@ -1641,8 +1613,52 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2980 2018-04-26 12:06:09Z kohm $
+\newcommand*{\foreachkomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{\unexpanded{#2}{\reserved@a}}\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachkomavarifempty}[3]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}%
+ {\unexpanded{#2}{\reserved@a}}%
+ {\unexpanded{#3}{\reserved@a}}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachemptykomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}{\unexpanded{#2}{\reserved@a}}{}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachnonemptykomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}{}{\unexpanded{#2}{\reserved@a}}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
+\newcommand*{\if@plength}[1]{%
+ \@ifundefined{ltr@len@#1}{\@secondoftwo}{\@firstoftwo}%
+}
+\newcommand*{\Ifplength}{\if@plength}
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
@@ -1652,11 +1668,10 @@
pseudo-length \expandafter\string\csname ltr@len@#1\endcsname
already defined%
}{%
- You tried to define a new pseudo-length using
- \string\@newplength\MessageBreak
- which is already defined. Try another name or
- better\MessageBreak
- Don't use this KOMA-Script internal macro}%
+ You've tried to define a new pseudo-length using\MessageBreak
+ \string\@newplength\space
+ or \string\newplength.\MessageBreak
+ Please, try another name}%
}%
}
\newcommand*{\newplength}{\@newplength}
@@ -1737,7 +1752,7 @@
\@tempa%
}
\newcommand*{\addtoplength}{\@addtoplength}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{%
\letterpagemark
@@ -1769,7 +1784,7 @@
\rofoot[\ifnum\@pageat=5 \pagemark\fi]%
{}%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newkomavar{firsthead}
\setkomavar{firsthead}{%
@@ -1781,7 +1796,6 @@
{\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\
}%
\ifkomavarempty{fromaddress}{}{%
- \csname scr@default@firsthead@fromaddress@hook\endcsname
\ignorespaces\usekomavar{fromaddress}%
}%
}%
@@ -2027,7 +2041,7 @@
\ignorespaces%
}
\newcommand{\vb@t@z}[1]{{%
- \setbox\z@\vbox to\z@{#1\vss}%
+ \setbox\z@\vbox to\z@{\color@begingroup #1\color@endgroup\vss}%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\setlength{\baselineskip}{\z@}%
\setlength{\@tempdima}{\ht0}\addtolength{\@tempdima}{\dp0}%
@@ -2065,26 +2079,9 @@
}
\newcommand*{\@vfoldmark}[1]{%
\begingroup
- \@expandtwoargs\in@{#1}{\@usefolds}%
- \ifin@
- \ifdim \useplength{lfoldmarkhpos}=\z@\else
- \vb@t@z{%
- \ifdim \useplength{foldmarkvpos}<\z@
- \nobreak\vskip \paperheight\nobreak
- \fi
- \vskip \useplength{foldmarkvpos}%
- \vskip \useplength{foldmarkthickness}%
- \rlap{\move@topl
- \setlength{\@tempdima}{\useplength{lfoldmarkhpos}}%
- \addtolengthplength[-.5]{\@tempdima}{foldmarkthickness}%
- \hskip\@tempdima
- \usekomafont{foldmark}{%
- \rule{\useplength{foldmarkthickness}}%
- {\useplength{lfoldmarklength}}%
- }%
- }%
- }%
- \ignorespaces
+ \ifdim \useplength{lfoldmarkhpos}=\z@\else
+ \@expandtwoargs\in@{#1}{\@usefolds}%
+ \ifin@
\fi
\fi
\endgroup
@@ -2128,7 +2125,7 @@
\begingroup%
\vbox to #2{#1#3}%
\if@savevbox@warning\@savevbox@warningfalse%
- \setbox\z@\vbox{#3}%
+ \setbox\z@\vbox{\color@begingroup #3\color@endgroup}%
\setlength{\@tempdima}{#2}%
\setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
\ifdim \@tempdimb>\@tempdima%
@@ -2498,7 +2495,7 @@
\fi
\ifkomavarempty{location}{%
\typeout{Location field: empty}%
- }{%
+ }{%
\typeout{Location field: yes}%
\ifdim \useplength{lochpos}=\z@%
\@setplength{lochpos}{\useplength{toaddrhpos}}%
@@ -2655,7 +2652,8 @@
\addtoreffields{invoice}%
}
\defaultreffields
-\newcommand*{\@datefield}{{%
+\newcommand*{\@datefield}{%
+ {%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\ifdim\useplength{refwidth}=\z@
\if@refwide
@@ -2828,13 +2826,27 @@
\fi
}
\newenvironment{letter}[2][]{%
+ \if@twocolumn
+ \PackageWarning{scrletter}{%
+ twocolumn mode not supported.\MessageBreak
+ If you really want a twocolumned letter, you should\MessageBreak
+ use package `multicol' and add a `multicols'\MessageBreak
+ environment inside your letter.\MessageBreak
+ Switching back to oneside%
+ }%
+ \letter@restonecoltrue
+ \expandafter\onecolumn
+ \else
+ \letter@restonecolfalse
+ \fi
\cleardoubleoddemptypage
+ \raggedbottom
\scr@ifundefinedorrelax{letterpagestyle}{}{%
\ifx\letterpagestyle\@empty\else
\pagestyle{\letterpagestyle}%
\fi
}%
-\let\pagemark\letterpagemark
+ \let\pagemark\letterpagemark
\refstepcounter{letter}%
\let\thisletter\@currentlabel
\setcounter{page}{\@ne}%
@@ -2847,19 +2859,27 @@
\let\@currentlabel\thisletter
\label{\thisletter.lastpage}%
\@@par\pagebreak\@@par%
+ \ifletter@restonecol\twocolumn\fi
}
+\newif\ifletter@restonecol
\newcommand*{\thisletter}{outside.letter.undefined}
\newcommand*{\letterlastpage}{\pageref{\thisletter.lastpage}}
\newcommand*{\stopletter}{}
\newcommand{\@processto}[1]{%
- \ifx\relax#1\relax\else
- \expandafter\@xproc#1\\\@nil\ifkomavarempty{toaddress}{}{%
- \expandafter\@xproc#1\@nil}%
- \fi
+ \IfArgIsEmpty{#1}{%
+ }{%
+ \expandafter\@xproc#1\\\@nil
+ \ifx\reserved@b\@empty\else\expandafter\@xproc#1\@nil\fi
+ \protected@edef\reserved@a{%
+ \noexpand\setkomavar{toname}{\reserved@a}%
+ \noexpand\setkomavar{toaddress}{\reserved@b}%
+ }\reserved@a
+ }%
}
\newcommand*{\@xproc}{}
\long\def\@xproc#1\\#2\@nil{%
- \setkomavar{toname}{#1}\setkomavar{toaddress}{#2}}
+ \def\reserved@a{#1}\def\reserved@b{#2}%
+}
\g@addto@macro\flushbottom{%
\g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}%
}
@@ -2885,8 +2905,10 @@
\@PapersizeWarning
\@gen@firsthead
\@mkboth{\scr@fromname@var}{\scr@subject@var}%
- \thispagestyle{empty}\noindent
- \@foldmarks\@firstheadfootfield\@addrfield\@locfield
+ \thispagestyle{empty}%
+ \noindent
+ \@foldmarks\@firstheadfootfield
+ \@addrfield\@locfield
\ifdim\useplength{subjectvpos}=\z@\else\@subjfield\fi
\@datefield
\@makelettertitle
@@ -2981,17 +3003,17 @@
\setkomavar{enclseparator}{: }
\newkomavar{backaddressseparator}
\setkomavar{backaddressseparator}{,\nobreakspace}
-\newkomavar[\if@scrsymbols\Telefon\else\phonename\fi]{phoneseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@phone\else\phonename\fi]{phoneseparator}
\setkomavar{phoneseparator}{\if@scrsymbols\else:\fi\nobreakspace}
\newkomavar[%
- \if@scrsymbols\Mobilefone\else\mobilephonename\fi
+ \if@scrsymbols\scr@symbol@mobilephone\else\mobilephonename\fi
]{mobilephoneseparator}
\setkomavar{mobilephoneseparator}{\usekomavar{phoneseparator}}
-\newkomavar[\if@scrsymbols\FAX\else\faxname\fi]{faxseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@fax\else\faxname\fi]{faxseparator}
\setkomavar{faxseparator}{\if@scrsymbols\else:\fi\nobreakspace}
-\newkomavar[\if@scrsymbols\Email\else\emailname\fi]{emailseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@email\else\emailname\fi]{emailseparator}
\setkomavar{emailseparator}{\if@scrsymbols\else:\fi\nobreakspace}
-\newkomavar[\if@scrsymbols\else\wwwname\fi]{urlseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@www\else\wwwname\fi]{urlseparator}
\setkomavar{urlseparator}{\if@scrsymbols\else:\nobreakspace\fi}
\newkomavar{zipcodeseparator}
\setkomavar{zipcodeseparator}{\,--\,}
@@ -3034,7 +3056,7 @@
}%
\scr@saved@date{#1}%
}
-%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\adrentry}[7]{%
\addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}