From ef26cbd4838100b72c131ef3396e1ebb05abea80 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 13 Oct 2007 18:25:29 +0000 Subject: koma-script update (12oct07) git-svn-id: svn://tug.org/texlive/trunk@5175 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 52 ++++++++++++---------- 1 file changed, 29 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls') diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 6049ff40a0d..5490047073d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -91,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2007/09/28 v2.97c KOMA-Script}% + \@CheckKOMAScriptVersion{2007/10/12 v2.97d KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -140,8 +140,9 @@ \@namedef{scr@v@2.97}{3} \@namedef{scr@v@2.97a}{3} \@namedef{scr@v@2.97b}{3} -\@namedef{scr@v@2.97c}{3} -\@namedef{scr@v@last}{3} +\@namedef{scr@v@2.97c}{4} +\@namedef{scr@v@2.97d}{5} +\@namedef{scr@v@last}{5} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -151,7 +152,7 @@ \setlength{\overfullrule}{\z@}% \fi } -\KOMA@DeclareObsoleteOption[\PackageInfo]{final}{draft=false} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{final}{draft=false} %%% From File: scrklco.dtx \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% @@ -173,8 +174,8 @@ \KOMA@set@ifkey{numericaldate}{@orgdate}{#1}% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi } -\KOMA@DeclareObsoleteOption[\PackageInfo]{scrdate}{numericaldate=true} -\KOMA@DeclareObsoleteOption[\PackageInfo]{orgdate}{numericaldate=false} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{scrdate}{numericaldate=true} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{orgdate}{numericaldate=false} %%% From File: scrkfont.dtx \newcommand*\@ptsize{% 12% @@ -186,7 +187,7 @@ \def\@pt@@scan #1pt#2\@pt@@scan{% \ifstr{#2}{pt}{% \ifnumber{#1}{% - \KOMA@UseObsoleteOption{\PackageInfo}{#1#2}{fontsize=#1#2}% + \KOMA@UseObsoleteOption{\PackageInfoNoLine}{#1#2}{fontsize=#1#2}% }{\@headlines}% }{\@headlines}% } @@ -366,14 +367,14 @@ \endgroup \fi } -\KOMA@DeclareObsoleteOption[\PackageInfo]{parskip-}{parskip=full-} -\KOMA@DeclareObsoleteOption[\PackageInfo]{parskip+}{parskip=full+} -\KOMA@DeclareObsoleteOption[\PackageInfo]{parskip*}{parskip=full*} -\KOMA@DeclareObsoleteOption[\PackageInfo]{halfparskip}{parskip=half} -\KOMA@DeclareObsoleteOption[\PackageInfo]{halfparskip-}{parskip=half-} -\KOMA@DeclareObsoleteOption[\PackageInfo]{halfparskip+}{parskip=half+} -\KOMA@DeclareObsoleteOption[\PackageInfo]{halfparskip*}{parskip=half*} -\KOMA@DeclareObsoleteOption[\PackageInfo]{parindent}{parskip=false} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{parskip-}{parskip=full-} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{parskip+}{parskip=full+} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{parskip*}{parskip=full*} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{halfparskip}{parskip=half} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{halfparskip-}{parskip=half-} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{halfparskip+}{parskip=half+} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{halfparskip*}{parskip=half*} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{parindent}{parskip=false} %%% From File: scrkpage.dtx \newif\if@hsl \KOMA@key{headsepline}[true]{% @@ -382,7 +383,8 @@ \KOMAoptions{headinclude=#1}% }{}% } -\KOMA@DeclareObsoleteOption[\PackageInfo]{headnosepline}{headsepline=false} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{headnosepline}{% + headsepline=false} \newif\if@fsl \KOMA@key{footsepline}[true]{% \KOMA@set@ifkey{footsepline}{@fsl}{#1}% @@ -390,7 +392,8 @@ \KOMAoptions{footinclude=#1}% }{}% } -\KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{footnosepline}{% + footsepline=false} \@twosidefalse \KOMA@key{cleardoublepage}{% \begingroup% @@ -418,13 +421,13 @@ {\thispagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -\KOMA@DeclareObsoleteOption[\PackageInfo]{cleardoubleempty}{% +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{cleardoubleempty}{% cleardoublepage=empty% } -\KOMA@DeclareObsoleteOption[\PackageInfo]{cleardoubleplain}{% +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{cleardoubleplain}{% cleardoublepage=plain% } -\KOMA@DeclareObsoleteOption[\PackageInfo]{cleardoublestandard}{% +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{cleardoublestandard}{% cleardoublepage=current% } %%% From File: scrkfloa.dtx @@ -2311,7 +2314,11 @@ \newkomafont{toname}{} \newkomafont{toaddress}{} \newkomafont{refname}{\sffamily\scriptsize} -\newkomafont{refvalue}{\sffamily\scriptsize} +\ifnum\scr@compatibility=\@nameuse{scr@v@2.97}\relax + \newkomafont{refvalue}{\sffamily\scriptsize} +\else + \newkomafont{refvalue}{} +\fi \newkomafont{title}{\normalcolor\sffamily\bfseries} \newkomafont{subject}{\normalcolor\bfseries} \@newplength{foldmarkhpos} @@ -2684,7 +2691,7 @@ \ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi \enskip\hfill \parbox[t]{\@tempdima}{\noindent\raggedright% - \strut\box0\\\strut\usekomafont{refvalue}\usekomavar{date}}% + \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{date}}% \else \typeout{Reference line: only place and date}% \enskip\hfill @@ -2726,7 +2733,6 @@ \fi {% \usekomafont{subject}% - \show\raggedsubject \raggedsubject{\if@subj \subject@format{\strut\ignorespaces \usekomavar*{subject}}\fi}% \subject@format{\strut\ignorespaces\usekomavar{subject}}\par -- cgit v1.2.3