diff options
author | Karl Berry <karl@freefriends.org> | 2015-01-19 23:43:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-01-19 23:43:25 +0000 |
commit | 83b4f07dfc662cf6c2632a34e88a1aad0009e35a (patch) | |
tree | d6c61dbd9ba41e2c7353bdcf23acb151b52601ff /Master/texmf-dist/tex/latex/koma-script/scrjura.sty | |
parent | 3fef13606c698d4e277aaad8662b082f8f5c6fab (diff) |
koma-script (19jan15)
git-svn-id: svn://tug.org/texlive/trunk@36095 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrjura.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrjura.sty | 397 |
1 files changed, 279 insertions, 118 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index 0247fc29322..4df8e05580c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty @@ -38,10 +38,10 @@ %% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e %% standard classes created by The LaTeX3 Project 1994-1996. %% -%%% From File: $Id: scrjura.dtx 1716 2014-03-01 15:38:49Z kohm $ +%%% From File: $Id: scrjura.dtx 1849 2014-11-25 07:56:28Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrjura} - [2014/01/28 v0.7a KOMA-Script for jurists + [2014/11/22 v0.9 KOMA-Script for jurists (package)% ] \@ifpackageloaded{hyperref}{% @@ -96,7 +96,7 @@ }% }% } -\newcommand*{\Paragraphmark}[1]{} +\newcommand*{\Clausemark}[1]{} \KOMA@key{paragraphmark}{% \begingroup \KOMA@set@ncmdkey{paragraphmark}{@tempa}{% @@ -109,19 +109,19 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase\number\@tempa \endgroup - \let\Paragraphmark\@gobble + \let\Clausemark\@gobble \or \endgroup - \renewcommand*{\Paragraphmark}[1]{% + \renewcommand*{\Clausemark}[1]{% \markright{\csname MakeMarkcase\endcsname{##1}}}% \or \endgroup - \renewcommand*{\Paragraphmark}[1]{% + \renewcommand*{\Clausemark}[1]{% \markboth{\csname MakeMarkcase\endcsname{##1}}% {\csname MakeMarkcase\endcsname{##1}}}% \or \endgroup - \renewcommand*{\Paragraphmark}[1]{% + \renewcommand*{\Clausemark}[1]{% \ifx \@mkboth\@gobbletwo \else @@ -129,7 +129,7 @@ \fi}% \or \endgroup - \renewcommand*{\Paragraphmark}[1]{% + \renewcommand*{\Clausemark}[1]{% \@mkboth{\csname MakeMarkcase\endcsname{##1}}% {\csname MakeMarkcase\endcsname{##1}}}% \else @@ -201,14 +201,61 @@ \KOMA@DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong} \KOMA@DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong} \KOMAProcessOptions\relax -\newcommand*{\jura@env@type}{} +\providecommand*{\DeprecatedParagraph}{% + \PackageError{scrjura}{modification of old document needed}{% + It seem that this document was made for scrjura up to version + 0.7a.\MessageBreak + Since scrjura version 0.9 \string\Paragraph, \string\SubParagraph, and all + depending\MessageBreak + commands, options, and counters have been renamed.\MessageBreak + You should replace the terms `Paragraph' and `paragraph` by `Clause` + and\MessageBreak + `clause` if they are part of the name of a scrjura feature, otherwise + this\MessageBreak + document may produce severall additional error messages and maybe the + wrong\MessageBreak + result. Sorry for the inconvenience.% + }% + \ParagraphCompatibilityHacks +} +\newcommand*{\ParagraphCompatibilityHacks}{% + \PackageWarning{scrjura}{compatibility hacks for `\string\Paragraph' + executed.\MessageBreak + There is no support for documents using these hacks!\MessageBreak + There is no warranty for real compatibility!\MessageBreak + Even if the LaTeX run of the document doesn't report\MessageBreak + any error, the result may be completely wrong.\MessageBreak + Therefore it is recommended to solve the problem,\MessageBreak + instead of trying to work around using the\MessageBreak + compatibility hacks% + }% + \gdef\Paragraph{\Clause}% + \gdef\SubParagraph{\SubClause}% + \gdef\c@Paragraph{\c@Clause}% + \gdef\cl@Paragraph{\cl@Clause}% + \gdef\c@SubParagraph{\c@SubClause}% + \gdef\cl@SubParagraph{\cl@SubClause}% + \gdef\theParagraph{\theClause}% + \gdef\theSubParagraph{\theSubClause}% + \gdef\refParagraph{\refClause}% + \gdef\refParagraphN{\refClauseN}% + \aliaskomafont{Paragraph}{Clause}% + \scr@ifundefinedorrelax{Paragraphmark}{}{% + \global\let\Clausemark\Paragraphmark + }% +} +\providecommand*{\Paragraph}{\DeprecatedParagraph\Paragraph} +\providecommand*{\SubParagraph}{\DeprecatedParagraph\SubParagraph} +\providecommand*{\refParagraph}{\DeprecatedParagraph\refParagraph} +\providecommand*{\refParagraphN}{\DeprecatedParagraph\refParagraphN} +\newcommand*{\scrjura@env@type}{} \newcommand*{\ellipsispar}[1][1]{% \begingroup \KOMAoptions{parnumber=manual}\parellipsis\par \addtocounter{par}{#1}% \protected@write\@auxout{}{% - \string\newmaxpar{\jura@env@type}% - {\thecontractAbsoluteParagraph}% + \string\newmaxpar{\scrjura@env@type}% + {\csname the\scrjura@env@type AbsoluteClause\endcsname}% {\thepar}% }% \endgroup @@ -219,38 +266,141 @@ \scr@ifundefinedorrelax{textellipsis}{\dots}{\textellipsis}% } \newcommand*{\contract}{% - \ifx\jura@env@type\@empty - \let\@doendpe\contract@doendpe - \let\Paragraph\contract@paragraph - \let\c@Paragraph\c@contractParagraph - \edef\cl@Paragraph{\cl@Paragraph\cl@contractParagraph}% - \let\SubParagraph\contract@subparagraph - \let\c@SubParagraph\c@contractSubParagraph - \edef\cl@SubParagraph{\cl@SubParagraph\cl@contractSubParagraph}% - \let\Par\contract@everypar + \ifx\scrjura@env@type\@empty + \let\@doendpe\scrjura@doendpe + \let\Clause\contract@paragraph + \let\c@Clause\c@contractClause + \edef\cl@Clause{\cl@Clause\cl@contractClause}% + \let\SubClause\contract@subparagraph + \let\c@SubClause\c@contractSubClause + \edef\cl@SubClause{\cl@SubClause\cl@contractSubClause}% \let\Sentence\contract@sentence - \renewcommand*{\jura@env@type}{contract}% - \aliaskomafont{Paragraph}{contract.Paragraph}% + \renewcommand*{\scrjura@env@type}{contract}% + \aliaskomafont{Clause}{contract.Clause}% \else - \PackageError{contract}{nested `contract' detected}{% + \PackageError{scrjura}{nested `contract` detected}{% You may not use a `contract' environment inside\MessageBreak - a `\jura@env@type' environment or after loading\MessageBreak - package `scrjura' with option `\jura@env@type'!}% + a `\scrjura@env@type' environment or after loading\MessageBreak + package `scrjura' with option `\scrjura@env@type'!}% \fi } -\let\if@jura@skiphyperref\iftrue -\let\cl@Paragraph\@empty -\let\cl@SubParagraph\@empty -\newcounter{contractParagraph} -\renewcommand*{\thecontractParagraph}{% - {\contract@Paragraphformat{\arabic{contractParagraph}}}} -\DeclareRobustCommand*{\contract@Paragraphformat}[1]{\Paragraphformat{#1}} -\newcommand*{\Paragraphformat}[1]{\S~#1} -\newcounter{contractSubParagraph} -\@addtoreset{SubParagraph}{Paragraph} -\renewcommand*{\thecontractSubParagraph}{% - {\theParagraph\alph{contractSubParagraph}}} -\newcounter{contractAbsoluteParagraph} +\let\if@scrjura@skiphyperref\iftrue +\let\cl@Clause\@empty +\let\cl@SubClause\@empty +\newcounter{contractClause} +\renewcommand*{\thecontractClause}{% + {\contract@Clauseformat{\arabic{contractClause}}}} +\DeclareRobustCommand*{\contract@Clauseformat}[1]{\Clauseformat{#1}} +\newcommand*{\Clauseformat}[1]{\S~#1} +\newcounter{contractSubClause} +\@addtoreset{SubClause}{Clause} +\renewcommand*{\thecontractSubClause}{% + {\theClause\alph{contractSubClause}}} +\newcounter{contractAbsoluteClause} +\newcommand*{\DeclareNewJuraEnvironment}[1]{% + \@ifundefined{#1}{\expandafter\let\csname #1\expandafter\endcsname + \csname end#1\endcsname}{}% + \@ifundefined{#1}{\let\reserved@defjuraenvironment\@defjuraenvironment}{% + \PackageError{scrjura}{ignorring declaration of `#1'}{% + You've tried to declare jura environment `#1', but + environment\MessageBreak + `#1' or command + \expandafter\string\csname #1\endcsname\space or + \expandafter\string\csname end#1\endcsname\MessageBreak + already exists.\MessageBreak + Declaration will be ignored}% + \long\def\reserved@defjuraenvironment##1[##2]##3##4{}% + }% + \@ifnextchar [%] + {\reserved@defjuraenvironment{#1}}{\reserved@defjuraenvironment{#1}[]}% +} +\@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{% + \newcounter{#1Clause}% + \newcounter{#1AbsoluteClause}% + \newcounter{#1SubClause}% + \begingroup + \edef\scrjura@env@type{#1}% + \FamilyExecuteOptions[.scrjura.sty]{KOMAarg}{#2}% + \endgroup + \@ifundefined{#1@Clauseformat}{% + \expandafter\DeclareRobustCommand\expandafter*% + \csname #1@Clauseformat\endcsname[1]{\Clauseformat{##1}}% + }{}% + \newenvironment{#1}{% + \par + \ifx\scrjura@env@type\@empty + \edef\scrjura@env@type{#1}% + \let\@doendpe\scrjura@doendpe + \expandafter\let\expandafter\c@Clause\csname c@#1Clause\endcsname + \edef\cl@Clause{\cl@Clause\csname cl@#1Clause\endcsname}% + \expandafter\let\expandafter\c@SubClause + \csname c@#1SubClause\endcsname + \edef\cl@SubClause{\cl@SubClause + \csname cl@#1SubClause\endcsname}% + \@ifundefined{#1@Clause}{% + \let\Clause\contract@paragraph + }{% + \expandafter\let\expandafter\Clause + \csname #1@Clause\endcsname + }% + \@ifundefined{#1@SubClause}{% + \let\SubClause\contract@subparagraph + }{% + \expandafter\let\expandafter\SubClause + \csname #1@SubClause\endcsname + }% + \@ifundefined{#1@Sentence}{% + \let\Sentence\contract@sentence + }{% + \expandafter\let\expandafter\Sentence\csname #1@Sentence\endcsname + }% + \@ifundefined{\scrjura@env@type @everypar}{% + \expandafter\let + \csname \scrjura@env@type @everypar\endcsname + \contract@everypar + }{}% + \@ifundefined{scr@fnt@#1}{% + \@ifundefined{scr@fnt@instead@#1}{% + \aliaskomafont{Clause}{contract.Clause}% + }{% + \aliaskomafont{Clause}{\csname scr@fnt@instead@#1\endcsname}% + }% + }{% + \aliaskomafont{Clause}{contract.Clause}% + }% + #3% + \else + \PackageError{scrjura}{nested scrjura environments detected}{% + You must not use a `#1' environment inside\MessageBreak + a `\scrjura@env@type' environment or after loading\MessageBreak + package `scrjura' with option `\scrjura@env@type'!}% + \fi + }{% + #4% + \par + }% +} \define@key{contract}{title}{% \def\contract@title{#1}% \ifx\contract@entry\relax\def\contract@entry{\contract@title}\fi @@ -279,15 +429,15 @@ \define@key{contract}{postskip}{\def\contract@postskip{#1}} \newif\ifcontract@dummy \define@key{contract}{dummy}[true]{\csname contract@dummy#1\endcsname} -\newkomafont{contract.Paragraph}{\sffamily\bfseries\large} -\newcommand*{\contract@paragraph@font}{\usekomafont{contract.Paragraph}% +\newkomafont{contract.Clause}{\sffamily\bfseries\large} +\newcommand*{\contract@paragraph@font}{\usekomafont{contract.Clause}% \@hangfrom} -\newcounter{@AbsParagraph} -\newcommand*{\theH@AbsParagraph}{P-\arabic{@AbsParagraph}} -\newcommand*{\theHParagraph}{\theH@AbsParagraph} -\newcommand*{\theHSubParagraph}{\theH@AbsParagraph} +\newcounter{@AbsClause} +\newcommand*{\theH@AbsClause}{P-\arabic{@AbsClause}} +\newcommand*{\theHClause}{\theH@AbsClause} +\newcommand*{\theHSubClause}{\theH@AbsClause} \newcommand*{\contract@paragraph}[1]{% - \stepcounter{contractAbsoluteParagraph}% + \stepcounter{\scrjura@env@type AbsoluteClause}% \ManualPar\parnumbertrue \let\contract@title\relax \let\contract@entry\relax @@ -301,50 +451,52 @@ \addvspace{\contract@preskip}% \fi \ifx\contract@number\relax - \let\p@Paragraph\@empty - \let\theParagraph\thecontractParagraph - \refstepcounter{Paragraph}% + \let\p@Clause\@empty + \let\theClause\thecontractClause + \refstepcounter{Clause}% \else \begingroup \let\@elt\@stpelt - \cl@Paragraph + \cl@Clause \endgroup - \protected@edef\theParagraph{\contract@Paragraphformat{\contract@number}}% - \protected@edef\@currentlabel{\theParagraph}% + \protected@edef\theClause{% + \csname \scrjura@env@type @Clauseformat\endcsname{\contract@number}% + }% + \protected@edef\@currentlabel{\theClause}% \fi - \stepcounter{@AbsParagraph}% + \stepcounter{@AbsClause}% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname if@skiphyperref\endcsname\relax \else - \expandafter\let\csname if@jura@skiphyperref\expandafter\endcsname + \expandafter\let\csname if@scrjura@skiphyperref\expandafter\endcsname \csname if@skiphyperref\endcsname \fi - \if@jura@skiphyperref\else - \hyper@refstepcounter{@AbsParagraph}% - \typeout{absolute Nummer: \the@AbsParagraph^^JLabel: `\@currentHref'}% + \if@scrjura@skiphyperref\else + \hyper@refstepcounter{@AbsClause}% + \typeout{absolute Nummer: \the@AbsClause^^JLabel: `\@currentHref'}% \fi - \let\theSubParagraph\theParagraph + \let\theSubClause\theClause \ifcontract@dummy\else \begingroup \if@juratitlepagebreak\else\interlinepenalty\@M\fi - \contract@paragraph@font{\theParagraph + \contract@paragraph@font{\theClause \ifx\contract@title\relax\else\enskip\fi}% \contract@title \ifx\contract@entry\relax\else - \addxcontentsline{toc}{cpar}[\theParagraph]\contract@entry - \addxcontentsline{cpa}{cpar}[\theParagraph]\contract@entry + \addxcontentsline{toc}{cpar}[\theClause]\contract@entry + \addxcontentsline{cpa}{cpar}[\theClause]\contract@entry \fi \ifx\contract@head\relax\else - \expandafter\Paragraphmark\expandafter{% - \expandafter\theSubParagraph\expandafter\enskip\contract@head}% + \expandafter\Clausemark\expandafter{% + \expandafter\theSubClause\expandafter\enskip\contract@head}% \fi \par \endgroup\nobreak\vskip\contract@postskip - \jura@afterheading{contract}% + \scrjura@afterheading \fi } \newcommand*{\contract@subparagraph}[1]{% - \stepcounter{contractAbsoluteParagraph}% + \stepcounter{\scrjura@env@type AbsoluteClause}% \ManualPar\parnumbertrue \let\contract@title\relax \let\contract@entry\relax @@ -358,56 +510,56 @@ \vskip\contract@preskip \fi \ifx\contract@number\relax - \let\p@SubParagraph\@empty - \let\theSubParagraph\thecontractSubParagraph - \refstepcounter{SubParagraph}% + \let\p@SubClause\@empty + \let\theSubClause\thecontractSubClause + \refstepcounter{SubClause}% \else \begingroup \let\@elt\@stpelt - \cl@SubParagraph + \cl@SubClause \endgroup - \protected@edef\theSubParagraph{\theParagraph\contract@number}% - \protected@edef\@currentlabel{\theSubParagraph}% + \protected@edef\theSubClause{\theClause\contract@number}% + \protected@edef\@currentlabel{\theSubClause}% \fi - \stepcounter{@AbsParagraph}% + \stepcounter{@AbsClause}% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname if@skiphyperref\endcsname\relax \else - \expandafter\let\csname if@jura@skiphyperref\expandafter\endcsname + \expandafter\let\csname if@scrjura@skiphyperref\expandafter\endcsname \csname if@skiphyperref\endcsname \fi - \if@jura@skiphyperref\else - \hyper@refstepcounter{@AbsParagraph}% - \typeout{absolute Nummer: \the@AbsParagraph^^JLabel: `\@currentHref'}% + \if@scrjura@skiphyperref\else + \hyper@refstepcounter{@AbsClause}% + \typeout{absolute Nummer: \the@AbsClause^^JLabel: `\@currentHref'}% \fi \ifcontract@dummy\else \begingroup \if@juratitlepagebreak\else\interlinepenalty\@M\fi - \contract@paragraph@font{\theSubParagraph + \contract@paragraph@font{\theSubClause \ifx\contract@title\relax\else\enskip\fi}% \contract@title \ifx\contract@entry\relax\else - \addxcontentsline{toc}{cpar}[\theSubParagraph]\contract@entry - \addxcontentsline{cpa}{cpar}[\theSubParagraph]\contract@entry + \addxcontentsline{toc}{cpar}[\theSubClause]\contract@entry + \addxcontentsline{cpa}{cpar}[\theSubClause]\contract@entry \fi \ifx\contract@head\relax\else - \expandafter\Paragraphmark\expandafter{% - \expandafter\theSubParagraph\expandafter\enskip\contract@head}% + \expandafter\Clausemark\expandafter{% + \expandafter\theSubClause\expandafter\enskip\contract@head}% \fi \par \endgroup \nobreak\vskip\contract@postskip - \jura@afterheading{contract}% + \scrjura@afterheading \fi } \newcommand*{\AutoPar}{% - \expandafter\let\expandafter\jura@everypar - \csname \jura@type @everypar\endcsname + \expandafter\let\expandafter\scrjura@everypar + \csname \scrjura@env@type @everypar\endcsname } \newcommand*{\ManualPar}{% - \let\jura@everypar\relax + \let\scrjura@everypar\relax } -\newcommand*{\jura@afterheading}[1]{% +\newcommand*{\scrjura@afterheading}{% \@nobreaktrue \everypar{% \if@nobreak @@ -419,29 +571,28 @@ \else \clubpenalty \@clubpenalty \everypar{% - \jura@everypar + \scrjura@everypar }% \fi - \jura@everypar + \scrjura@everypar }% - \def\jura@type{#1}% \AutoPar } -\newcommand*{\jura@everypar}{} +\newcommand*{\scrjura@everypar}{} \CheckCommand*\@doendpe{\@endpetrue \def\par{\@restorepar\everypar{}\par\@endpefalse}\everypar {{\setbox\z@\lastbox}\everypar{}\@endpefalse}} -\newcommand*{\contract@doendpe}{% +\newcommand*{\scrjura@doendpe}{% \@endpetrue \def\par{% \@restorepar\everypar{% - \csname jura@everypar\endcsname + \csname scrjura@everypar\endcsname }% \par\@endpefalse }% \everypar{% {\setbox\z@\lastbox}\everypar{% - \csname jura@everypar\endcsname + \csname scrjura@everypar\endcsname }% \@endpefalse }% @@ -455,17 +606,17 @@ }{\value{juratoclevel}}{\cpar@indent}{\cpar@numberwidth}{#1}{#2}% \fi } -\DeclareRobustCommand*{\jura@separator}[1]{#1} -\DeclareRobustCommand*{\jura@usetype}[1]{\jura@@usetype{#1}} -\newcommand*{\jura@@usetype}[1]{} +\DeclareRobustCommand*{\scrjura@separator}[1]{#1} +\DeclareRobustCommand*{\scrjura@usetype}[1]{\scrjura@@usetype{#1}} +\newcommand*{\scrjura@@usetype}[1]{} \newcounter{par} \renewcommand*{\thepar}{\arabic{par}} -\newcommand*{\theHpar}{\theH@AbsParagraph-\Roman{par}} +\newcommand*{\theHpar}{\theH@AbsClause-\Roman{par}} \newcommand*{\parformat}{(\thepar)} \newkomafont{parnumber}{} -\renewcommand*\p@par{{\jura@usetype{\jura@env@type}\theSubParagraph\jura@separator{\nobreakspace}}} -\@addtoreset{par}{Paragraph} -\@addtoreset{par}{SubParagraph} +\renewcommand*\p@par{{\scrjura@usetype{\scrjura@env@type}\theSubClause\scrjura@separator{\nobreakspace}}} +\@addtoreset{par}{Clause} +\@addtoreset{par}{SubClause} \newcommand*{\contract@everypar}{% \ifparnumber \ifx\scrjura@special@par\relax @@ -484,11 +635,16 @@ \setcounter{sentence}{0}\refstepcounter{sentence}% \fi \begingroup - \protected@write\@auxout{\let\contract@Paragraphformat\@firstofone}{% - \string\newmaxpar{contract}% - {\thecontractAbsoluteParagraph}% - {\thepar}}% - \getmaxpar\@tempa{contract}{\thecontractAbsoluteParagraph}% + \protected@write\@auxout{% + \expandafter\let\csname \scrjura@env@type @Clauseformat\endcsname + \@firstofone + }{% + \string\newmaxpar{\scrjura@env@type}% + {\csname the\scrjura@env@type AbsoluteClause\endcsname}% + {\thepar}% + }% + \getmaxpar\@tempa{\scrjura@env@type}% + {\csname the\scrjura@env@type AbsoluteClause\endcsname}% \typeout{Stored max is \@tempa}% \def\reserved@a##1\@nnil{\def\@tempa{##1}}% \afterassignment\reserved@a\@tempcnta=0\@tempa\relax\@nnil @@ -537,10 +693,10 @@ \ref#1{#2}% \endgroup } -\newcommand*{\refParagraph}{% - \@ifstar {\ref@Paragraph*}{\ref@Paragraph{}} +\newcommand*{\refClause}{% + \@ifstar {\ref@Clause*}{\ref@Clause{}} } -\newcommand*{\ref@Paragraph}[2]{% +\newcommand*{\ref@Clause}[2]{% \expandafter\ifx\csname r@#2\endcsname\relax \ref#1{#2}% \else @@ -553,7 +709,7 @@ \expandafter\expandafter\expandafter{% \expandafter\expandafter\expandafter\@gobble\csname r@#2\endcsname}% \def\@tempc##1##2\@nil{##1}% - \let\jura@separator\@gobble + \let\scrjura@separator\@gobble \protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc \csname r@#2\endcsname\noexpand\@nil}% \protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc @@ -566,13 +722,13 @@ \endgroup \fi } -\newcommand*{\refParagraphN}{% - \@ifstar {\ref@ParagraphN*}{\ref@ParagraphN{}} +\newcommand*{\refClauseN}{% + \@ifstar {\ref@ClauseN*}{\ref@ClauseN{}} } -\newcommand*{\ref@ParagraphN}[2]{% +\newcommand*{\ref@ClauseN}[2]{% \begingroup - \let\Paragraphformat\relax - \ref@Paragraph{#1}{#2}% + \let\Clauseformat\relax + \ref@Clause{#1}{#2}% \endgroup } \newcommand*{\refPar}{% @@ -591,7 +747,7 @@ \expandafter\expandafter\expandafter{% \expandafter\expandafter\expandafter\@gobble\csname r@#2\endcsname}% \def\@tempc##1##2\@nil{##1}% - \let\jura@separator\@gobble + \let\scrjura@separator\@gobble \protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc \csname r@#2\endcsname\noexpand\@nil}% \def\@tempc##1##2##3\@nil{##2}% @@ -656,7 +812,7 @@ \expandafter\expandafter\expandafter{% \expandafter\expandafter\expandafter\@gobble\csname r@#2\endcsname}% \def\@tempc##1##2\@nil{##1}% - \let\jura@separator\@gobble + \let\scrjura@separator\@gobble \protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc \csname r@#2\endcsname\noexpand\@nil}% \def\@tempc##1##2##3##4\@nil{##3}% @@ -696,7 +852,7 @@ \newcommand*{\theHsentence}{\theHpar-\arabic{sentence}} \renewcommand*{\p@sentence}{\expandafter\p@@sentence} \newcommand*{\p@@sentence}[1]{\p@par{{\par@cite{\thepar}}% - \jura@separator{\nobreakspace}}{\sentence@cite{#1}}} + \scrjura@separator{\nobreakspace}}{\sentence@cite{#1}}} \newcommand*{\contract@sentence}{% \refstepcounter{sentence}% \textsuperscript{\thesentence}\nobreak\hskip\z@ @@ -767,14 +923,14 @@ } \newcommand*{\newmaxpar}[3]{% \begingroup - \expandafter\let\csname #1@Paragraphformat\endcsname\@firstofone + \expandafter\let\csname #1@Clauseformat\endcsname\@firstofone \protected@edef\@tempa{#2}\@onelevel@sanitize\@tempa \expandafter\xdef\csname max@#1@\@tempa\endcsname{#3}% \endgroup } \newcommand*{\getmaxpar}[3]{% \begingroup - \expandafter\let\csname #2@Paragraphformat\endcsname\@firstofone + \expandafter\let\csname #2@Clauseformat\endcsname\@firstofone \protected@edef\@tempa{#3}% \@onelevel@sanitize\@tempa \expandafter\ifx \csname max@#2@\@tempa\endcsname\relax @@ -785,6 +941,11 @@ \fi \@tempa } +\AtBeginDocument{% + \immediate\write\@mainaux{% + \string\providecommand*{\string\newmaxpar}[3]{} + }% +} %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% |