koma-script update (12oct07)

git-svn-id: svn://tug.org/texlive/trunk@5175 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 113 insertions, 95 deletions

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index c80f5fb7b79..1759eea91fc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.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}{%
   scrartcl%
@@ -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}
 \DeclareOption{leqno}{\input{leqno.clo}}
 \DeclareOption{fleqn}{\input{fleqn.clo}}
 %%% From File: scrklang.dtx
@@ -166,7 +167,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}%
 }
@@ -343,14 +344,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: scrktitl.dtx
 \newif\if@titlepage
 \@titlepagefalse
@@ -481,7 +482,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}%
@@ -489,7 +491,8 @@
     \KOMAoptions{footinclude=#1}%
   }{}%
 }
-\KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{footnosepline}{%
+  footsepline=false}
 \@twosidefalse
 \KOMA@key{cleardoublepage}{%
   \begingroup%
@@ -517,13 +520,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
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 3409d50a09c..24d2665c433 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.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}{%
   scrbook%
@@ -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}
 \DeclareOption{leqno}{\input{leqno.clo}}
 \DeclareOption{fleqn}{\input{fleqn.clo}}
 %%% From File: scrklang.dtx
@@ -166,7 +167,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}%
 }
@@ -343,14 +344,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: scrktitl.dtx
 \newif\if@titlepage
 \@titlepagetrue
@@ -518,7 +519,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}%
@@ -526,7 +528,8 @@
     \KOMAoptions{footinclude=#1}%
   }{}%
 }
-\KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{footnosepline}{%
+  footsepline=false}
 \@twosidetrue
 \KOMA@key{cleardoublepage}{%
   \begingroup%
@@ -554,13 +557,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
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 84b9cb5280e..449004e3752 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -62,7 +62,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2007/09/28 v2.97c KOMA-Script}%
+  \@CheckKOMAScriptVersion{2007/10/12 v2.97d KOMA-Script}%
 \endgroup
 %%% From File: scrkbase.dtx
 \ProvidesPackage{scrkbase}[%
@@ -429,6 +429,9 @@
     \smash{#1}%
   \endgroup
 }
+\providecommand*{\PackageInfoNoLine}[2]{%
+  \PackageInfo{#1}{#2\@gobble}%
+}
 \newcommand*{\KOMAExecuteOptions}[2][KOMA]{%
   \def\reserved@a##1\@nil{%
     \@for\KOMA@key@atlist:=#2\do{%
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
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index d5d01f1b1aa..d971141d9f4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.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}{%
   scrreprt%
@@ -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}
 \DeclareOption{leqno}{\input{leqno.clo}}
 \DeclareOption{fleqn}{\input{fleqn.clo}}
 %%% From File: scrklang.dtx
@@ -166,7 +167,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}%
 }
@@ -343,14 +344,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: scrktitl.dtx
 \newif\if@titlepage
 \@titlepagetrue
@@ -522,7 +523,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}%
@@ -530,7 +532,8 @@
     \KOMAoptions{footinclude=#1}%
   }{}%
 }
-\KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{footnosepline}{%
+  footsepline=false}
 \@twosidefalse
 \KOMA@key{cleardoublepage}{%
   \begingroup%
@@ -558,13 +561,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
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 99acf116586..3a3018a8ab0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -62,7 +62,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2007/09/28 v2.97c KOMA-Script}%
+  \@CheckKOMAScriptVersion{2007/10/12 v2.97d KOMA-Script}%
 \endgroup
 %%% From File: scrktare.dtx
 \ProvidesPackage{typearea}[%
@@ -218,16 +218,16 @@
 }
 \newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl}
 \KOMA@ifkey{headinclude}{@hincl}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{headexclude}{%
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{headexclude}{%
   headinclude=false%
 }
 \newif\if@fincl\@ifundefined{if@fsl}{}{\let\if@fincl\if@fsl}
 \KOMA@ifkey{footinclude}{@fincl}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{footexclude}{%
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{footexclude}{%
   footinclude=false%
 }
 \KOMA@ifkey{mpinclude}{@mincl}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{mpexclude}{%
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{mpexclude}{%
   mpinclude=false%
 }
 \KOMA@key{BCOR}{%
@@ -250,21 +250,21 @@
   \fi
 }
 \AtEndOfPackage{\KOMA@key{DIV}{\typearea[current]{#1}}}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{DIVcalc}{DIV=calc}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{DIVclassic}{DIV=classic}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{DIVcalc}{DIV=calc}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{DIVclassic}{DIV=classic}
 \KOMA@key{twoside}[true]{%
   \if@atdocument\if@twoside\cleardoublepage\else\clearpage\fi\fi
   \KOMA@set@ifkey{twoside}{@twoside}{#1}%
   \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi%
   \csname recalctypearea\endcsname
 }
-\KOMA@DeclareObsoleteOption[\PackageInfo]{oneside}{twoside=false}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false}
 \KOMA@key{twocolumn}[true]{%
   \if@atdocument\clearpage\fi
   \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
   \csname recalctypearea\endcsname
 }
-\KOMA@DeclareObsoleteOption[\PackageInfo]{onecolumn}{twocolumn=false}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{onecolumn}{twocolumn=false}
 \KOMA@key{pagesize}[auto]{%
   \begingroup
     \KOMA@set@ncmdkey{pagesize}{@tempa}{%
@@ -345,17 +345,17 @@
 \KOMA@DeclareObsoleteOption[\PackageWarning]{dvips}{%
   pagesize=dvips%
 }
-\KOMA@DeclareObsoleteOption[\PackageInfo]{pdftex}{%
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{pdftex}{%
   pagesize=pdftex%
 }
-\KOMA@DeclareObsoleteOption[\PackageInfo]{a4paper}{paper=a4}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{a5paper}{paper=a5}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{b5paper}{paper=b5}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{letterpaper}{paper=letter}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{legalpaper}{paper=legal}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{executivepaper}{paper=executive}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{landscape}{paper=landscape}
-\KOMA@DeclareObsoleteOption[\PackageInfo]{portrait}{paper=portrait}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{a4paper}{paper=a4}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{a5paper}{paper=a5}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{b5paper}{paper=b5}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{letterpaper}{paper=letter}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{legalpaper}{paper=legal}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{executivepaper}{paper=executive}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{landscape}{paper=landscape}
+\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{portrait}{paper=portrait}
 \KOMA@key{paper}{%
   \ifstr{#1}{landscape}{%
     \if@landscape\else