summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/stex/sproof/sproof.sty.ltxml
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/stex/sproof/sproof.sty.ltxml')
-rw-r--r--Master/texmf-dist/tex/latex/stex/sproof/sproof.sty.ltxml24
1 files changed, 14 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/stex/sproof/sproof.sty.ltxml b/Master/texmf-dist/tex/latex/stex/sproof/sproof.sty.ltxml
index 91dc3034627..7b4e21cfa68 100644
--- a/Master/texmf-dist/tex/latex/stex/sproof/sproof.sty.ltxml
+++ b/Master/texmf-dist/tex/latex/stex/sproof/sproof.sty.ltxml
@@ -3,13 +3,12 @@ package LaTeXML::Package::Pool;
use strict;
use LaTeXML::Package;
RequirePackage('sref');
+DeclareOption('showmeta','');
DefConstructor('\sproofend',"");
DefConstructor('\spfsketch OptionalKeyVals:pf{}',
"<omdoc:proof "
. "?&defined(&KeyVal(#1,'id'))(xml:id='&KeyVal(#1,'id')')()>\n"
- . "?#2(<omdoc:omtext>"
- . "<omdoc:CMP><omdoc:p>#2</omdoc:p></omdoc:CMP>"
- . "</omdoc:omtext>\n)()"
+ . "?#2(<omdoc:omtext><omdoc:CMP><omdoc:p>#2\n)()"
. "</omdoc:proof>\n");
DefConstructor('\sProofEndSymbol {}','');
DefCMPEnvironment('{sproof} OptionalKeyVals:pf{}',
@@ -17,7 +16,7 @@ DefCMPEnvironment('{sproof} OptionalKeyVals:pf{}',
. "?&KeyVal(#1,'for')(for='&hash_wrapper(&KeyVal(#1,'for'))')()"
. "?&defined(&KeyVal(#1,'id'))(xml:id='&KeyVal(#1,'id')')()>\n"
. "?#2(<omdoc:omtext>"
- . "<omdoc:CMP><omdoc:p>#2</omdoc:p></omdoc:CMP>"
+ . "<omdoc:CMP><omdoc:p>#2</omdoc:CMP>"
. "</omdoc:omtext>\n)()"
. "#body"
. "</omdoc:proof>\n");
@@ -27,7 +26,7 @@ DefCMPConstructor('\spfidea OptionalKeyVals:pf {}',
"<omdoc:proof "
. "?&defined(&KeyVal(#1,'id'))(xml:id='&KeyVal(#1,'id')')()"
. "?&KeyVal(#1,'for')(for='&hash_wrapper(&KeyVal(#1,'for'))')()>\n"
- . "<omdoc:omtext><omdoc:CMP><omdoc:p>#2</omdoc:p></omdoc:CMP></omdoc:omtext>\n"
+ . "<omdoc:omtext><omdoc:CMP><omdoc:p>#2</omdoc:omtext>\n"
. "</omdoc:proof>\n");
DefCMPEnvironment('{spfstep} OptionalKeyVals:pf',
"<omdoc:derive "
@@ -40,24 +39,29 @@ DefCMPEnvironment('{spfstep} OptionalKeyVals:pf',
DefCMPEnvironment('{sproofcomment} OptionalKeyVals:pf',
"<omdoc:omtext "
. "?&defined(&KeyVal(#1,'id'))(xml:id='&KeyVal(#1,'id')')()>"
- . "<omdoc:CMP><omdoc:p>#body</omdoc:p></omdoc:CMP>"
+ . "<omdoc:CMP><omdoc:p>#body</omdoc:CMP>"
. "</omdoc:omtext>");
DefEnvironment('{spfcases} OptionalKeyVals:pf {}',
"<omdoc:derive "
. "?&defined(&KeyVal(#1,'id'))(xml:id='&KeyVal(#1,'id')')()>\n"
- . "<omdoc:CMP><omdoc:p>#2</omdoc:p></omdoc:CMP>\n"
+ . "<omdoc:CMP><omdoc:p>#2</omdoc:CMP>\n"
. "<omdoc:method xref='#proof-by-cases'>#body</omdoc:method>"
. "</omdoc:derive>\n");
DefEnvironment('{spfcase} OptionalKeyVals:pf{}',
"<omdoc:proof "
. "?&defined(&KeyVal(#1,'id'))(xml:id='&KeyVal(#1,'id')')()>\n"
. "?#2(<omdoc:omtext>"
- . "<omdoc:CMP><omdoc:p>#2</omdoc:p></omdoc:CMP>"
+ . "<omdoc:CMP><omdoc:p>#2</omdoc:CMP>"
. "</omdoc:omtext>\n)()"
. "#body"
. "</omdoc:proof>\n");
-DefEnvironment('{subproof}',
- "<omdoc:proof>\n #body\n</omdoc:proof>\n");
+DefEnvironment('{subproof}[]',
+ "<omdoc:derive>"
+ . "?#1(<omdoc:CMP><omdoc:p>#1</omdoc:CMP>)()"
+ . "<omdoc:method>"
+ . "<omdoc:proof>\n #body\n</omdoc:proof>"
+ . "</omdoc:method>"
+ ."</omdoc:derive>");
DefKeyVal('just','id','Semiverbatim');
DefKeyVal('just','method','Semiverbatim');
DefKeyVal('just','premises','Semiverbatim');