summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
committerKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
commit4832d732052d6e2b43b5e3ff45aa31bfbc0cbdc2 (patch)
tree968a3b4cdf4631c0272fc725330ea28a554c8471 /Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx
parent59d9a998c6236de39603cb2ea077c5371e06b842 (diff)
koma-script (6dec14)
git-svn-id: svn://tug.org/texlive/trunk@35754 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx108
1 files changed, 67 insertions, 41 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx
index 3bc69e080d7..b3128d08e86 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-letterclassoptions.dtx
@@ -1,8 +1,8 @@
-% \CheckSum{1467}
+% \CheckSum{1498}
% \iffalse meta-comment
% ======================================================================
% scrkernel-letterclassoptions.dtx
-% Copyright (c) Markus Kohm, 2006-2013
+% Copyright (c) Markus Kohm, 2006-2014
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkernel-letterclassoptions.dtx
-% Copyright (c) Markus Kohm, 2006-2013
+% Copyright (c) Markus Kohm, 2006-2014
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,11 +55,19 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
%<*driver>
% \fi
-\ProvidesFile{scrkernel-letterclassoptions.dtx}[2013/11/05 v3.12 KOMA-Script
- (letter class options)]
+\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
+\begingroup
+ \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
+ \filedate$Date: 2014-10-04 18:58:57 +0200 (Sat, 04 Oct 2014) $
+ \def\filerevision$#1: #2 ${\gdef\filerevision{#2}}
+ \filerevision$Revision: 1799 $
+\endgroup
+\ProvidesFile{scrkernel-letterclassoptions.dtx}
+ [\filedate\space v3.14.\filerevision\space
+ KOMA-Script (letter class options)]
% \iffalse
\documentclass{scrdoc}
\usepackage[english,ngerman]{babel}
@@ -116,7 +124,10 @@
% \begin{macrocode}
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
- \expandafter\AtEndOfClass\expandafter{%
+ \expandafter
+%<class> \AtEndOfClass
+%<package> \AtEndOfPackage
+ \expandafter{%
\expandafter\LoadLetterOption\expandafter{\CurrentOption}%
}%
\expandafter\def\expandafter\scr@pti@nerr@r\expandafter{%
@@ -132,7 +143,9 @@
% Als Voreinstellung wird am Ende schon einmal die Datei \texttt{DIN.lco}
% geladen.
% \begin{macrocode}
-\AtEndOfClass{\LoadLetterOption{DIN}}
+%<class>\AtEndOfClass
+%<package>\AtEndOfPackage
+ {\LoadLetterOption{DIN}}
% \end{macrocode}
%
% \iffalse
@@ -143,7 +156,8 @@
% \subsection{Makros für Letter-Class-Options}
%
% \begin{macro}{\LoadLetterOption}
-% \changes{v2.8q}{2001/10/08}{Neu}
+% \changes{v2.8q}{2001/10/08}{Neu}^^A
+% \changes{v3.14}{2014/10/04}{Leerzeichen werden ignoriert}^^A
% Bei der neuen Briefklasse existiert eine Anweisung, mit der eine
% \emph{\textbf{l}etter-\texttt{c}lass-\texttt{o}ption}-Datei geladen
% werden kann. Das Laden wird mit entsprechender Information in der
@@ -172,29 +186,52 @@
\@tempcnta=\@restore@catcode@level\relax
\advance\@tempcnta by \@ne\relax
\edef\@restore@catcode@level{\the\@tempcnta}%
- \InputIfFileExists{#1.lco}{%
- \ClassInfo{%
- scrlttr2%
+ \KV@@sp@def\reserved@a{#1}%
+ \edef\reserved@a{\noexpand\InputIfFileExists{\reserved@a.lco}{%
+%<class> \noexpand\ClassInfo{scrlttr2%
+%<package> \noexpand\PackageInfo{scrletter%
}{Letter-Class-Option `#1' loaded}%
}{%
- \ClassError{%
- scrlttr2%
+%<class> \noexpand\ClassError{scrlttr2%
+%<package> \noexpand\PackageError{scrletter%
}{%
- Letter-Class-Option file `#1.lco' not found%
+ Letter-Class-Option file `#1.lco' not found%
}{%
- You've told me to load the Letter-Class-Option `#1'. So I have
- to load\MessageBreak
- the file `#1.lco'. But the file isn't available.}%
+ You've told me to load the Letter-Class-Option `#1'. So I have
+ to load\noexpand\MessageBreak
+ the file `#1.lco'. But the file isn't available.}%
}%
+ }%
+ \reserved@a
\@tempcnta=\@restore@catcode@level\relax
\advance\@tempcnta by \m@ne\relax
\edef\@restore@catcode@level{\the\@tempcnta}%
\ifnum\@tempcnta =\z@
\@restore@catcode
\fi
- }
+}
% \end{macrocode}
-% \end{macro}
+% \end{macro}^^A \LoadLetterOption
+% \begin{macro}{\LoadLetterOptions}
+% \changes{v3.14}{2014/10/04}{Neue Anweisung}^^A
+% Funktioniert prinzipiell wie \cs{LoadLetterOption}, aber es werden mehrere,
+% durch Komma getrennte Optionen unterstützt.
+% \begin{macrocode}
+\newcommand*{\LoadLetterOptions}[1]{%
+ \begingroup
+ \def\reserved@a{\endgroup}%
+ \@for\reserved@b:=#1\do{%
+ \ifx\reserved@b\@empty\else
+ \ifx\reserved@b\space\else
+ \edef\reserved@a{\expandafter\unexpanded\expandafter{\reserved@a
+ \LoadLetterOption}{\reserved@b}\relax}%
+ \fi
+ \fi
+ }%
+ \reserved@a
+}
+% \end{macrocode}
+% \end{macro}^^A \LoadLetterOptions
%
% \begin{macro}{\LetterOptionNeedsPapersize}
% \changes{v2.8q}{2001/10/17}{Neu}
@@ -248,8 +285,8 @@
\setlength{\paperheight}{10.5in}\setlength{\paperwidth}{7.25in}%
\else%
\def\ta@opt@err{%
- \ClassError{%
- scrlttr2%
+%<class> \ClassError{scrlttr2%
+%<package> \PackageError{scrletter%
}{papersize `\LOPNP@size' undefined}{%
You've told me to check for paper size
`\LOPNP@size'\MessageBreak
@@ -266,9 +303,9 @@
}
\newcommand*{\@@PapersizeWarning}{%
\if@tempswa\else%
- \ClassWarningNoLine{%
- scrlttr2%
- }{%
+%<class> \ClassWarningNoLine{scrlttr2%
+%<package> \PackageWarningNoLine{scrletter%
+ }{%
Letter option file `\LOPNP@option.lco'\MessageBreak
needs paper size `\LOPNP@size'.\MessageBreak
Current paper size is not `\LOPNP@size'!\MessageBreak
@@ -588,24 +625,11 @@
% \end{macrocode}
% \end{description}
% Es folgen ggf. noch zusätzliche Änderungen.
+% \changes{v3.13b}{2014/10/04}{\cs{@firsthead} existiert nicht mehr, daher nun
+% mit einem neu geschaffenen \emph{hook}}%^^A
% \begin{macrocode}
%<*DINmoretext>
-\renewcommand*{\@firsthead}{\noindent
- \parbox[b]{\useplength{firstheadwidth}}{\centering%
- \usekomafont{fromaddress}{%
- \ifkomavarempty{fromname}{}{%
- \usekomafont{fromname}%
- {\ignorespaces\usekomavar{fromname}\\[-8pt]
- \rule{\useplength{firstheadwidth}}{.4pt}\\
- }%
- }%
- \ifkomavarempty{fromaddress}{}{%
- \def\\{,\ \@ogobble}%
- \ignorespaces\usekomavar{fromaddress}%
- }%
- }%
- }%
- }
+\def\scr@default@firsthead@fromaddress@hook{\def\\{,\ \@gobble}}
%</DINmoretext>
% \end{macrocode}
%
@@ -1215,7 +1239,9 @@
% \end{KOMAfont}
% \begin{KOMAfont}{letter}
% Farbe des getrichelten Briefbogens im Umschlag
+% \begin{macrocode}
\newkomafont{letter}{\normalcolor}
+% \end{macrocode}
% \end{KOMAfont}
% \begin{macro}{\unmeasuredFrame}
% Ein Rahmen ohne Maßlinien.