summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-06-18 00:16:31 +0000
committerKarl Berry <karl@freefriends.org>2010-06-18 00:16:31 +0000
commitd9bd4cc7bc00bbe2637957dc1a44d9c949a6dbdc (patch)
tree0c8c9198b304f16b1b46962eef236c6bd290815a /Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
parent643866a0f27297875ee40ee641aa090114b87e51 (diff)
koma-script update (17jun10)
git-svn-id: svn://tug.org/texlive/trunk@19027 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.cls159
1 files changed, 51 insertions, 108 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 06a044d4221..461103c27ce 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -94,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -167,8 +167,10 @@
\@namedef{scr@v@3.03a}{10}
\@namedef{scr@v@3.03b}{10}
\@namedef{scr@v@3.04}{10}
-\@namedef{scr@v@3.05}{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@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -1141,109 +1143,6 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-\newcommand*{\setkomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be set}{%
- You've told me to redefine the font selection of the
- element,\MessageBreak%
- but either no such element is known by
- KOMA-Script\MessageBreak%
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to redefine the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\setkomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\def\csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\addtokomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be extended%
- }{%
- You've told me to extend the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to extend the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\addtokomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\l@addto@macro
- \csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\usekomafont}[1]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be used%
- }{%
- You've told me to use the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to use the font selection of the
- element\MessageBreak
- `#1' that is an alias of element `\csname
- scr@fnt@instead@#1\endcsname'\MessageBreak
- }%
- \expandafter\expandafter\expandafter\usekomafont
- \expandafter\expandafter\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}%
- }%
- }{%
- \@nameuse{scr@fnt@#1}%
- }%
-}
-\newcommand*{\newkomafont}[3][\relax]{%
- \expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
- \expandafter\expandafter\expandafter\newcommand
- \expandafter\expandafter\expandafter*%
- \expandafter\csname scr@fnt@#2\expandafter\endcsname\expandafter{%
- \csname @#2font\endcsname%
- }%
- \ifx\relax#1\relax\else
- \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname{#1}%
- \fi
-}
-\newcommand*{\aliaskomafont}[2]{%
- \expandafter\newcommand\expandafter*\csname scr@fnt@instead@#1\endcsname{%
- #2%
- }%
-}
%%% From File: scrkmisc.dtx
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
@@ -2177,10 +2076,54 @@
}
%%% From File: scrkftn.dtx
\renewcommand*\footnoterule{%
- \kern-3\p@
+ \normalsize\ftn@rule@test@values
+ \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
\ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
- \hrule\@width.4\columnwidth
+ \hrule \@height\ftn@rule@height \@width\ftn@rule@width
\kern 2.6\p@}
+\newcommand*{\ftn@rule@test@values}{%
+ \ifdim\ftn@rule@height <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ less than 0%
+ }%
+ \else
+ \ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ greater than \the\dimexpr\skip\footins -2.6\p@\relax
+ }%
+ \fi
+ \fi
+ \ifdim\ftn@rule@width <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ less than 0pt%
+ }%
+ \else
+ \ifdim\ftn@rule@width >\columnwidth
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ greater than \string\columnwidth
+ }%
+ \fi
+ \fi
+}
+\newcommand*{\ftn@rule@width}{.4\columnwidth}
+\newcommand*{\ftn@rule@height}{.4\p@}
+\newcommand*{\setfootnoterule}[2][]{%
+ \ifstr{#1}{}{}{%
+ \renewcommand*{\ftn@rule@height}{#1}%
+ }%
+ \ifstr{#2}{}{}{%
+ \renewcommand*{\ftn@rule@width}{#2}%
+ }%
+ \ftn@rule@test@values
+}
\newcommand\deffootnote[4][]{%
\long\def\@makefntext##1{%
\setlength{\@tempdimc}{#3}%
@@ -2373,7 +2316,7 @@
\setlength{\itemindent}{\z@}%
\setlength{\topsep}{\z@}%
\setlength{\parsep}{\parskip}%
- \setlength{\partopsep}{\parskip}%
+ \setlength{\partopsep}{\z@}%
\let\makelabel\@gobble
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne