1 files changed, 27 insertions, 22 deletions

diff --git a/Master/texmf-dist/tex/latex/stex/sproof/sproof.sty b/Master/texmf-dist/tex/latex/stex/sproof/sproof.sty
index 6a101124b4b..ba420ee064e 100644
--- a/Master/texmf-dist/tex/latex/stex/sproof/sproof.sty
+++ b/Master/texmf-dist/tex/latex/stex/sproof/sproof.sty
@@ -8,15 +8,17 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{sproof}[2010/06/25 v0.9f Semantic Markup for Proofs]
+\DeclareOption{showmeta}{\PassOptionsToPackage{\CurrentOption}{metakeys}}
+\ProcessOptions
 \RequirePackage{sref}
 \srefaddidkey{spf}
-\omdaddkey{spf}{display}
-\omdaddkey{spf}{for}
-\omdaddkey{spf}{from}
-\omdaddkey[\sproof@box]{spf}{proofend}
-\omdaddkey{spf}{type}
-\omdaddkey{spf}{title}
-\omdaddkey{spf}{continues}
+\addmetakey*{spf}{display}
+\addmetakey{spf}{for}
+\addmetakey{spf}{from}
+\addmetakey*[\sproof@box]{spf}{proofend}
+\addmetakey{spf}{type}
+\addmetakey*{spf}{title}
+\addmetakey{spf}{continues}
 \def\spf@flow{flow}
 \newenvironment{pst@with@label}[1]{\edef\pst@label{#1}\advance\count10 by 1\count\count10=1}
 {\advance\count10 by -1}
@@ -26,43 +28,46 @@
 \def\spf@proofend{\sproof@box}
 \def\sproofend{\ifx\spf@proofend\@empty\else\hfil\null\nobreak\hfill\spf@proofend\par\smallskip\fi}
 \def\sProofEndSymbol#1{\def\sproof@box{#1}}
-\newcommand{\spfsketch}[2][]{\omdsetkeys{spf}{#1}\sref@target
-\ifx\spf@display\spf@flow\else{\stDMemph{\ifx\spf@type\@empty{Proof}\else\spf@type\fi}:}\fi{ #2}%
-\sref@label@id{this \ifx\spf@type\@empty{Proof}\else\spf@type\fi}}
-\newenvironment{@proof}[2][]{\omdsetkeys{spf}{#1}\sref@target
+\def\spf@proofsketch@kw{Proof Sketch}
+\newcommand{\spfsketch}[2][]{\metasetkeys{spf}{#1}\sref@target
+\ifx\spf@display\spf@flow\else{\stDMemph{\ifx\spf@type\@empty\spf@proofsketch@kw\else\spf@type\fi}:}\fi{ #2}%
+\sref@label@id{this \ifx\spf@type\@empty\spf@proofsketch@kw\else\spf@type\fi}}
+\def\spf@proof@kw{Proof}
+\newenvironment{@proof}[2][]{\metasetkeys{spf}{#1}\sref@target
 \count10=10
-\ifx\spf@display\spf@flow\else{\stDMemph{\ifx\spf@type\@empty{Proof}\else\spf@type\fi}:}\fi{ #2}%
-\sref@label@id{this \ifx\spf@type\@empty{Proof}\else\spf@type\fi}
+\ifx\spf@display\spf@flow\else{\stDMemph{\ifx\spf@type\@empty\spf@proof@kw\else\spf@type\fi}:}\fi{ #2}%
+\sref@label@id{this \ifx\spf@type\@empty\spf@proof@kw\else\spf@type\fi}
 \def\pst@label{}\newcount\pst@count% initialize the labeling mechanism
 \begin{description}\begin{pst@with@label}{P}}
 {\end{pst@with@label}\end{description}}
 \newenvironment{sproof}[2][]{\begin{@proof}[#1]{#2}}{\sproofend\end{@proof}}
 \newenvironment{sProof}[2][]{\begin{@proof}[#1]{#2}}{\end{@proof}}
-\newcommand{\spfidea}[2][]{\omdsetkeys{spf}{#1}%
+\newcommand{\spfidea}[2][]{\metasetkeys{spf}{#1}%
 \stDMemph{\ifx\spf@type\@empty{Proof Idea}\else\spf@type\fi:} #2\sproofend}
-\newenvironment{spfstep}[1][]{\omdsetkeys{spf}{#1}
+\newenvironment{spfstep}[1][]{\metasetkeys{spf}{#1}
 \ifx\spf@display\spf@flow\else\item[\the@pst@label]\fi
 \ifx\spf@title\@empty\else{(\stDMemph{\spf@title})}\fi}
 {\next@pst@label}
-\newenvironment{sproofcomment}[1][]{\omdsetkeys{spf}{#1}
+\newenvironment{sproofcomment}[1][]{\metasetkeys{spf}{#1}
 \ifx\spf@display\spf@flow\else\item[\the@pst@label]\fi}
 {\next@pst@label}
-\newenvironment{spfcases}[2][]{\omdsetkeys{spf}{#1}
+\newenvironment{spfcases}[2][]{\metasetkeys{spf}{#1}
 \def\@test{#2}\ifx\@test\empty\else
 \ifx\spf@display\spf@flow {#2}\else\item[\the@pst@label]{#2} \fi\fi
 \begin{pst@with@label}{\pst@label.\number\count\count10}}
 {\end{pst@with@label}\next@pst@label}
-\newenvironment{spfcase}[2][]{\omdsetkeys{spf}{#1}
+\newenvironment{spfcase}[2][]{\metasetkeys{spf}{#1}
 \ifx\spf@display\spf@flow\else\item[\the@pst@label]\fi
 \def\@test{#2}\ifx\@test\@empty\else{\stDMemph{#2}:}\fi
 \begin{pst@with@label}{\pst@label.\number\count\count10}}
 {\ifx\spf@display\spf@flow\else\sproofend\fi\end{pst@with@label}\next@pst@label}
-\newenvironment{subproof}{\begin{pst@with@label}{\pst@label.\number\count\count10}}
+\newenvironment{subproof}[1][]%
+{\begin{pst@with@label}{\pst@label.\number\count\count10}}
 {\ifx\spf@display\spf@flow\else\sproofend\fi\end{pst@with@label}}
 \srefaddidkey{just}
-\omdaddkey{just}{method}
-\omdaddkey{just}{premises}
-\omdaddkey{just}{args}
+\addmetakey{just}{method}
+\addmetakey{just}{premises}
+\addmetakey{just}{args}
 \newenvironment{justification}[1][]{}{}
 \newcommand{\premise}[2][]{#2}
 \newcommand{\justarg}[2][]{#2}