diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrletter.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrletter.sty | 68 |
1 files changed, 58 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty index 89a3c587f65..67cca69968b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -60,7 +60,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 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -82,17 +82,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \scr@ifundefinedorrelax{KOMAClassName}{% @@ -130,7 +130,7 @@ \let\do@renewforletter@list\@empty } %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% \expandafter @@ -165,7 +165,7 @@ %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ %%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ %%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -682,7 +682,7 @@ \KOMAProcessOptions\relax %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% {\let\@restore@catcode@level=\z@}{}% @@ -700,7 +700,9 @@ \advance\@tempcnta by \@ne\relax \edef\@restore@catcode@level{\the\@tempcnta}% \KV@@sp@def\reserved@a{#1}% - \edef\reserved@a{\noexpand\InputIfFileExists{\reserved@a.lco}{% + \edef\reserved@a{% + \noexpand\edef\noexpand\scr@currentlco{\reserved@a}% + \noexpand\InputIfFileExists{\reserved@a.lco}{% \noexpand\PackageInfo{scrletter% }{Letter-Class-Option `#1' loaded}% }{% @@ -712,8 +714,35 @@ to load\noexpand\MessageBreak the file `#1.lco'. But the file isn't available.}% }% + \scr@ifundefinedorrelax{scr@currentlco}{% + \unexpanded{\let\scr@currentlco\relax}% + }{% + \noexpand\def\noexpand\scr@currentlco{\scr@currentlco}% + }% }% - \reserved@a + \if@atdocument + \edef\reserved@a{% + \unexpanded\expandafter{\reserved@a}% + \ifx\RequirePackage\@notprerr + \unexpanded{\let\RequirePackage\@notprerr}% + \else + \noexpand\def\noexpand\RequirePackage{% + \unexpanded\expandafter{\RequirePackage}% + }% + \fi + \ifx\usepackage\@notprerr + \unexpanded{\let\usepackage\@notprerr}% + \else + \noexpand\def\noexpand\Rusepackage{% + \unexpanded\expandafter{\usepackage}% + }% + \fi + }% + \let\RequirePackage\lco@RequirePackage + \let\usepackage\lco@RequirePackage + \expandafter\reserved@a + \else \expandafter\reserved@a + \fi \@tempcnta=\@restore@catcode@level\relax \advance\@tempcnta by \m@ne\relax \edef\@restore@catcode@level{\the\@tempcnta}% @@ -721,6 +750,25 @@ \@restore@catcode \fi } +\newcommand*{\lco@RequirePackage}[2][]{% + \begingroup + \@for\reserved@a:=#2\do{% + \expandafter\KV@@sp@def\expandafter\reserved@a\expandafter{\reserved@a}% + \scr@ifundefinedorrelax{ver@\reserved@a.\scr@pkgextension}{% + \PackageError{scrletter}{% + lco-file `\scr@currentlco' can be used only in preamble% + }{% + The lco-file `\scr@currentlco' uses \string\RequirePackage\space or + \string\usepackage\space to load\MessageBreak + package `\reserved@a'. This means you have to either load + `\reserved@a'\MessageBreak + or lco-file `\scr@currentlco' in the document preamble. + }% + }{}% + }% + \endgroup + \scr@gobbleopt +} \newcommand*{\LoadLetterOptions}[1]{% \begingroup \def\reserved@a{\endgroup}% @@ -1491,7 +1539,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \newcommand*{% \letterpagemark }{% |