diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls')
| -rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls | 321 |
1 files changed, 200 insertions, 121 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 791aeab5d25..7ffb45cfa26 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -15,7 +15,7 @@ %% scrkernel-fonts.dtx (with options: `class,letter,option') %% scrkernel-variables.dtx (with options: `class,letter,option') %% scrkernel-pseudolengths.dtx (with options: `class,letter,option') -%% scrkernel-typearea.dtx (with options: `class,letter,option') +%% scrkernel-typearea.dtx (with options: `class,letter,options') %% scrkernel-paragraphs.dtx (with options: `class,letter,option') %% scrkernel-pagestyles.dtx (with options: `class,letter,option') %% scrkernel-floats.dtx (with options: `class,letter,option') @@ -41,7 +41,7 @@ %% scrkernel-circularletters.dtx (with options: `class,letter,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info] +%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -71,9 +71,9 @@ %% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e %% standard classes created by The LaTeX3 Project 1994-1996. You may %% find a complete unmodified copy of LaTeX2e at -%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. +%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -110,11 +110,14 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2017/04/13 v3.23 KOMA-Script + 2017/09/07 v3.24 KOMA-Script document class (\ClassName)% ] +%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init) +%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} \@namedef{scr@v@first}{0} @@ -181,9 +184,12 @@ \@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@last}{16} -%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init) -%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option) +%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $ +%%% (run: init) +%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -232,7 +238,8 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $ +%%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -256,7 +263,8 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% \expandafter @@ -273,7 +281,8 @@ } \AtEndOfClass {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $ +%%% (run: option) \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi @@ -288,7 +297,8 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newcommand*\@ptsize{% 12% } @@ -373,9 +383,59 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% 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 2617 2017-04-03 13:56:55Z kohm $ (option) +%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) +%%% From File: $Id: scrkernel-pseudolengths.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) +%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $ +%%% (run: options) +\KOMA@key{twoside}[true]{% + \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% + \ifstr{#1}{semi}{% + \@twosidetrue + \FamilyKeyStateProcessed + }{% + \def\FamilyElseValue{, `semi'}% + \KOMA@set@ifkey{twoside}{% + @twoside% + }{#1}% + }% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \expandafter\ifnum\scr@v@is@ge{3.17}% + \raggedbottom + \fi + \KOMA@kav@xreplacevalue{.% + \KOMAClassFileName + }{twoside}{#1}% + \fi +} +\KOMAExecuteOptions{twoside=false} +\KOMA@DeclareStandardOption% + {oneside}{twoside=false} +\KOMA@key{twocolumn}[true]{% + \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% + \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@replacebool{.% + \KOMAClassFileName + }{twocolumn}{@twocolumn}% + \if@atdocument\expandafter\@firstofone + \else\@ifpackageloaded{typearea}{\expandafter\@firstofone} + {\expandafter\AtEndOfClass}\fi + {\expandafter\ifnum\scr@v@is@ge{3.17}% + \if@twocolumn\twocolumn\sloppy\flushbottom + \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi + \fi}% + \fi +} +\AtEndOfClass{% + \expandafter\ifnum\scr@v@is@lt{3.17}% + \raggedbottom + \fi +} +\KOMAExecuteOptions{twocolumn=false} +\KOMA@DeclareStandardOption% + {onecolumn}{twocolumn=false} \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -433,58 +493,11 @@ \newcommand*{\scr@pti@nerr@r}{ \OptionNotUsed } -\KOMA@key{twoside}[true]{% - \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% - \ifstr{#1}{semi}{% - \@twosidetrue - \FamilyKeyStateProcessed - }{% - \def\FamilyElseValue{, `semi'}% - \KOMA@set@ifkey{twoside}{% - @twoside% - }{#1}% - }% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \expandafter\ifnum\scr@v@is@ge{3.17}% - \raggedbottom - \fi - \KOMA@kav@xreplacevalue{.% - \KOMAClassFileName - }{twoside}{#1}% - \fi -} -\KOMAExecuteOptions{twoside=false} -\KOMA@DeclareStandardOption% - {oneside}{twoside=false} -\KOMA@key{twocolumn}[true]{% - \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% - \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.% - \KOMAClassFileName - }{twocolumn}{@twocolumn}% - \if@atdocument\expandafter\@firstofone - \else\@ifpackageloaded{typearea}{\expandafter\@firstofone} - {\expandafter\AtEndOfClass}\fi - {\expandafter\ifnum\scr@v@is@ge{3.17}% - \if@twocolumn\twocolumn\sloppy\flushbottom - \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi - \fi}% - \fi -} -\AtEndOfClass{% - \expandafter\ifnum\scr@v@is@lt{3.17}% - \raggedbottom - \fi -} -\KOMAExecuteOptions{twocolumn=false} -\KOMA@DeclareStandardOption% - {onecolumn}{twocolumn=false} \DeclareOption*{% \lco@test \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ -%%% run: option +%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -649,7 +662,8 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} @@ -753,8 +767,10 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ -%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) +%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -824,8 +840,10 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ -%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) +%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -1374,13 +1392,16 @@ \KOMA@kav@add{.% \KOMAClassFileName }{symbolicnames}{false}% -%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ +%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) +%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $ +%%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body) +%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% \begingroup @@ -1392,7 +1413,8 @@ \expandafter\endgroup\@tempa }% \fi -%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -1866,7 +1888,8 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $ +%%% (run: body) \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} \setlength\fboxrule{.4\p@} @@ -1928,15 +1951,24 @@ {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } \newcommand*{\scr@package@not@recommended}[2]{% - \BeforePackage{#1}{% - \ClassWarning{\KOMAClassName}{% - Usage of package `#1' together\MessageBreak - with a KOMA-Script class is not recommended.\MessageBreak - \if\relax\detokenize{#2}\relax\else - I'd suggest to use #2.\MessageBreak - \fi - Nevertheless, using requested\MessageBreak - package `#1'% + \scr@ifundefinedorrelax{class@shoulddisablepackagewarning@list}{% + \@firstofone + }{% + \edef\reserved@a{% + \noexpand\in@{#1}{\class@shoulddisablepackagewarning@list}}% + \reserved@a + \ifin@\expandafter\@gobble\else\expandafter\@firstofone\fi + }{% + \BeforePackage{#1}{% + \ClassWarning{\KOMAClassName}{% + Usage of package `#1' together\MessageBreak + with a KOMA-Script class is not recommended.\MessageBreak + \if\relax\detokenize{#2}\relax\else + I'd suggest to use #2.\MessageBreak + \fi + Nevertheless, using requested\MessageBreak + package `#1'% + }% }% }% }% @@ -1949,7 +1981,13 @@ `parskip' with one of it's several values} \scr@package@not@recommended{fancyhdr}{% \MessageBreak - package `scrlayer-scrpage'} + package `scrlayer' or `scrlayer-scrpage', because\MessageBreak + they support KOMA-Script classes.\MessageBreak + With `fancyhdr' several features of class `\KOMAClassName'\MessageBreak + like options `headsepline', `footsepline' or command\MessageBreak + `\string\MakeMarkcase' and the commands `\string\setkomafont' and\MessageBreak + `\string\addtokomafont' for the page style elements need\MessageBreak + explicite user intervention to work} \scr@package@not@recommended{titlesec}{% the package only\MessageBreak if you really need it, because it breaks several\MessageBreak @@ -1959,7 +1997,8 @@ \scr@package@not@recommended{titleps}{% package `scrlayer-scrpage'} \scr@package@not@recommended{minitoc}{} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% {\let\@restore@catcode@level=\z@}{}% @@ -2133,7 +2172,8 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $ +%%% (run: body) \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% \ClassInfo{scrlttr2% @@ -2159,49 +2199,69 @@ }% }{}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\yourrefname{Your ref.}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\yourrefname{Your ref.}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\yourmailname{Your letter of}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\yourmailname{Your letter of}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\myrefname{Our ref.}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\myrefname{Our ref.}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\customername{Customer no.}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\customername{Customer no.}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\invoicename{Invoice no.}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\invoicename{Invoice no.}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\subjectname{Subject}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\subjectname{Subject}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\ccname{cc}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\ccname{cc}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\enclname{encl}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\enclname{encl}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\headtoname{To}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\headtoname{To}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\headfromname{From}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\headfromname{From}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\datename{Date}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\datename{Date}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\pagename{Page}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\pagename{Page}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\phonename{Phone}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\phonename{Phone}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\mobilephonename{Mobile phone}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\mobilephonename{Mobile phone}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\faxname{Fax}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\faxname{Fax}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\emailname{Email}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\emailname{Email}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\wwwname{Url}% + english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\wwwname{Url}% \providecaptionname{american,australian,british,canadian,% - english,newzealand,UKenglish,USenglish}\bankname{Bank account}% + 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{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}% \g@addnumerical@date{newzealand}{\number\day/\number\month/\number\year}% - \g@addnumerical@date{USenglish}{\number\month/\number\day/\number\year}% \g@addnumerical@date{UKenglish}{\number\day/\number\month/\number\year}% + \g@addnumerical@date{ukenglish}{\number\day/\number\month/\number\year}% + \g@addnumerical@date{USenglish}{\number\month/\number\day/\number\year}% + \g@addnumerical@date{usenglish}{\number\month/\number\day/\number\year}% \providecaptionname{german,ngerman,austrian,naustrian,% swissgerman,nswissgerman}\yourrefname{Ihr Zeichen}% \providecaptionname{german,ngerman,austrian,naustrian,% @@ -2531,11 +2591,21 @@ \@nameuse{extrasUKenglish}% \@nameuse{dateUKenglish}% \fi\fi + \ifx\l@ukenglish\undefined\else\ifnum\language=\l@ukenglish + \@nameuse{captionsukenglish}% + \@nameuse{extrasukenglish}% + \@nameuse{dateukenglish}% + \fi\fi \ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish \@nameuse{captionsUSenglish}% \@nameuse{extrasUSenglish}% \@nameuse{dateUSenglish}% \fi\fi + \ifx\l@usenglish\undefined\else\ifnum\language=\l@usenglish + \@nameuse{captionsusenglish}% + \@nameuse{extrasusenglish}% + \@nameuse{dateusenglish}% + \fi\fi \ifx\l@austrian\undefined\else\ifnum\language=\l@austrian \@nameuse{captionsaustrian}% \@nameuse{extrasaustrian}% @@ -2661,19 +2731,20 @@ }{% used language is `\languagename'.\MessageBreak Supported languages are: `english', `UKenglish',\MessageBreak - `british', `american', `USenglish', `australian`,\MessageBreak - `canadian', `newzealand',\MessageBreak + `ukenglish', `british', `american', `USenglish',\MessageBreak + `usenglish', `australian`,`canadian', `newzealand',\MessageBreak `german', `ngerman', `austrian', `naustrian',\MessageBreak `swissgerman', `nswissgermsn',\MessageBreak `acadian', `canadien', `francais', `french', \MessageBreak `dutch', `italian', `spanish', `polish',\MessageBreak `croatian', `finnish', `norsk', `swedish',\MessageBreak - `czech'. `slovak' + `czech', `slovak'% }% \fi \fi } -%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*{\newkomavar}{% \kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} \newcommand*{\@newkomavar}[2][\relax]{% @@ -2799,7 +2870,8 @@ }% \endgroup } -%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*{\@newplength}[1]{% \@ifundefined{ltr@len@#1}{% \expandafter\let\csname ltr@len@#1\endcsname=\z@% @@ -2854,7 +2926,8 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (body) +%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $ +%%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2865,8 +2938,8 @@ \let\x@@paper =\relax \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ -%%% run: body +%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \newcommand*{\scr@selectfont}{} @@ -2992,7 +3065,8 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -3088,11 +3162,13 @@ } \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -3249,7 +3325,8 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \setlength{\leftmargini}{2.5em} \setlength{\leftmarginii}{2.2em} \setlength{\leftmarginiii}{1.87em} @@ -3399,7 +3476,8 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% Deprecated usage of \string\@firsthead.\MessageBreak @@ -4725,7 +4803,8 @@ }% \scr@saved@date{#1}% } -%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*{\adrentry}[7]{% \addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}} \newcommand*{\adrchar}{\addrchar} @@ -4736,7 +4815,7 @@ \expandafter\def\csname #9\endcsname{#2 #1\\#3}% \fi \fi} \newcommand*{\addrchar}[1]{} -%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} |