summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrjura.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty65
1 files changed, 37 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index ed9a3d30960..2218f038bcf 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -39,10 +39,10 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrjura.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% From File: $Id: scrjura.dtx 2847 2017-12-19 09:38:00Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(for jurists)
]
@@ -382,32 +382,38 @@
\@onlypreamble\DeclareNewJuraEnvironment
\DefineFamily{KOMAarg}
\DefineFamilyMember{KOMAarg}
-\DefineFamilyKey{KOMAarg}{Clause}{%
- \expandafter\gdef\csname \scrjura@env@type @Clause\endcsname{#1}%
-}
-\DefineFamilyKey{KOMAarg}{SubClause}{%
- \expandafter\gdef\csname \scrjura@env@type @SubClause\endcsname{#1}%
-}
-\DefineFamilyKey{KOMAarg}{Sentence}{%
- \expandafter\gdef\csname \scrjura@env@type @Sentence\endcsname{#1}%
-}
-\DefineFamilyKey{KOMAarg}{ClauseNumberFormat}{%
- \expandafter\gdef\csname \scrjura@env@type @Clauseformat \endcsname
- ##1{#1{##1}}
- \expandafter\xdef\csname \scrjura@env@type @Clauseformat\endcsname{%
- \noexpand\protect\expandafter\noexpand
- \csname \scrjura@env@type @Clauseformat \endcsname
- }%
-}
\newcommand{\@defjuraenvironment}{}
\long\def\@defjuraenvironment#1[#2]#3#4{%
+ \let\reserved@defjuraenvironment\relax
\newcounter{#1Clause}%
\newcounter{#1AbsoluteClause}%
\newcounter{#1SubClause}%
- \begingroup
- \edef\scrjura@env@type{#1}%
- \FamilyExecuteOptions[.scrjura.sty]{KOMAarg}{#2}%
- \endgroup
+ \FamilyCSKey[.scrjura.sty]{KOMAarg}{Clause}{#1@Clause}%
+ \FamilyCSKey[.scrjura.sty]{KOMAarg}{SubClause}{#1@SubClause}%
+ \FamilyCSKey[.scrjura.sty]{KOMAarg}{Sentence}{#1@Sentence}%
+ \DefineFamilyKey[.scrjura.sty]{KOMAarg}{ClauseNumberFormat}{%
+ \expandafter\def\csname #1@Clauseformat \endcsname####1{##1{####1}}%
+ \expandafter\edef\csname #1@Clauseformat\endcsname{%
+ \noexpand\protect\expandafter\noexpand\csname #1@Clauseformat \endcsname
+ }%
+ \FamilyKeyStateProcessed
+ }
+ \DefineFamilyKey[.scrjura.sty]{KOMAarg}{ClauseFont}{%
+ \IfExistskomafont{#1.Clause}{%
+ \IfIsAliaskomafont{#1.Clause}{%
+ \expandafter\let\csname scr@fnt@instead@#1.Clause\endcsname\relax
+ \newkomafont{#1.Clause}{##1}%
+ }{\setkomafont{#1.Clause}{##1}}%
+ }{%
+ \newkomafont{#1.Clause}{##1}%
+ }%
+ }
+ \FamilyExecuteOptions[.scrjura.sty]{KOMAarg}{#2}%
+ \RelaxFamilyKey[.scrjura.sty]{KOMAarg}{ClauseFont}%
+ \RelaxFamilyKey[.scrjura.sty]{KOMAarg}{ClauseNumberFormat}%
+ \RelaxFamilyKey[.scrjura.sty]{KOMAarg}{Sentence}%
+ \RelaxFamilyKey[.scrjura.sty]{KOMAarg}{SubClause}%
+ \RelaxFamilyKey[.scrjura.sty]{KOMAarg}{Clause}%
\@ifundefined{#1@Clauseformat}{%
\expandafter\DeclareRobustCommand\expandafter*%
\csname #1@Clauseformat\endcsname[1]{\Clauseformat{##1}}%
@@ -447,11 +453,11 @@
\csname \scrjura@env@type @everypar\endcsname
\contract@everypar
}{}%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \aliaskomafont{Clause}{contract.Clause}%
+ \IfExistskomafont{#1.Clause}{%
+ \IfIsAliaskomafont{#1.Clause}{%
+ \aliaskomafont{Clause}{\csname scr@fnt@instead@#1.Clause\endcsname}%
}{%
- \aliaskomafont{Clause}{\csname scr@fnt@instead@#1\endcsname}%
+ \aliaskomafont{Clause}{#1.Clause}%
}%
}{%
\aliaskomafont{Clause}{contract.Clause}%
@@ -497,7 +503,7 @@
\newif\ifcontract@dummy
\define@key{contract}{dummy}[true]{\csname contract@dummy#1\endcsname}
\newkomafont{contract.Clause}{\sffamily\bfseries\large}
-\newcommand*{\contract@paragraph@font}{\usekomafont{contract.Clause}%
+\newcommand*{\contract@paragraph@font}{\usekomafont{Clause}%
\@hangfrom}
\newcounter{@AbsClause}
\newcommand*{\theH@AbsClause}{P-\arabic{@AbsClause}}
@@ -728,6 +734,7 @@
\renewcommand*\p@par{{\scrjura@usetype{\scrjura@env@type}\theSubClause\scrjura@separator{\nobreakspace}}}
\@addtoreset{par}{Clause}
\@addtoreset{par}{SubClause}
+\newcommand*{\withoutparnumber}{}
\newcommand*{\contract@everypar}{%
\ifparnumber
\ifx\scrjura@special@par\relax
@@ -767,12 +774,14 @@
\else
\def\reserved@a{\relax}%
\ifx\@tempa\reserved@a
+ \withoutparnumber
\else
{\usekomafont{parnumber}{\parformat\parformatseparation}}%
\fi
\fi
\endgroup
\else
+ \begingroup\withoutparnumber\endgroup
\setcounter{sentence}{-1}\refstepcounter{sentence}%
\fi
}