koma-script (6mar12)

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

1 files changed, 90 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index c1ad2569b1b..1492ea66856 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -7,7 +7,7 @@
 %% scrjura.dtx  (with options: `package')
 %% scrlogo.dtx  (with options: `logo')
 %% 
-%% Copyright (c) 2007-2011
+%% Copyright (c) 2007-2012
 %% Markus Kohm and any individual authors listed elsewhere in this file.
 %% 
 %% This file was generated from file(s) of the KOMA-Script bundle.
@@ -41,7 +41,7 @@
 %%% From File: scrjura.dtx
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{scrjura}
-                [2010/06/07 v0.5d KOMA-Script for jurists
+                [2011/09/30 v0.6 KOMA-Script for jurists
                 (package)%
                 ]
 \@ifpackageloaded{hyperref}{%
@@ -57,8 +57,45 @@
 \DeclareOption{contract}{%
   \g@addto@macro\document\contract%
 }
-\KOMA@ifkey{juratotoc}{@juratotoc}
+\newcounter{juratoclevel}\setcounter{juratoclevel}{\@M}
+\KOMA@key{juratotoc}[true]{%
+  \begingroup
+    \newif\if@setjuratoclevel\@setjuratocleveltrue
+    \let\juratoclevel@@FamilyUnknownKeyValue\FamilyUnknownKeyValue
+    \renewcommand*{\FamilyUnknownKeyValue}[4]{%
+      \setcounter{juratoclevel}{#1}%
+      \@setjuratoclevelfalse
+    }%
+    \KOMA@set@ifkey{juratoclevel}{@tempswa}{#1}%
+    \if@setjuratoclevel
+      \if@tempswa
+        \setcounter{juratoclevel}{2}%
+      \else
+        \setcounter{juratoclevel}{\@M}%
+      \fi
+    \fi
+  \endgroup
+}
+\newcommand*{\cpar@numberwidth}{2em}
+\newcommand*{\cpar@indent}{1.5em}
+\KOMA@key{juratocnumberwidth}{%
+  \begingroup\setlength{\@tempdima}{#1}\endgroup
+  \renewcommand*{\cpar@numberwidth}{#1}%
+}
+\KOMA@key{juratocindent}{%
+  \begingroup\setlength{\@tempdima}{#1}\endgroup
+  \renewcommand*{\cpar@indent}{#1}%
+}
 \KOMA@ifkey{juratitlepagebreak}{@juratitlepagebreak}
+\newif\ifparnumber
+\KOMA@key{parnumber}[true]{%
+  \ifstr{#1}{auto}{\AutoPar}{%
+    \ifstr{#1}{manual}{\ManualPar}{%
+      \def\FamilyElseValue{, `auto', `semi'}%
+      \KOMA@set@ifkey{parnumber}{parnumber}{#1}%
+    }%
+  }%
+}
 \newcommand*{\Paragraphmark}[1]{}
 \KOMA@key{paragraphmark}{%
   \begingroup
@@ -74,17 +111,26 @@
     \let\Paragraphmark\@gobble
   \or
     \endgroup
-    \renewcommand*{\Paragraphmark}[1]{\markright{##1}}%
+    \renewcommand*{\Paragraphmark}[1]{%
+      \markright{\csname MakeMarkcase\endcsname{##1}}}%
   \or
     \endgroup
-    \renewcommand*{\Paragraphmark}[1]{\markboth{##1}{##1}}%
+    \renewcommand*{\Paragraphmark}[1]{%
+      \markboth{\csname MakeMarkcase\endcsname{##1}}%
+               {\csname MakeMarkcase\endcsname{##1}}}%
   \or
     \endgroup
     \renewcommand*{\Paragraphmark}[1]{%
-      \ifx\@mkboth\@gobbletwo\else\markright{##1}\fi}%
+      \ifx
+        \@mkboth\@gobbletwo
+      \else
+        \markright{\csname MakeMarkcase\endcsname{##1}}%
+      \fi}%
   \or
     \endgroup
-    \renewcommand*{\Paragraphmark}[1]{\@mkboth{##1}{##1}}%
+    \renewcommand*{\Paragraphmark}[1]{%
+      \@mkboth{\csname MakeMarkcase\endcsname{##1}}%
+              {\csname MakeMarkcase\endcsname{##1}}}%
   \else
     \endgroup
   \fi
@@ -107,7 +153,8 @@
       {long}{11},%
       {short}{22},%
       {numeric}{33},%
-      {paragraphonly}{44},{ParagraphOnly}{44},{OnlyParagraph}{44}%
+      {paragraphonly}{44},{onlyparagraph}{44},%
+      {ParagraphOnly}{44},{OnlyParagraph}{44}%
     }{#1}%
     \@tempcnta=\@tempa\relax
     \@tempcntb=\z@
@@ -161,6 +208,7 @@
     \let\Par\contract@everypar
     \let\Sentence\contract@sentence
     \renewcommand*{\jura@env@type}{contract}%
+    \aliaskomafont{Paragraph}{contract.Paragraph}%
   \else
     \PackageError{contract}{nested `contract' detected}{%
       You may not use a `contract' environment inside\MessageBreak
@@ -185,8 +233,20 @@
   \ifx\contract@entry\relax\def\contract@entry{\contract@title}\fi
   \ifx\contract@head\relax\def\contract@head{\contract@title}\fi
 }
-\define@key{contract}{entry}{\def\contract@entry{#1}}
-\define@key{contract}{noentry}[]{\let\contract@entry\relax}
+\define@key{contract}{entry}{%
+  \PackageWarning{scrjura}{deprecated option `entry'.\MessageBreak
+    You should use option `tocentry' instead of\MessageBreak
+    option `entry'%
+  }%
+  \def\contract@entry{#1}}
+\define@key{contract}{tocentry}{\def\contract@entry{#1}}
+\define@key{contract}{noentry}[]{%
+  \PackageWarning{scrjura}{deprecated option `noentry'.\MessageBreak
+    You should use option `notocentry' instead of\MessageBreak
+    option `noentry'%
+  }%
+  \let\contract@entry\relax}
+\define@key{contract}{notocentry}[]{\let\contract@entry\relax}
 \define@key{contract}{head}{\def\contract@head{#1}}
 \define@key{contract}{nohead}[]{\let\contract@head\relax}
 \define@key{contract}{number}{\def\contract@number{#1}}
@@ -196,7 +256,9 @@
 \define@key{contract}{postskip}{\def\contract@postskip{#1}}
 \newif\ifcontract@dummy
 \define@key{contract}{dummy}[true]{\csname contract@dummy#1\endcsname}
-\newcommand*{\contract@paragraph@font}{\sffamily\bfseries\large\@hangfrom}
+\newkomafont{contract.Paragraph}{\sffamily\bfseries\large}
+\newcommand*{\contract@paragraph@font}{\usekomafont{contract.Paragraph}%
+  \@hangfrom}
 \newcounter{@AbsParagraph}
 \newcommand*{\theH@AbsParagraph}{P-\arabic{@AbsParagraph}}
 \newcommand*{\theHParagraph}{\theH@AbsParagraph}
@@ -364,16 +426,17 @@
   }%
 }
 \newcommand*{\l@cpar}[2]{%
-  \if@juratotoc
-    \@dottedtocline{\value{juratoclevel}}{1.5em}{2em}{#1}{#2}%
+  \ifnum\value{juratoclevel}>\value{tocdepth}\else
+    \scr@ifundefinedorrelax{bprot@dottedtocline}{%
+      \@dottedtocline
+    }{%
+      \bprot@dottedtocline
+    }{\value{juratoclevel}}{\cpar@indent}{\cpar@numberwidth}{#1}{#2}%
   \fi
 }
-\newcounter{juratoclevel}
-\setcounter{juratoclevel}{2}%
 \DeclareRobustCommand*{\jura@separator}[1]{#1}
 \DeclareRobustCommand*{\jura@usetype}[1]{\jura@@usetype{#1}}
 \newcommand*{\jura@@usetype}[1]{}
-\newif\ifparnumber
 \newcounter{par}
 \renewcommand*{\thepar}{\arabic{par}}
 \newcommand*{\theHpar}{\theH@AbsParagraph-\Roman{par}}
@@ -628,6 +691,14 @@
   \providecaptionname{ngerman}\parshortname{Abs.}%
   \providecaptionname{ngerman}\sentencename{Satz}%
   \providecaptionname{ngerman}\sentenceshortname{S.}%
+  \providecaptionname{austrian}\parname{Absatz}%
+  \providecaptionname{austrian}\parshortname{Abs.}%
+  \providecaptionname{austrian}\sentencename{Satz}%
+  \providecaptionname{austrian}\sentenceshortname{S.}%
+  \providecaptionname{naustrian}\parname{Absatz}%
+  \providecaptionname{naustrian}\parshortname{Abs.}%
+  \providecaptionname{naustrian}\sentencename{Satz}%
+  \providecaptionname{naustrian}\sentenceshortname{S.}%
 }
 \providecommand*{\parname}{\scrjura@lang@error{\parname}}
 \providecommand*{\parshortname}{\scrjura@lang@error{\parshortname}}
@@ -637,8 +708,8 @@
   \PackageErrorNoLine{scrjura}{%
     current language not supported%
   }{%
-    Currently scrjura only supports languages ``german'' and
-    ``ngerman''.\MessageBreak
+    Currently scrjura only supports languages `german',
+    `ngerman', `austrian', and `naustrian'.\MessageBreak
     It seems, that you are using another language (maybe
     \languagename).\MessageBreak
     Because of this you have to define \string#1\space by
@@ -656,7 +727,7 @@
 \newcommand*{\getmaxpar}[3]{%
   \begingroup
     \expandafter\let\csname #2@Paragraphformat\endcsname\@firstofone
-    \edef\@tempa{#3}%
+    \protected@edef\@tempa{#3}%
     \@onelevel@sanitize\@tempa
     \expandafter\ifx \csname max@#2@\@tempa\endcsname\relax
       \edef\@tempa{\endgroup\edef\noexpand#1{\expandafter\the\value{par}}}%