summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/stex/example
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-07 20:49:10 +0000
committerKarl Berry <karl@freefriends.org>2016-04-07 20:49:10 +0000
commitddfe3a4eaf95167482e923d4da3de2917a7dbfbb (patch)
tree0acc1bb60b37392451f5e79e00c33c487c19abcf /Master/texmf-dist/doc/latex/stex/example
parenta04ae5a947a6b06bc717719f6ad63e6de5cb5af6 (diff)
stex (7apr16)
git-svn-id: svn://tug.org/texlive/trunk@40320 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/stex/example')
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/Makefile2
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/README2
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/background/Makefile6
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/background/all.omdoc155
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/background/all.pdfbin0 -> 57204 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/background/functions.omdoc186
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/background/functions.pdfbin0 -> 48610 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/background/functions.sms13
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/background/reals.omdoc67
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/background/reals.pdfbin0 -> 53179 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/background/reals.sms5
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/Makefile6
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/continuous.omdoc53
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/continuous.pdfbin0 -> 61899 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/continuous.sms6
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/continuous.tex4
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/differentiable.omdoc48
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/differentiable.pdfbin0 -> 76719 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/differentiable.sms5
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/differentiable.tex2
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/intro.omdoc145
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/intro.pdfbin0 -> 96616 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/intro.sms2
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/paper.omdoc48
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/paper.pdfbin161414 -> 157451 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/paper/paper.tex3
-rw-r--r--Master/texmf-dist/doc/latex/stex/example/test/Makefile7
27 files changed, 90 insertions, 675 deletions
diff --git a/Master/texmf-dist/doc/latex/stex/example/Makefile b/Master/texmf-dist/doc/latex/stex/example/Makefile
index df87da1fbee..47c61882663 100644
--- a/Master/texmf-dist/doc/latex/stex/example/Makefile
+++ b/Master/texmf-dist/doc/latex/stex/example/Makefile
@@ -1,4 +1,4 @@
STEXDIR = ..
MAKEDIRS = background paper
CLEANDIRS = $(MAKEDIRS)
-include $(STEXDIR)/make/Makefile.subdirs
+include $(STEXDIR)/lib/make/Makefile.subdirs
diff --git a/Master/texmf-dist/doc/latex/stex/example/README b/Master/texmf-dist/doc/latex/stex/example/README
index 7424d68ebca..fdba0ac819c 100644
--- a/Master/texmf-dist/doc/latex/stex/example/README
+++ b/Master/texmf-dist/doc/latex/stex/example/README
@@ -11,8 +11,6 @@ background: a directory with background modules, this is assumed to
would probably be a subversion external.
paper: a directory with a paper based on two modules and the
background modules.
-test: a directory that has the makefiles to accomodate your tests;
- just copy your files there adjust TARGET and type make.
For an explanation of the design of the example see paper/example.pdf or
https://trac.kwarc.info/sTeX/wiki/sTeXCollections
diff --git a/Master/texmf-dist/doc/latex/stex/example/background/Makefile b/Master/texmf-dist/doc/latex/stex/example/background/Makefile
index af7cc21e5eb..505b02c9e14 100644
--- a/Master/texmf-dist/doc/latex/stex/example/background/Makefile
+++ b/Master/texmf-dist/doc/latex/stex/example/background/Makefile
@@ -3,6 +3,6 @@ TARGET = all.tex
BUTFILES = pre.tex post.tex
MODSLIBDIR = .
-include $(STEXDIR)/make/Makefile.vars
-all: omdoc mods pdf
-include $(STEXDIR)/make/Makefile.in
+include $(STEXDIR)/lib/make/Makefile.vars
+all: pdf mpdf
+include $(STEXDIR)/lib/make/Makefile.in
diff --git a/Master/texmf-dist/doc/latex/stex/example/background/all.omdoc b/Master/texmf-dist/doc/latex/stex/example/background/all.omdoc
deleted file mode 100644
index af660821194..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/background/all.omdoc
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0"?>
-<!--This OMDoc document is generated from an sTeX-encoded one via LaTeXML, you may want to reconsider editing it.-->
-<omdoc xmlns="http://omdoc.org/ns" xmlns:stex="http://kwarc.info/ns/sTeX" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:om="http://www.openmath.org/OpenMath" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:omdoc="http://omdoc.org/ns" stex:srcref="all.tex#textrange(from=5;1,to=5;17)" xml:id="all.omdoc">
- <omgroup layout="sectioning" xml:id="sec.functions" about="#sec.functions" stex:srcref="functions.tex#textrange(from=1;0,to=11;13)">
- <metadata xml:id="sec.functions.p1" about="#sec.functions.p1" stex:srcref="functions.tex#textrange(from=1;0,to=10;12)">
- <dc:title stex:srcref="functions.tex#textrange(from=1;0,to=11;13)" xml:id="sec.functions.p1.p1" about="#sec.functions.p1.p1">
- <p xml:id="sec.functions.p1.p1.p1" about="#sec.functions.p1.p1.p1" stex:srcref="functions.tex#textrange(from=1;0,to=11;13)">Functions</p>
- </dc:title>
- </metadata>
- <theory xmlns:mcd="http://www.w3.org/ns/mathml-cd" xml:id="functions" about="#functions" stex:srcref="functions.tex#textrange(from=2;0,to=10;12)">
- <imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/>
- <symbol name="cart" xml:id="cart.sym" about="#cart.sym" stex:srcref="functions.tex#textrange(from=3;0,to=3;55)"/>
- <notation cd="functions" name="cart">
- <prototype>
- <om:OMA>
- <om:OMS cd="functions" cr="fun" name="cart"/>
- <exprlist name="args">
- <expr name="arg"/>
- </exprlist>
- </om:OMA>
- </prototype>
- <rendering precedence="500">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <iterate name="args">
- <separator>
- <m:mo cr="fun">&#xD7;</m:mo>
- </separator>
- <render name="arg"/>
- </iterate>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
- </rendering>
- </notation>
- <symbol name="fun" xml:id="fun.sym" about="#fun.sym" stex:srcref="functions.tex#textrange(from=4;1,to=4;72)"/>
- <notation cd="functions" name="fun">
- <prototype>
- <om:OMA>
- <om:OMS cd="functions" cr="fun" name="fun"/>
- <expr name="arg1"/>
- <expr name="arg2"/>
- <expr name="arg3"/>
- </om:OMA>
- </prototype>
- <rendering precedence="200">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <render name="arg1" precedence="200"/>
- <m:mo cr="fun">:</m:mo>
- <render name="arg2" precedence="200"/>
- <m:mo cr="fun">&#x2192;</m:mo>
- <render name="arg3" precedence="200"/>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
- </rendering>
- </notation>
- <symbol name="inset" xml:id="inset.sym" about="#inset.sym" stex:srcref="functions.tex#textrange(from=5;1,to=5;46)"/>
- <notation cd="functions" name="inset">
- <prototype>
- <om:OMA>
- <om:OMS cd="functions" cr="fun" name="inset"/>
- <expr name="arg1"/>
- <expr name="arg2"/>
- </om:OMA>
- </prototype>
- <rendering precedence="650">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <render name="arg1" precedence="650"/>
- <m:mo cr="fun">&#x2208;</m:mo>
- <render name="arg2" precedence="650"/>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
- </rendering>
- </notation>
- <symbol name="function" xml:id="function.def.sym" about="#function.def.sym" stex:srcref="functions.tex#textrange(from=7;0,to=9;16)"/>
- <definition for="function" xml:id="functions.def" about="#functions.def" stex:srcref="functions.tex#textrange(from=7;0,to=9;16)">
- <CMP xml:id="functions.def.p1" about="#functions.def.p1" stex:srcref="functions.tex#textrange(from=7;0,to=9;16)">
- <p xml:id="functions.def.p1.p1" about="#functions.def.p1.p1" stex:srcref="functions.tex#textrange(from=7;0,to=9;16)">
-A <idx xml:id="functions.def.p1.p1.p1" about="#functions.def.p1.p1.p1" stex:srcref="functions.tex#textrange(from=7;68,to=8;21)"><idt><term cd="functions" name="function" role="definiendum" xml:id="functions.def.p1.p1.p1.p1" about="#functions.def.p1.p1.p1.p1" stex:srcref="functions.tex#textrange(from=7;68,to=8;21)">function</term></idt><ide index="default"><idp><phrase>function</phrase></idp></ide></idx><om:OMOBJ><om:OMA><om:OMS cd="functions" name="fun"/><om:OMV name="f"/><om:OMV name="A"/><om:OMV name="B"/></om:OMA></om:OMOBJ> is a left-total, right-unique relation in <om:OMOBJ><om:OMA><om:OMS cd="functions" name="cart"/><om:OMV name="A"/><om:OMV name="B"/></om:OMA></om:OMOBJ></p>
- </CMP>
- </definition>
- </theory>
- </omgroup>
- <omgroup layout="sectioning" xml:id="sec.reals" about="#sec.reals" stex:srcref="reals.tex#textrange(from=1;0,to=16;13)">
- <metadata xml:id="sec.reals.p1" about="#sec.reals.p1" stex:srcref="reals.tex#textrange(from=1;0,to=15;12)">
- <dc:title stex:srcref="reals.tex#textrange(from=1;0,to=16;13)" xml:id="sec.reals.p1.p1" about="#sec.reals.p1.p1">
- <p xml:id="sec.reals.p1.p1.p1" about="#sec.reals.p1.p1.p1" stex:srcref="reals.tex#textrange(from=1;0,to=16;13)">Real Numbers</p>
- </dc:title>
- </metadata>
- <theory xmlns:mcd="http://www.w3.org/ns/mathml-cd" xml:id="reals" about="#reals" stex:srcref="reals.tex#textrange(from=2;0,to=15;12)">
- <imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/>
- <symbol name="RealNumbers" xml:id="RealNumbers.sym" about="#RealNumbers.sym" stex:srcref="reals.tex#textrange(from=3;1,to=3;33)"/>
- <notation cd="reals" name="RealNumbers">
- <prototype>
- <om:OMS cd="reals" name="RealNumbers"/>
- </prototype>
- <rendering>
- <m:mi mathvariant="double-struck">R</m:mi>
- </rendering>
- </notation>
- <symbol name="absval" xml:id="absval.sym" about="#absval.sym" stex:srcref="reals.tex#textrange(from=4;1,to=4;43)"/>
- <notation cd="reals" name="absval">
- <prototype>
- <om:OMA>
- <om:OMS cd="reals" cr="fun" name="absval"/>
- <expr name="arg1"/>
- </om:OMA>
- </prototype>
- <rendering precedence="2000">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <m:mo cr="fun">|</m:mo>
- <render name="arg1" precedence="2000"/>
- <m:mo cr="fun">|</m:mo>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
- </rendering>
- </notation>
- <symbol name="rfrac" xml:id="rfrac.sym" about="#rfrac.sym" stex:srcref="reals.tex#textrange(from=5;1,to=5;33)"/>
- <notation cd="reals" name="rfrac">
- <prototype>
- <om:OMA>
- <om:OMS cd="reals" cr="fun" name="rfrac"/>
- <expr name="arg1"/>
- <expr name="arg2"/>
- </om:OMA>
- </prototype>
- <rendering>
- <m:mfrac>
- <render name="arg1"/>
- <render name="arg2"/>
- </m:mfrac>
- </rendering>
- </notation>
- <symbol name="real-numbers" xml:id="real-numbers.def.sym" about="#real-numbers.def.sym" stex:srcref="reals.tex#textrange(from=7;0,to=10;16)"/>
- <definition for="real-numbers" xml:id="reals.def" about="#reals.def" stex:srcref="reals.tex#textrange(from=7;0,to=10;16)">
- <CMP xml:id="reals.def.p1" about="#reals.def.p1" stex:srcref="reals.tex#textrange(from=7;0,to=10;16)">
- <p xml:id="reals.def.p1.p1" about="#reals.def.p1.p1" stex:srcref="reals.tex#textrange(from=7;0,to=10;16)">
-We denote the set of <idx xml:id="reals.def.p1.p1.p1" about="#reals.def.p1.p1.p1" stex:srcref="reals.tex#textrange(from=7;27,to=8;47)"><idt><term cd="reals" name="real-numbers" role="definiendum" xml:id="reals.def.p1.p1.p1.p1" about="#reals.def.p1.p1.p1.p1" stex:srcref="reals.tex#textrange(from=7;27,to=8;47)">real numbers</term></idt><ide index="default"><idp><phrase>real</phrase></idp><idp><phrase>numbers</phrase></idp></ide></idx> we all know and love with
-<om:OMOBJ><om:OMS cd="reals" name="RealNumbers"/></om:OMOBJ>.
-</p>
- </CMP>
- </definition>
- <definition xml:id="absval.def" about="#absval.def" stex:srcref="reals.tex#textrange(from=12;0,to=14;16)">
- <CMP xml:id="absval.def.p1" about="#absval.def.p1" stex:srcref="reals.tex#textrange(from=12;0,to=14;16)">
- <p xml:id="absval.def.p1.p1" about="#absval.def.p1.p1" stex:srcref="reals.tex#textrange(from=12;0,to=14;16)">
-The absolute value <om:OMOBJ><om:OMA><om:OMS cd="reals" name="absval"/><om:OMV name="r"/></om:OMA></om:OMOBJ> of a real number <om:OMOBJ><om:OMV name="r"/></om:OMOBJ>.
-</p>
- </CMP>
- </definition>
- </theory>
- </omgroup>
- <!--The data elements-->
-</omdoc>
diff --git a/Master/texmf-dist/doc/latex/stex/example/background/all.pdf b/Master/texmf-dist/doc/latex/stex/example/background/all.pdf
new file mode 100644
index 00000000000..cb697217173
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/stex/example/background/all.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stex/example/background/functions.omdoc b/Master/texmf-dist/doc/latex/stex/example/background/functions.omdoc
index 68f4ab80859..72adb2e3b2a 100644
--- a/Master/texmf-dist/doc/latex/stex/example/background/functions.omdoc
+++ b/Master/texmf-dist/doc/latex/stex/example/background/functions.omdoc
@@ -1,13 +1,14 @@
<?xml version="1.0"?>
-<!--This OMDoc document is generated from an sTeX-encoded one via LaTeXML, you may want to reconsider editing it.-->
-<omdoc xmlns:omdoc="http://omdoc.org/ns" xmlns="http://omdoc.org/ns" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:stex="http://kwarc.info/ns/sTeX" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns" xmlns:om="http://www.openmath.org/OpenMath">
- <omdoc:omgroup layout="sectioning" xml:id="sec.functions" about="#sec.functions" stex:srcref="functions.tex#textrange(from=1;0,to=18;13)">
- <omdoc:metadata xml:id="sec.functions.metadata1" about="#sec.functions.metadata1" stex:srcref="functions.tex#textrange(from=1;0,to=17;12)">
- <dc:title xml:id="sec.functions.metadata1.title1" about="#sec.functions.metadata1.title1" stex:srcref="functions.tex#textrange(from=1;0,to=18;13)">Functions</dc:title>
+<!--This OMDoc document is generated from an sTeX-encoded one via LaTeXML, you
+ may want to reconsider editing it.-->
+<omdoc xmlns:omdoc="http://omdoc.org/ns" xmlns="http://omdoc.org/ns" xmlns:stex="http://kwarc.info/ns/sTeX" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:om="http://www.openmath.org/OpenMath" xmlns:m="http://www.w3.org/1998/Math/MathML" xml:id="omdoc1" about="#omdoc1" stex:srcref="Literal String \documentc#textrange(from=1;0,to=0;0)">
+ <omdoc:omgroup layout="sectioning" xml:id="sec.functions" about="#sec.functions" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=1;0,to=18;13)">
+ <omdoc:metadata xml:id="sec.functions.metadata1" about="#sec.functions.metadata1" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=1;0,to=18;13)">
+ <dc:title xml:id="sec.functions.metadata1.title1" about="#sec.functions.metadata1.title1" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=1;0,to=18;13)">Functions</dc:title>
</omdoc:metadata>
- <theory xml:id="functions" about="#functions" stex:srcref="functions.tex#textrange(from=2;0,to=17;12)">
- <omdoc:symbol name="cart" xml:id="cart.sym" about="#cart.sym" stex:srcref="functions.tex#textrange(from=3;0,to=3;55)"/>
- <omdoc:notation cd="functions" name="cart">
+ <omdoc:theory xml:id="functions" about="#functions" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=2;0,to=17;12)">
+ <omdoc:symbol name="cart" xml:id="functions.symbol1" about="#functions.symbol1" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=3;0,to=3;55)"/>
+ <omdoc:notation cd="functions" name="cart" stex:macro_name="cart" stex:nargs="1" xml:id="functions.notation2" about="#functions.notation2" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=3;0,to=3;55)">
<omdoc:prototype>
<om:OMA>
<om:OMS cd="functions" cr="fun" name="cart"/>
@@ -17,20 +18,16 @@
</om:OMA>
</omdoc:prototype>
<omdoc:rendering precedence="500">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <omdoc:iterate name="args">
- <omdoc:separator>
- <m:mo cr="fun">&#xD7;</m:mo>
- </omdoc:separator>
- <omdoc:render name="arg"/>
- </omdoc:iterate>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
+ <omdoc:iterate name="args">
+ <omdoc:separator>
+ <m:mo cr="fun">&#xD7;</m:mo>
+ </omdoc:separator>
+ <omdoc:render name="arg"/>
+ </omdoc:iterate>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:symbol name="fun" xml:id="fun.sym" about="#fun.sym" stex:srcref="functions.tex#textrange(from=4;1,to=4;72)"/>
- <omdoc:notation cd="functions" name="fun">
+ <omdoc:symbol name="fun" xml:id="functions.symbol3" about="#functions.symbol3" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=4;0,to=4;71)"/>
+ <omdoc:notation cd="functions" name="fun" stex:macro_name="fun" stex:nargs="3" xml:id="functions.notation4" about="#functions.notation4" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=4;0,to=4;71)">
<omdoc:prototype>
<om:OMA>
<om:OMS cd="functions" cr="fun" name="fun"/>
@@ -40,19 +37,15 @@
</om:OMA>
</omdoc:prototype>
<omdoc:rendering precedence="200">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <render name="arg1" precedence="200"/>
- <m:mo cr="fun">:</m:mo>
- <render name="arg2" precedence="200"/>
- <m:mo cr="fun">&#x2192;</m:mo>
- <render name="arg3" precedence="200"/>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
+ <omdoc:render name="arg1" precedence="200"/>
+ <m:mo cr="fun">:</m:mo>
+ <omdoc:render name="arg2" precedence="200"/>
+ <m:mo cr="fun">&#x2192;</m:mo>
+ <omdoc:render name="arg3" precedence="200"/>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:symbol name="inset" xml:id="inset.sym" about="#inset.sym" stex:srcref="functions.tex#textrange(from=5;1,to=5;46)"/>
- <omdoc:notation cd="functions" name="inset">
+ <omdoc:symbol name="inset" xml:id="functions.symbol5" about="#functions.symbol5" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=5;0,to=5;45)"/>
+ <omdoc:notation cd="functions" name="inset" stex:macro_name="inset" stex:nargs="2" xml:id="functions.notation6" about="#functions.notation6" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=5;0,to=5;45)">
<omdoc:prototype>
<om:OMA>
<om:OMS cd="functions" cr="fun" name="inset"/>
@@ -61,17 +54,13 @@
</om:OMA>
</omdoc:prototype>
<omdoc:rendering precedence="650">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <render name="arg1" precedence="650"/>
- <m:mo cr="fun">&#x2208;</m:mo>
- <render name="arg2" precedence="650"/>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
+ <omdoc:render name="arg1" precedence="650"/>
+ <m:mo cr="fun">&#x2208;</m:mo>
+ <omdoc:render name="arg2" precedence="650"/>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:symbol name="sseteq" xml:id="sseteq.sym" about="#sseteq.sym" stex:srcref="functions.tex#textrange(from=6;0,to=6;41)"/>
- <omdoc:notation cd="functions" name="sseteq">
+ <omdoc:symbol name="sseteq" xml:id="functions.symbol7" about="#functions.symbol7" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=6;0,to=6;41)"/>
+ <omdoc:notation cd="functions" name="sseteq" stex:macro_name="sseteqOp" stex:nargs="0" xml:id="functions.notation8" about="#functions.notation8" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=6;0,to=6;41)">
<omdoc:prototype>
<om:OMS cd="functions" name="sseteq"/>
</omdoc:prototype>
@@ -79,7 +68,8 @@
<m:mo>&#x2286;</m:mo>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:notation cd="functions" name="sseteq">
+ <omdoc:symbol name="sseteq" xml:id="functions.symbol9" about="#functions.symbol9" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=7;0,to=7;50)"/>
+ <omdoc:notation cd="functions" name="sseteq" stex:macro_name="sseteq" stex:nargs="2" xml:id="functions.notation10" about="#functions.notation10" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=7;0,to=7;50)">
<omdoc:prototype>
<om:OMA>
<om:OMS cd="functions" cr="fun" name="sseteq"/>
@@ -88,17 +78,13 @@
</om:OMA>
</omdoc:prototype>
<omdoc:rendering precedence="300">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <render name="arg1" precedence="300"/>
- <m:mo cr="fun">&#x2286;</m:mo>
- <render name="arg2" precedence="300"/>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
+ <omdoc:render name="arg1" precedence="300"/>
+ <m:mo cr="fun">&#x2286;</m:mo>
+ <omdoc:render name="arg2" precedence="300"/>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:symbol name="tup" xml:id="tup.sym" about="#tup.sym" stex:srcref="functions.tex#textrange(from=8;1,to=8;34)"/>
- <omdoc:notation cd="functions" name="tup">
+ <omdoc:symbol name="tup" xml:id="functions.symbol11" about="#functions.symbol11" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=8;0,to=8;33)"/>
+ <omdoc:notation cd="functions" name="tup" stex:macro_name="tup" stex:nargs="1" xml:id="functions.notation12" about="#functions.notation12" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=8;0,to=8;33)">
<omdoc:prototype>
<om:OMA>
<om:OMS cd="functions" cr="fun" name="tup"/>
@@ -106,12 +92,14 @@
</om:OMA>
</omdoc:prototype>
<omdoc:rendering>
- <m:mfenced open="&#x27E8;" close="&#x27E9;">
- <render name="arg1"/>
- </m:mfenced>
+ <m:mrow>
+ <m:mo stretchy="false">&#x27E8;</m:mo>
+ <omdoc:render name="arg1"/>
+ <m:mo stretchy="false">&#x27E9;</m:mo>
+ </m:mrow>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:notation cd="functions" name="cart">
+ <omdoc:notation cd="functions" name="cart" stex:macro_name="cart" stex:nargs="1" xml:id="functions.notation13" about="#functions.notation13" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=9;0,to=9;34)">
<omdoc:prototype>
<om:OMA>
<om:OMS cd="functions" cr="fun" name="cart"/>
@@ -119,20 +107,16 @@
</om:OMA>
</omdoc:prototype>
<omdoc:rendering>
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <omdoc:iterate name="args">
- <omdoc:separator>
- <m:mo cr="fun">&#xD7;</m:mo>
- </omdoc:separator>
- <omdoc:render name="arg"/>
- </omdoc:iterate>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
+ <omdoc:iterate name="args">
+ <omdoc:separator>
+ <m:mo cr="fun">&#xD7;</m:mo>
+ </omdoc:separator>
+ <omdoc:render name="arg"/>
+ </omdoc:iterate>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:symbol name="setdiff" xml:id="setdiff.sym" about="#setdiff.sym" stex:srcref="functions.tex#textrange(from=10;0,to=10;44)"/>
- <omdoc:notation cd="functions" name="setdiff">
+ <omdoc:symbol name="setdiff" xml:id="functions.symbol14" about="#functions.symbol14" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=10;0,to=10;44)"/>
+ <omdoc:notation cd="functions" name="setdiff" stex:macro_name="setdiffOp" stex:nargs="0" xml:id="functions.notation15" about="#functions.notation15" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=10;0,to=10;44)">
<omdoc:prototype>
<om:OMS cd="functions" name="setdiff"/>
</omdoc:prototype>
@@ -140,7 +124,8 @@
<m:mo>\</m:mo>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:notation cd="functions" name="setdiff">
+ <omdoc:symbol name="setdiff" xml:id="functions.symbol16" about="#functions.symbol16" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=11;0,to=11;59)"/>
+ <omdoc:notation cd="functions" name="setdiff" stex:macro_name="setdiff" stex:nargs="2" xml:id="functions.notation17" about="#functions.notation17" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=11;0,to=11;59)">
<omdoc:prototype>
<om:OMA>
<om:OMS cd="functions" cr="fun" name="setdiff"/>
@@ -149,17 +134,13 @@
</om:OMA>
</omdoc:prototype>
<omdoc:rendering precedence="600">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <render name="arg1" precedence="600"/>
- <m:mo cr="fun">\</m:mo>
- <render name="arg2" precedence="600"/>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
+ <omdoc:render name="arg1" precedence="600"/>
+ <m:mo cr="fun">\</m:mo>
+ <omdoc:render name="arg2" precedence="600"/>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:symbol name="set" xml:id="set.sym" about="#set.sym" stex:srcref="functions.tex#textrange(from=12;0,to=12;62)"/>
- <omdoc:notation cd="functions" name="set">
+ <omdoc:symbol name="set" xml:id="functions.symbol18" about="#functions.symbol18" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=12;0,to=12;62)"/>
+ <omdoc:notation cd="functions" name="set" stex:macro_name="set" stex:nargs="1" xml:id="functions.notation19" about="#functions.notation19" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=12;0,to=12;62)">
<omdoc:prototype>
<om:OMA>
<om:OMS cd="functions" cr="fun" name="set"/>
@@ -168,23 +149,19 @@
</omdoc:exprlist>
</om:OMA>
</omdoc:prototype>
- <omdoc:rendering precedence="1000000">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <m:mo cr="fun">{</m:mo>
- <omdoc:iterate name="args" precedence="-1000000">
- <omdoc:separator>
- <m:mo cr="fun">,</m:mo>
- </omdoc:separator>
- <omdoc:render name="arg" precedence="-1000000"/>
- </omdoc:iterate>
- <m:mo cr="fun">}</m:mo>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
+ <omdoc:rendering>
+ <m:mo cr="fun">{</m:mo>
+ <omdoc:iterate name="args" precedence="neginfty">
+ <omdoc:separator>
+ <m:mo cr="fun">,</m:mo>
+ </omdoc:separator>
+ <omdoc:render name="arg" precedence="neginfty"/>
+ </omdoc:iterate>
+ <m:mo cr="fun">}</m:mo>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:symbol name="setst" xml:id="setst.sym" about="#setst.sym" stex:srcref="functions.tex#textrange(from=13;1,to=13;67)"/>
- <omdoc:notation cd="functions" name="setst">
+ <omdoc:symbol name="setst" xml:id="functions.symbol20" about="#functions.symbol20" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=13;0,to=13;66)"/>
+ <omdoc:notation cd="functions" name="setst" stex:macro_name="setst" stex:nargs="2" xml:id="functions.notation21" about="#functions.notation21" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=13;0,to=13;66)">
<omdoc:prototype>
<om:OMA>
<om:OMS cd="functions" cr="fun" name="setst"/>
@@ -192,24 +169,19 @@
<omdoc:expr name="arg2"/>
</om:OMA>
</omdoc:prototype>
- <omdoc:rendering precedence="1000000">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <m:mo cr="fun">{</m:mo>
- <render name="arg1" precedence="-1000000"/>
- <m:mo cr="fun">&#x2223;</m:mo>
- <render name="arg2" precedence="-1000000"/>
- <m:mo cr="fun">}</m:mo>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
+ <omdoc:rendering>
+ <m:mo cr="fun">{</m:mo>
+ <omdoc:render name="arg1" precedence="neginfty"/>
+ <m:mo cr="fun">&#x2223;</m:mo>
+ <omdoc:render name="arg2" precedence="neginfty"/>
+ <m:mo cr="fun">}</m:mo>
</omdoc:rendering>
</omdoc:notation>
- <omdoc:symbol name="function" xml:id="function.def.sym" about="#function.def.sym" stex:srcref="functions.tex#textrange(from=14;0,to=16;16)"/>
- <omdoc:definition for="function" xml:id="functions.def" about="#functions.def" stex:srcref="functions.tex#textrange(from=14;0,to=16;16)">
- <omdoc:CMP xml:id="functions.def.CMP1" about="#functions.def.CMP1" stex:srcref="functions.tex#textrange(from=14;0,to=16;16)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="functions.def.CMP1.p1">A <omdoc:idx xml:id="functions.def.CMP1.p1.idx1" about="#functions.def.CMP1.p1.idx1" stex:srcref="functions.tex#textrange(from=14;68,to=15;19)"><omdoc:idt xml:id="functions.def.CMP1.p1.idx1.idt1" about="#functions.def.CMP1.p1.idx1.idt1" stex:srcref="functions.tex#textrange(from=14;68,to=15;19)"><omdoc:term cd="functions" name="function" role="definiendum" xml:id="functions.def.CMP1.p1.idx1.idt1.term1" about="#functions.def.CMP1.p1.idx1.idt1.term1" stex:srcref="functions.tex#textrange(from=14;68,to=15;19)">function</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="functions.def.CMP1.p1.idx1.ide2" about="#functions.def.CMP1.p1.idx1.ide2" stex:srcref="functions.tex#textrange(from=14;68,to=15;19)"><omdoc:idp>function</omdoc:idp></omdoc:ide></omdoc:idx><om:OMOBJ><om:OMA><om:OMS cd="functions" name="fun"/><om:OMV name="f"/><om:OMV name="A"/><om:OMV name="B"/></om:OMA></om:OMOBJ> is a left-total, right-unique relation in <om:OMOBJ><om:OMA><om:OMS cd="functions" name="cart"/><om:OMV name="A"/><om:OMV name="B"/></om:OMA></om:OMOBJ></p>
- </omdoc:CMP>
+ <omdoc:symbol name="function" xml:id="function.def.sym" about="#function.def.sym" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=14;0,to=16;16)"/>
+ <omdoc:definition for="function" xml:id="functions.def" about="#functions.def" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=14;0,to=16;16)">
+ <omdoc:CMP xml:id="functions.def.CMP1" about="#functions.def.CMP1" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=14;0,to=14;36)">
+<p xmlns="http://www.w3.org/1999/xhtml" id="functions.def.CMP1.p1" class="ltx_p" about="#functions.def.CMP1.p1" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=14;0,to=14;36)">A <omdoc:term cd="functions" name="function" role="definiendum" xml:id="functions.def.CMP1.p1.term1" about="#functions.def.CMP1.p1.term1" stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=14;67,to=15;20)">function</omdoc:term> <om:OMOBJ stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=14;61,to=15;32)"><om:OMA><om:OMS cd="functions" name="fun"/><om:OMV name="&#x1D453;"/><om:OMV name="&#x1D434;"/><om:OMV name="&#x1D435;"/></om:OMA></om:OMOBJ> is a left-total, right-unique relation in <om:OMOBJ stex:srcref="/Users/kohlhase/localmh/ext/sTeX/example/background/functions.tex#textrange(from=14;6,to=15;87)"><om:OMA><om:OMS cd="functions" name="cart"/><om:OMV name="&#x1D434;"/><om:OMV name="&#x1D435;"/></om:OMA></om:OMOBJ></p></omdoc:CMP>
</omdoc:definition>
- </theory>
+ </omdoc:theory>
</omdoc:omgroup>
</omdoc>
diff --git a/Master/texmf-dist/doc/latex/stex/example/background/functions.pdf b/Master/texmf-dist/doc/latex/stex/example/background/functions.pdf
new file mode 100644
index 00000000000..3a3765f9904
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/stex/example/background/functions.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stex/example/background/functions.sms b/Master/texmf-dist/doc/latex/stex/example/background/functions.sms
deleted file mode 100644
index ee824b72754..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/background/functions.sms
+++ /dev/null
@@ -1,13 +0,0 @@
-\begin{module}[id=functions]%
-\symdef[assocarg=1]{cart}[1]{\assoc[p=500]{\times}{#1}}%
-\symdef{fun}[3]{\mixfixiii[p=200]{}{#1}{\colon}{#2}{\rightarrow}{#3}{}}%
-\symdef{inset}[2]{\infix[p=650]{\in}{#1}{#2}}%
-\symdef[name=sseteq]{sseteqOp}{\subseteq} %
-\symdef{sseteq}[2]{\infix[p=300]\sseteqOp{#1}{#2}} %
-\symdef{tup}[1]{\langle#1\rangle}%
-\symdef{cart}[1]{\assoc\times{#1}}%
-\symdef[name=setdiff]{setdiffOp}{\backslash}%
-\symdef{setdiff}[2]{\mixfixii[p=600]{}{#1}\setdiffOp{#2}{}} %
-\symdef[assocarg=1]{set}[1]{\mixfixa[nobrackets]{\{}{#1}{\}},}%
-\symdef{setst}[2]{\mixfixii[nobrackets]{\{}{#1}{\,\mid\,}{#2}{\}}}%
-\end{module}%
diff --git a/Master/texmf-dist/doc/latex/stex/example/background/reals.omdoc b/Master/texmf-dist/doc/latex/stex/example/background/reals.omdoc
deleted file mode 100644
index 388eeb1a08f..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/background/reals.omdoc
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!--This OMDoc document is generated from an sTeX-encoded one via LaTeXML, you may want to reconsider editing it.-->
-<omdoc xmlns:omdoc="http://omdoc.org/ns" xmlns="http://omdoc.org/ns" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:stex="http://kwarc.info/ns/sTeX" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns" xmlns:om="http://www.openmath.org/OpenMath">
- <omdoc:omgroup layout="sectioning" xml:id="sec.reals" about="#sec.reals" stex:srcref="reals.tex#textrange(from=1;0,to=16;13)">
- <omdoc:metadata xml:id="sec.reals.metadata1" about="#sec.reals.metadata1" stex:srcref="reals.tex#textrange(from=1;0,to=15;12)">
- <dc:title xml:id="sec.reals.metadata1.title1" about="#sec.reals.metadata1.title1" stex:srcref="reals.tex#textrange(from=1;0,to=16;13)">Real Numbers</dc:title>
- </omdoc:metadata>
- <theory xml:id="reals" about="#reals" stex:srcref="reals.tex#textrange(from=2;0,to=15;12)">
- <imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/>
- <omdoc:symbol name="RealNumbers" xml:id="RealNumbers.sym" about="#RealNumbers.sym" stex:srcref="reals.tex#textrange(from=3;1,to=3;33)"/>
- <omdoc:notation cd="reals" name="RealNumbers">
- <omdoc:prototype>
- <om:OMS cd="reals" name="RealNumbers"/>
- </omdoc:prototype>
- <omdoc:rendering>
- <m:mi mathvariant="double-struck">R</m:mi>
- </omdoc:rendering>
- </omdoc:notation>
- <omdoc:symbol name="absval" xml:id="absval.sym" about="#absval.sym" stex:srcref="reals.tex#textrange(from=4;1,to=4;43)"/>
- <omdoc:notation cd="reals" name="absval">
- <omdoc:prototype>
- <om:OMA>
- <om:OMS cd="reals" cr="fun" name="absval"/>
- <omdoc:expr name="arg1"/>
- </om:OMA>
- </omdoc:prototype>
- <omdoc:rendering precedence="2000">
- <m:mrow>
- <m:mo egroup="fence" fence="true">(</m:mo>
- <m:mo cr="fun">|</m:mo>
- <render name="arg1" precedence="2000"/>
- <m:mo cr="fun">|</m:mo>
- <m:mo egroup="fence" fence="true">)</m:mo>
- </m:mrow>
- </omdoc:rendering>
- </omdoc:notation>
- <omdoc:symbol name="rfrac" xml:id="rfrac.sym" about="#rfrac.sym" stex:srcref="reals.tex#textrange(from=5;1,to=5;33)"/>
- <omdoc:notation cd="reals" name="rfrac">
- <omdoc:prototype>
- <om:OMA>
- <om:OMS cd="reals" cr="fun" name="rfrac"/>
- <omdoc:expr name="arg1"/>
- <omdoc:expr name="arg2"/>
- </om:OMA>
- </omdoc:prototype>
- <omdoc:rendering>
- <m:mfrac>
- <render name="arg1"/>
- <render name="arg2"/>
- </m:mfrac>
- </omdoc:rendering>
- </omdoc:notation>
- <omdoc:symbol name="real-numbers" xml:id="real-numbers.def.sym" about="#real-numbers.def.sym" stex:srcref="reals.tex#textrange(from=7;0,to=10;16)"/>
- <omdoc:definition for="real-numbers" xml:id="reals.def" about="#reals.def" stex:srcref="reals.tex#textrange(from=7;0,to=10;16)">
- <omdoc:CMP xml:id="reals.def.CMP1" about="#reals.def.CMP1" stex:srcref="reals.tex#textrange(from=7;0,to=10;16)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="reals.def.CMP1.p1">We denote the set of <omdoc:idx xml:id="reals.def.CMP1.p1.idx1" about="#reals.def.CMP1.p1.idx1" stex:srcref="reals.tex#textrange(from=7;27,to=8;44)"><omdoc:idt xml:id="reals.def.CMP1.p1.idx1.idt1" about="#reals.def.CMP1.p1.idx1.idt1" stex:srcref="reals.tex#textrange(from=7;27,to=8;44)"><omdoc:term cd="reals" name="real-numbers" role="definiendum" xml:id="reals.def.CMP1.p1.idx1.idt1.term1" about="#reals.def.CMP1.p1.idx1.idt1.term1" stex:srcref="reals.tex#textrange(from=7;27,to=8;44)">real numbers</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="reals.def.CMP1.p1.idx1.ide2" about="#reals.def.CMP1.p1.idx1.ide2" stex:srcref="reals.tex#textrange(from=7;27,to=8;44)"><omdoc:idp>real</omdoc:idp><omdoc:idp>numbers</omdoc:idp></omdoc:ide></omdoc:idx> we all know and love with
-<om:OMOBJ><om:OMS cd="reals" name="RealNumbers"/></om:OMOBJ>.</p>
- </omdoc:CMP>
- </omdoc:definition>
- <omdoc:definition xml:id="absval.def" about="#absval.def" stex:srcref="reals.tex#textrange(from=12;0,to=14;16)">
- <omdoc:CMP xml:id="absval.def.CMP1" about="#absval.def.CMP1" stex:srcref="reals.tex#textrange(from=12;0,to=14;16)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="absval.def.CMP1.p1">The absolute value <om:OMOBJ><om:OMA><om:OMS cd="reals" name="absval"/><om:OMV name="r"/></om:OMA></om:OMOBJ> of a real number <om:OMOBJ><om:OMV name="r"/></om:OMOBJ>.</p>
- </omdoc:CMP>
- </omdoc:definition>
- </theory>
- </omdoc:omgroup>
-</omdoc>
diff --git a/Master/texmf-dist/doc/latex/stex/example/background/reals.pdf b/Master/texmf-dist/doc/latex/stex/example/background/reals.pdf
new file mode 100644
index 00000000000..3d86cf28b07
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/stex/example/background/reals.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stex/example/background/reals.sms b/Master/texmf-dist/doc/latex/stex/example/background/reals.sms
deleted file mode 100644
index 437865ee78c..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/background/reals.sms
+++ /dev/null
@@ -1,5 +0,0 @@
-\begin{module}[id=reals]%
-\symdef{RealNumbers}{\mathbb{R}}%
-\symdef{absval}[1]{\mixfixi[p=2000]|{#1}|}%
-\symdef{rfrac}[2]{\frac{#1}{#2}}%
-\end{module}%
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/Makefile b/Master/texmf-dist/doc/latex/stex/example/paper/Makefile
index 1b71727ec2f..3d1a8d0e136 100644
--- a/Master/texmf-dist/doc/latex/stex/example/paper/Makefile
+++ b/Master/texmf-dist/doc/latex/stex/example/paper/Makefile
@@ -2,6 +2,6 @@ STEXDIR = ../..
TARGET = paper.tex
MODSLIBDIR = ../background
-include $(STEXDIR)/make/Makefile.vars
-all: omdoc mods pdf
-include $(STEXDIR)/make/Makefile.in
+include $(STEXDIR)/lib/make/Makefile.vars
+all: pdf mpdf
+include $(STEXDIR)/lib/make/Makefile.in
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/continuous.omdoc b/Master/texmf-dist/doc/latex/stex/example/paper/continuous.omdoc
deleted file mode 100644
index 19c248a26dd..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/paper/continuous.omdoc
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--This OMDoc document is generated from an sTeX-encoded one via LaTeXML, you may want to reconsider editing it.-->
-<omdoc xmlns:omdoc="http://omdoc.org/ns" xmlns="http://omdoc.org/ns" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:stex="http://kwarc.info/ns/sTeX" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns" xmlns:om="http://www.openmath.org/OpenMath">
- <omdoc:omgroup layout="sectioning" xml:id="sec.contfuncs" about="#sec.contfuncs" stex:srcref="continuous.tex#textrange(from=1;0,to=16;13)">
- <omdoc:metadata xml:id="sec.contfuncs.metadata1" about="#sec.contfuncs.metadata1" stex:srcref="continuous.tex#textrange(from=1;0,to=15;12)">
- <dc:title xml:id="sec.contfuncs.metadata1.title1" about="#sec.contfuncs.metadata1.title1" stex:srcref="continuous.tex#textrange(from=1;0,to=16;13)">Continuous Functions</dc:title>
- </omdoc:metadata>
- <theory xml:id="continuous" about="#continuous" stex:srcref="continuous.tex#textrange(from=2;0,to=15;12)">
- <imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/>
- <imports from="../../../slides/extcds/omstd/relation1.omdoc#relation1"/>
- <omdoc:imports from="../background/functions.omdoc#functions" xml:id="continuous.imports1" about="#continuous.imports1" stex:srcref="continuous.tex#textrange(from=3;0,to=3;46)"/>
- <omdoc:imports from="../background/reals.omdoc#reals" xml:id="continuous.imports2" about="#continuous.imports2" stex:srcref="continuous.tex#textrange(from=4;0,to=4;38)"/>
- <omdoc:symbol name="continuousfunctions" xml:id="continuousfunctions.sym" about="#continuousfunctions.sym" stex:srcref="continuous.tex#textrange(from=5;1,to=5;54)"/>
- <omdoc:notation cd="continuous" name="continuousfunctions">
- <omdoc:prototype>
- <om:OMA>
- <om:OMS cd="continuous" cr="fun" name="continuousfunctions"/>
- <omdoc:expr name="arg1"/>
- <omdoc:expr name="arg2"/>
- </om:OMA>
- </omdoc:prototype>
- <omdoc:rendering>
- <m:mrow>
- <m:msup>
- <m:mi mathvariant="script">C</m:mi>
- <m:mn>0</m:mn>
- </m:msup>
- <m:mo>&#x2062;</m:mo>
- <m:mfenced open="(" close=")">
- <m:mrow>
- <render name="arg1"/>
- <m:mo>,</m:mo>
- <render name="arg2"/>
- </m:mrow>
- </m:mfenced>
- </m:mrow>
- </omdoc:rendering>
- </omdoc:notation>
- <omdoc:symbol name="continuous" xml:id="continuous.def.sym" about="#continuous.def.sym" stex:srcref="continuous.tex#textrange(from=7;0,to=14;16)"/>
- <omdoc:symbol name="continuous-on" xml:id="continuous-on.def.sym" about="#continuous-on.def.sym" stex:srcref="continuous.tex#textrange(from=7;0,to=14;16)"/>
- <omdoc:definition for="continuousfunctions continuous continuous-on" xml:id="continuous.definition6" about="#continuous.definition6" stex:srcref="continuous.tex#textrange(from=7;0,to=14;16)">
- <omdoc:CMP xml:id="continuous.definition6.CMP1" about="#continuous.definition6.CMP1" stex:srcref="continuous.tex#textrange(from=7;0,to=14;16)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="continuous.definition6.CMP1.p1">A function <om:OMOBJ><om:OMA><om:OMS cd="functions" name="fun"/><om:OMV name="f"/><om:OMS cd="reals" name="RealNumbers"/><om:OMS cd="reals" name="RealNumbers"/></om:OMA></om:OMOBJ> is called <omdoc:idx xml:id="continuous.definition6.CMP1.p1.idx2" about="#continuous.definition6.CMP1.p1.idx2" stex:srcref="continuous.tex#textrange(from=7;4,to=8;75)"><omdoc:idt xml:id="continuous.definition6.CMP1.p1.idx2.idt1" about="#continuous.definition6.CMP1.p1.idx2.idt1" stex:srcref="continuous.tex#textrange(from=7;4,to=8;75)"><omdoc:term cd="continuous" name="continuous" role="definiendum" xml:id="continuous.definition6.CMP1.p1.idx2.idt1.term1" about="#continuous.definition6.CMP1.p1.idx2.idt1.term1" stex:srcref="continuous.tex#textrange(from=7;4,to=8;75)">continuous</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="continuous.definition6.CMP1.p1.idx2.ide2" about="#continuous.definition6.CMP1.p1.idx2.ide2" stex:srcref="continuous.tex#textrange(from=7;4,to=8;75)"><omdoc:idp>continuous</omdoc:idp></omdoc:ide></omdoc:idx> at
-<om:OMOBJ><om:OMA><om:OMS cd="functions" name="inset"/><om:OMV name="x"/><om:OMS cd="reals" name="RealNumbers"/></om:OMA></om:OMOBJ>, iff for all <om:OMOBJ><om:OMA><om:OMS cd="relation1" name="gt"/><om:OMV name="&#x3F5;"/><om:OMI>0</om:OMI></om:OMA></om:OMOBJ> there is a <om:OMOBJ><om:OMA><om:OMS cd="relation1" name="gt"/><om:OMV name="&#x3B4;"/><om:OMI>0</om:OMI></om:OMA></om:OMOBJ>, such that
-<om:OMOBJ><om:OMA><om:OMS cd="relation1" name="lt"/><om:OMA><om:OMS cd="reals" name="absval"/><om:OMA><om:OMS cd="arith1" name="minus"/><om:OMA><om:OMS cd="arith1" name="times"/><om:OMV name="f"/><om:OMV name="x"/></om:OMA><om:OMA><om:OMS cd="arith1" name="times"/><om:OMV name="f"/><om:OMV name="y"/></om:OMA></om:OMA></om:OMA><om:OMV name="&#x3F5;"/></om:OMA></om:OMOBJ> for all <om:OMOBJ><om:OMA><om:OMS cd="relation1" name="lt"/><om:OMA><om:OMS cd="reals" name="absval"/><om:OMA><om:OMS cd="arith1" name="minus"/><om:OMV name="x"/><om:OMV name="y"/></om:OMA></om:OMA><om:OMV name="&#x3B4;"/></om:OMA></om:OMOBJ>. It is called
-<omdoc:idx xml:id="continuous.definition6.CMP1.p1.idx8" about="#continuous.definition6.CMP1.p1.idx8" stex:srcref="continuous.tex#textrange(from=10;60,to=11;25)"><omdoc:idt xml:id="continuous.definition6.CMP1.p1.idx8.idt1" about="#continuous.definition6.CMP1.p1.idx8.idt1" stex:srcref="continuous.tex#textrange(from=10;60,to=11;25)"><omdoc:term cd="continuous" name="continuous-on" role="definiendum" xml:id="continuous.definition6.CMP1.p1.idx8.idt1.term1" about="#continuous.definition6.CMP1.p1.idx8.idt1.term1" stex:srcref="continuous.tex#textrange(from=10;60,to=11;25)">continuous on</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="continuous.definition6.CMP1.p1.idx8.ide2" about="#continuous.definition6.CMP1.p1.idx8.ide2" stex:srcref="continuous.tex#textrange(from=10;60,to=11;25)"><omdoc:idp>continuous</omdoc:idp><omdoc:idp>on</omdoc:idp></omdoc:ide></omdoc:idx> a set <om:OMOBJ><om:OMA><om:OMS cd="functions" name="sseteq"/><om:OMV name="S"/><om:OMS cd="reals" name="RealNumbers"/></om:OMA></om:OMOBJ>, iff is is continous at all
-<om:OMOBJ><om:OMA><om:OMS cd="functions" name="inset"/><om:OMV name="x"/><om:OMV name="S"/></om:OMA></om:OMOBJ>, the set of all such functions is denoted with <om:OMOBJ><om:OMA><om:OMS cd="continuous" name="continuousfunctions"/><om:OMV name="S"/><om:OMV name="T"/></om:OMA></om:OMOBJ>,
-if <om:OMOBJ><om:OMA><om:OMS cd="functions" name="sseteq"/><om:OMA><om:OMS cd="arith1" name="times"/><om:OMV name="f"/><om:OMV name="S"/></om:OMA><om:OMV name="T"/></om:OMA></om:OMOBJ>.</p>
- </omdoc:CMP>
- </omdoc:definition>
- </theory>
- </omdoc:omgroup>
-</omdoc>
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/continuous.pdf b/Master/texmf-dist/doc/latex/stex/example/paper/continuous.pdf
new file mode 100644
index 00000000000..7231d2b1fd9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/stex/example/paper/continuous.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/continuous.sms b/Master/texmf-dist/doc/latex/stex/example/paper/continuous.sms
deleted file mode 100644
index 6d42d0f52a6..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/paper/continuous.sms
+++ /dev/null
@@ -1,6 +0,0 @@
-\begin{module}[id=continuous]%
-\importmodule[\backmods{functions}]{functions}%
-\importmodule[\backmods{reals}]{reals}%
-\symdef{continuousfunctions}[2]{\mathcal{C}^0(#1,#2)}%
-\abbrdef{ContRR}[2]{\continuousfunctions\RealNumbers\RealNumbers}%
-\end{module}%
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/continuous.tex b/Master/texmf-dist/doc/latex/stex/example/paper/continuous.tex
index 96a8edd9123..dc90911f54b 100644
--- a/Master/texmf-dist/doc/latex/stex/example/paper/continuous.tex
+++ b/Master/texmf-dist/doc/latex/stex/example/paper/continuous.tex
@@ -1,7 +1,7 @@
\begin{omgroup}[id=sec.contfuncs]{Continuous Functions}
\begin{module}[id=continuous]
-\importmodule[\backmods{functions}]{functions}
-\importmodule[\backmods{reals}]{reals}
+\importmodule[load=\backmods{functions}]{functions}
+\importmodule[load=\backmods{reals}]{reals}
\symdef{continuousfunctions}[2]{\mathcal{C}^0(#1,#2)}
\abbrdef{ContRR}[2]{\continuousfunctions\RealNumbers\RealNumbers}
\begin{definition}[for=continuousfunctions]
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.omdoc b/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.omdoc
deleted file mode 100644
index 72cd7588bfd..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.omdoc
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--This OMDoc document is generated from an sTeX-encoded one via LaTeXML, you may want to reconsider editing it.-->
-<omdoc xmlns:omdoc="http://omdoc.org/ns" xmlns="http://omdoc.org/ns" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:stex="http://kwarc.info/ns/sTeX" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns" xmlns:om="http://www.openmath.org/OpenMath">
- <omdoc:omgroup layout="sectioning" xml:id="sec.differentiable" about="#sec.differentiable" stex:srcref="differentiable.tex#textrange(from=1;0,to=12;13)">
- <omdoc:metadata xml:id="sec.differentiable.metadata1" about="#sec.differentiable.metadata1" stex:srcref="differentiable.tex#textrange(from=1;0,to=11;12)">
- <dc:title xml:id="sec.differentiable.metadata1.title1" about="#sec.differentiable.metadata1.title1" stex:srcref="differentiable.tex#textrange(from=1;0,to=12;13)">Differentiable Functions</dc:title>
- </omdoc:metadata>
- <theory xml:id="differentiable" about="#differentiable" stex:srcref="differentiable.tex#textrange(from=2;0,to=11;12)">
- <imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/>
- <imports from="../../../slides/extcds/omstd/relation1.omdoc#relation1"/>
- <omdoc:imports from="./continuous.omdoc#continuous" xml:id="differentiable.imports1" about="#differentiable.imports1" stex:srcref="differentiable.tex#textrange(from=3;0,to=3;37)"/>
- <omdoc:symbol name="difffunctions" xml:id="difffunctions.sym" about="#difffunctions.sym" stex:srcref="differentiable.tex#textrange(from=4;1,to=4;48)"/>
- <omdoc:notation cd="differentiable" name="difffunctions">
- <omdoc:prototype>
- <om:OMA>
- <om:OMS cd="differentiable" cr="fun" name="difffunctions"/>
- <omdoc:expr name="arg1"/>
- <omdoc:expr name="arg2"/>
- </om:OMA>
- </omdoc:prototype>
- <omdoc:rendering>
- <m:mrow>
- <m:msup>
- <m:mi mathvariant="script">C</m:mi>
- <m:mn>1</m:mn>
- </m:msup>
- <m:mo>&#x2062;</m:mo>
- <m:mfenced open="(" close=")">
- <m:mrow>
- <render name="arg1"/>
- <m:mo>,</m:mo>
- <render name="arg2"/>
- </m:mrow>
- </m:mfenced>
- </m:mrow>
- </omdoc:rendering>
- </omdoc:notation>
- <omdoc:symbol name="differentiable" xml:id="differentiable.def.sym" about="#differentiable.def.sym" stex:srcref="differentiable.tex#textrange(from=6;1,to=10;16)"/>
- <omdoc:definition for="differentiable" xml:id="differentiable.definition4" about="#differentiable.definition4" stex:srcref="differentiable.tex#textrange(from=6;1,to=10;16)">
- <omdoc:CMP xml:id="differentiable.definition4.CMP1" about="#differentiable.definition4.CMP1" stex:srcref="differentiable.tex#textrange(from=6;1,to=10;16)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="differentiable.definition4.CMP1.p1">A function <om:OMOBJ><om:OMA><om:OMS cd="functions" name="fun"/><om:OMV name="f"/><om:OMS cd="reals" name="RealNumbers"/><om:OMS cd="reals" name="RealNumbers"/></om:OMA></om:OMOBJ> is called <omdoc:idx xml:id="differentiable.definition4.CMP1.p1.idx2" about="#differentiable.definition4.CMP1.p1.idx2" stex:srcref="differentiable.tex#textrange(from=6;4,to=7;78)"><omdoc:idt xml:id="differentiable.definition4.CMP1.p1.idx2.idt1" about="#differentiable.definition4.CMP1.p1.idx2.idt1" stex:srcref="differentiable.tex#textrange(from=6;4,to=7;78)"><omdoc:term cd="differentiable" name="differentiable" role="definiendum" xml:id="differentiable.definition4.CMP1.p1.idx2.idt1.term1" about="#differentiable.definition4.CMP1.p1.idx2.idt1.term1" stex:srcref="differentiable.tex#textrange(from=6;4,to=7;78)">differentiable</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="differentiable.definition4.CMP1.p1.idx2.ide2" about="#differentiable.definition4.CMP1.p1.idx2.ide2" stex:srcref="differentiable.tex#textrange(from=6;4,to=7;78)"><omdoc:idp>differentiable</omdoc:idp></omdoc:ide></omdoc:idx> at
-<om:OMOBJ><om:OMA><om:OMS cd="functions" name="inset"/><om:OMV name="x"/><om:OMS cd="reals" name="RealNumbers"/></om:OMA></om:OMOBJ>, iff for all <om:OMOBJ><om:OMA><om:OMS cd="relation1" name="gt"/><om:OMV name="&#x3F5;"/><om:OMI>0</om:OMI></om:OMA></om:OMOBJ> there is a <om:OMOBJ><om:OMA><om:OMS cd="relation1" name="gt"/><om:OMV name="&#x3B4;"/><om:OMI>0</om:OMI></om:OMA></om:OMOBJ>, such that
-<om:OMOBJ><om:OMA><om:OMS cd="relation1" name="lt"/><om:OMA><om:OMS cd="reals" name="rfrac"/><om:OMA><om:OMS cd="reals" name="absval"/><om:OMA><om:OMS cd="arith1" name="minus"/><om:OMA><om:OMS cd="arith1" name="times"/><om:OMV name="f"/><om:OMV name="x"/></om:OMA><om:OMA><om:OMS cd="arith1" name="times"/><om:OMV name="f"/><om:OMV name="y"/></om:OMA></om:OMA></om:OMA><om:OMA><om:OMS cd="reals" name="absval"/><om:OMA><om:OMS cd="arith1" name="minus"/><om:OMV name="x"/><om:OMV name="y"/></om:OMA></om:OMA></om:OMA><om:OMV name="&#x3F5;"/></om:OMA></om:OMOBJ> for all <om:OMOBJ><om:OMA><om:OMS cd="relation1" name="lt"/><om:OMA><om:OMS cd="reals" name="absval"/><om:OMA><om:OMS cd="arith1" name="minus"/><om:OMV name="x"/><om:OMV name="y"/></om:OMA></om:OMA><om:OMV name="&#x3B4;"/></om:OMA></om:OMOBJ>.</p>
- </omdoc:CMP>
- </omdoc:definition>
- </theory>
- </omdoc:omgroup>
-</omdoc>
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.pdf b/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.pdf
new file mode 100644
index 00000000000..884d41ac3bc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.sms b/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.sms
deleted file mode 100644
index cb2122c1064..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.sms
+++ /dev/null
@@ -1,5 +0,0 @@
-\begin{module}[id=differentiable]%
-\importmodule[continuous]{continuous}%
-\symdef{difffunctions}[2]{\mathcal{C}^1(#1,#2)}%
-\abbrdef{DiffRR}[2]{\difffunctions\RealNumbers\RealNumbers}%
-\end{module}%
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.tex b/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.tex
index fca1c7fe252..da999f014db 100644
--- a/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.tex
+++ b/Master/texmf-dist/doc/latex/stex/example/paper/differentiable.tex
@@ -1,6 +1,6 @@
\begin{omgroup}[id=sec.differentiable]{Differentiable Functions}
\begin{module}[id=differentiable]
-\importmodule[continuous]{continuous}
+\importmodule[load=continuous]{continuous}
\symdef{difffunctions}[2]{\mathcal{C}^1(#1,#2)}
\abbrdef{DiffRR}[2]{\difffunctions\RealNumbers\RealNumbers}
\begin{definition}
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/intro.omdoc b/Master/texmf-dist/doc/latex/stex/example/paper/intro.omdoc
deleted file mode 100644
index a4fe8c85f96..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/paper/intro.omdoc
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-<!--This OMDoc document is generated from an sTeX-encoded one via LaTeXML, you may want to reconsider editing it.-->
-<omdoc xmlns:omdoc="http://omdoc.org/ns" xmlns="http://omdoc.org/ns" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:stex="http://kwarc.info/ns/sTeX" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns" xmlns:om="http://www.openmath.org/OpenMath">
- <omdoc:omgroup layout="sectioning" xml:id="intro" about="#intro" stex:srcref="intro.tex#textrange(from=1;0,to=91;13)"><omdoc:metadata xml:id="intro.metadata1" about="#intro.metadata1" stex:srcref="intro.tex#textrange(from=1;0,to=1;39)"><dc:title xml:id="intro.metadata1.title1" about="#intro.metadata1.title1" stex:srcref="intro.tex#textrange(from=1;0,to=91;13)">Introduction</dc:title></omdoc:metadata>
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="intro.p1">
- <p style="" class="p" id="intro.p1.p1">We will show how to semantically mark up mathematics in the sTeX
-format&#xA0;<cite class="cite">[<citation xmlns="http://omdoc.org/ns" bibrefs="kohlhase:ulsmf08"/>]</cite> and how to convert it into
-OMDoc&#xA0;<cite class="cite">[<citation xmlns="http://omdoc.org/ns" bibrefs="kohlhase:omdoc1.3"/>]</cite>.</p>
- </div>
-
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="intro.p2">
- <p style="" class="p" id="intro.p2.p1">We have some mathematical material in <omdoc:oref href="#sec.math"/> which will serve as example
-content. In the rest of this section we will explain the setup of the example and
-present an approach to automation of the OMDoc conversion via Unix Makefiles.</p>
- </div>
-<omdoc:omgroup layout="sectioning" xml:id="intro.omgroup4" about="#intro.omgroup4" stex:srcref="intro.tex#textrange(from=9;0,to=43;13)"><omdoc:metadata xml:id="intro.omgroup4.metadata1" about="#intro.omgroup4.metadata1" stex:srcref="intro.tex#textrange(from=9;0,to=42;12)"><dc:title xml:id="intro.omgroup4.metadata1.title1" about="#intro.omgroup4.metadata1.title1" stex:srcref="intro.tex#textrange(from=9;0,to=43;13)">The Setup</dc:title></omdoc:metadata><theory xml:id="setup" about="#setup" stex:srcref="intro.tex#textrange(from=10;0,to=42;12)"><omdoc:symbol name="target" xml:id="target.def.sym" about="#target.def.sym" stex:srcref="intro.tex#textrange(from=11;0,to=18;20)"/><omdoc:symbol name="module" xml:id="module.def.sym" about="#module.def.sym" stex:srcref="intro.tex#textrange(from=11;0,to=18;20)"/><omdoc:definition for="target module" xml:id="setup.definition3" about="#setup.definition3" stex:srcref="intro.tex#textrange(from=11;0,to=18;20)"><omdoc:CMP xml:id="setup.definition3.CMP1" about="#setup.definition3.CMP1" stex:srcref="intro.tex#textrange(from=11;0,to=18;20)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="setup.definition3.CMP1.p1">The source of this note is contained in the file <span style="" class="text typewriter">paper.tex</span>. We call it
-the <omdoc:idx xml:id="setup.definition3.CMP1.p1.idx1" about="#setup.definition3.CMP1.p1.idx1" stex:srcref="intro.tex#textrange(from=12;59,to=13;23)"><omdoc:idt xml:id="setup.definition3.CMP1.p1.idx1.idt1" about="#setup.definition3.CMP1.p1.idx1.idt1" stex:srcref="intro.tex#textrange(from=12;59,to=13;23)"><omdoc:term cd="setup" name="target" role="definiendum" xml:id="setup.definition3.CMP1.p1.idx1.idt1.term1" about="#setup.definition3.CMP1.p1.idx1.idt1.term1" stex:srcref="intro.tex#textrange(from=12;59,to=13;23)">target</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="setup.definition3.CMP1.p1.idx1.ide2" about="#setup.definition3.CMP1.p1.idx1.ide2" stex:srcref="intro.tex#textrange(from=12;59,to=13;23)"><omdoc:idp>target</omdoc:idp></omdoc:ide></omdoc:idx>, since formatting it with LaTeX will generate the main
-document. The content in <omdoc:oref href="#sec.contfuncs"/> and <omdoc:oref href="#sec.differentiable"/>
-comes from included files <span style="" class="text typewriter">continuous.tex</span> and
-<span style="" class="text typewriter">differentiable.tex</span>, we will call them <omdoc:idx xml:id="setup.definition3.CMP1.p1.idx2" about="#setup.definition3.CMP1.p1.idx2" stex:srcref="intro.tex#textrange(from=15;18,to=16;68)"><omdoc:idt xml:id="setup.definition3.CMP1.p1.idx2.idt1" about="#setup.definition3.CMP1.p1.idx2.idt1" stex:srcref="intro.tex#textrange(from=15;18,to=16;68)"><omdoc:term cd="setup" name="module" role="definiendum" xml:id="setup.definition3.CMP1.p1.idx2.idt1.term1" about="#setup.definition3.CMP1.p1.idx2.idt1.term1" stex:srcref="intro.tex#textrange(from=15;18,to=16;68)">module</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="setup.definition3.CMP1.p1.idx2.ide2" about="#setup.definition3.CMP1.p1.idx2.ide2" stex:srcref="intro.tex#textrange(from=15;18,to=16;68)"><omdoc:idp>module</omdoc:idp></omdoc:ide></omdoc:idx>s, since they may
-be used (i.e. included) by other target documents as well.</p>
- </omdoc:CMP></omdoc:definition><omdoc:omtext xml:id="setup.omtext4" about="#setup.omtext4" stex:srcref="intro.tex#textrange(from=20;1,to=31;14)"><omdoc:CMP xml:id="setup.omtext4.CMP1" about="#setup.omtext4.CMP1" stex:srcref="intro.tex#textrange(from=20;1,to=31;14)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="setup.omtext4.CMP1.p1">As the modules are built for inclusion into other documents, they are not
-self-contained:</p>
-
- <ol xmlns="http://www.w3.org/1999/xhtml" class="enumerate" id="I5">
-
- <li class="item" id="I5.i1">
-
- <div class="para" id="I5.i1.p1">
- <p style="" class="p" id="I5.i1.p1.p1">they do not contain a LaTeX preamble and
-<code class="verbatim typewriter" style="">\begin</code>/<code class="verbatim typewriter" style="">\end{document}</code>, and</p>
- </div>
-
- </li>
-
- <li class="item" id="I5.i2">
-
- <div class="para" id="I5.i2.p1">
- <p style="" class="p" id="I5.i2.p1.p1">they may depend on other modules, whose semantic macros they need to include,</p>
- </div>
-
- </li>
-
- <li class="item" id="I5.i3">
-
- <div class="para" id="I5.i3.p1">
- <p style="" class="p" id="I5.i3.p1.p1">to facilitate this a module file <span style="" class="text typewriter">modf.tex</span> comes with a &#x201C;semantic
-macro short form&#x201D; <span style="" class="text typewriter">modf.sms</span> that can be included without generating
-output in the PDF.</p>
- </div>
-
- </li>
-
- </ol>
- </omdoc:CMP></omdoc:omtext><omdoc:omtext xml:id="setup.omtext5" about="#setup.omtext5" stex:srcref="intro.tex#textrange(from=33;1,to=41;14)"><omdoc:CMP xml:id="setup.omtext5.CMP1" about="#setup.omtext5.CMP1" stex:srcref="intro.tex#textrange(from=33;1,to=41;14)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="setup.omtext5.CMP1.p1">This will have consequences for the automation. Concretely, the module on
-differentiable functions in <omdoc:oref href="#sec.differentiable"/> depends on that for continuous
-functions in <omdoc:oref href="#sec.contfuncs"/>. Both of them depend on modules for real numbers,
-sets and functions that we do not want to cover in this note. <span style="" class="text inlinedef">We assume
-that they have already been marked up with the same methods as we describe here and
-are accessible to us and call them <omdoc:idx xml:id="setup.omtext5.CMP1.p1.idx1" about="#setup.omtext5.CMP1.p1.idx1" stex:srcref="intro.tex#textrange(from=33;1,to=33;17)"><omdoc:idt xml:id="setup.omtext5.CMP1.p1.idx1.idt1" about="#setup.omtext5.CMP1.p1.idx1.idt1" stex:srcref="intro.tex#textrange(from=33;1,to=33;17)"><omdoc:term cd="setup" name="background-module" role="definiendum" xml:id="setup.omtext5.CMP1.p1.idx1.idt1.term1" about="#setup.omtext5.CMP1.p1.idx1.idt1.term1" stex:srcref="intro.tex#textrange(from=33;1,to=33;17)">background module</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="setup.omtext5.CMP1.p1.idx1.ide2" about="#setup.omtext5.CMP1.p1.idx1.ide2" stex:srcref="intro.tex#textrange(from=33;1,to=33;17)"><omdoc:idp>background</omdoc:idp><omdoc:idp>module</omdoc:idp></omdoc:ide></omdoc:idx>s</span>. In our setup we
-keep them in the subdirectory <span style="" class="text typewriter">background</span>.</p>
- </omdoc:CMP></omdoc:omtext></theory></omdoc:omgroup><omdoc:omgroup layout="sectioning" xml:id="intro.omgroup5" about="#intro.omgroup5" stex:srcref="intro.tex#textrange(from=45;0,to=53;13)"><omdoc:metadata xml:id="intro.omgroup5.metadata1" about="#intro.omgroup5.metadata1" stex:srcref="intro.tex#textrange(from=45;0,to=45;51)"><dc:title xml:id="intro.omgroup5.metadata1.title1" about="#intro.omgroup5.metadata1.title1" stex:srcref="intro.tex#textrange(from=45;0,to=53;13)">Formatting and OMDoc conversion</dc:title></omdoc:metadata>
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="intro.omgroup5.p1">
- <p style="" class="p" id="intro.omgroup5.p1.p1">To format an sTeX document &#x2014; i.e. to produce a PDF file from the sTeX marked-up
-sources &#x2014; we only need to run the <span style="" class="text typewriter">pdflatex</span> program over the target document
-&#x2014; assuming that all modules (regular or background) have semantic macro short forms.</p>
- </div>
-
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="intro.omgroup5.p2">
- <p style="" class="p" id="intro.omgroup5.p2.p1">To convert an sTeX document to OMDoc, we need to run <span style="" class="text typewriter">latexml</span> over it,
-post-process the result by <span style="" class="text typewriter">latexmlpost</span>, and finally massage away all remaining
-LaTeXML islands with a stylesheet, see &#xA0;<cite class="cite">[<citation xmlns="http://omdoc.org/ns" bibrefs="kohlhase:ssmtl*"/>]</cite> for details.</p>
- </div>
-</omdoc:omgroup><omdoc:omgroup layout="sectioning" xml:id="intro.omgroup6" about="#intro.omgroup6" stex:srcref="intro.tex#textrange(from=55;0,to=89;13)"><omdoc:metadata xml:id="intro.omgroup6.metadata1" about="#intro.omgroup6.metadata1" stex:srcref="intro.tex#textrange(from=55;0,to=55;42)"><dc:title xml:id="intro.omgroup6.metadata1.title1" about="#intro.omgroup6.metadata1.title1" stex:srcref="intro.tex#textrange(from=55;0,to=89;13)">Makefile-based Automation</dc:title></omdoc:metadata>
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="intro.omgroup6.p1">
- <p style="" class="p" id="intro.omgroup6.p1.p1">As the conversion to OMDoc is rather complex (the programs in the three steps take a
-variety of options), we support an automation by Unix Makefiles. There are three main
-<span style="" class="text typewriter">make</span> targets.</p>
- </div>
-
- <dl xmlns="http://www.w3.org/1999/xhtml" class="description" id="I6">
-
- <dt class="item" id="I6.i1"><span class="tag"><span style="" class="text typewriter">make omdoc</span></span></dt>
- <dd class="item">
- <div class="para" id="I6.i1.p1">
- <p style="" class="p" id="I6.i1.p1.p1">will trigger the OMDoc transformation of the target
-document.</p>
- </div>
-</dd>
-
- <dt class="item" id="I6.i2"><span class="tag"><span style="" class="text typewriter">make mods</span></span></dt>
- <dd class="item">
- <div class="para" id="I6.i2.p1">
- <p style="" class="p" id="I6.i2.p1.p1">will trigger the OMDoc transformation of the modules.</p>
- </div>
-</dd>
-
- <dt class="item" id="I6.i3"><span class="tag"><span style="" class="text typewriter">make pdf</span></span></dt>
- <dd class="item">
- <div class="para" id="I6.i3.p1">
- <p style="" class="p" id="I6.i3.p1.p1">will trigger the LaTeX formatting the target</p>
- </div>
-</dd>
-
- <dt class="item" id="I6.i4"><span class="tag"><span style="" class="text typewriter">make mpdf</span></span></dt>
- <dd class="item">
- <div class="para" id="I6.i4.p1">
- <p style="" class="p" id="I6.i4.p1.p1">will trigger the LaTeX formatting the modules</p>
- </div>
-</dd>
-
- <dt class="item" id="I6.i5"><span class="tag"><span style="" class="text typewriter">make sms</span></span></dt>
- <dd class="item">
- <div class="para" id="I6.i5.p1">
- <p style="" class="p" id="I6.i5.p1.p1">will trigger the re-generation of all semantic macro short
-forms of modules (this is implicitly called in all the other <span style="" class="text typewriter">make</span> targets)</p>
- </div>
-</dd>
-
- </dl>
-
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="intro.omgroup6.p2">
- <p style="" class="p" id="intro.omgroup6.p2.p1">To use this, we need to set up a <span style="" class="text typewriter">Makefile</span> of the following form:</p>
- </div>
-
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="intro.omgroup6.p3">
- <p style="" class="p" id="intro.omgroup6.p3.p1">The variable <span style="" class="text listing ">STEXDIR}}<span style="" class="text lstspace">&#xA0;</span>has<span style="" class="text lstspace">&#xA0;</span>to<span style="" class="text lstspace">&#xA0;</span>be<span style="" class="text lstspace">&#xA0;</span>set<span style="" class="text lstspace">&#xA0;</span>to<span style="" class="text lstspace">&#xA0;</span>the<span style="" class="text lstspace">&#xA0;</span>main<span style="" class="text lstspace">&#xA0;</span>directory<span style="" class="text lstspace">&#xA0;</span>of<span style="" class="text lstspace">&#xA0;</span>the</span>sTeX
-distribution. The variable <span style="" class="text listing ">TARGET}}<span style="" class="text lstspace">&#xA0;</span>specifies<span style="" class="text lstspace">&#xA0;</span>the<span style="" class="text lstspace">&#xA0;</span>target<span style="" class="text lstspace">&#xA0;</span>document<span style="" class="text lstspace">&#xA0;</span>(all<span style="" class="text lstspace">&#xA0;</span>other</span><span style="" class="text typewriter">*.tex</span> files that are not excluded in the <span style="" class="text listing ">BUTFILES}}<span style="" class="text lstspace">&#xA0;</span>variables<span style="" class="text lstspace">&#xA0;</span>are<span style="" class="text lstspace">&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;</span>considered<span style="" class="text lstspace">&#xA0;</span>as<span style="" class="text lstspace">&#xA0;</span>modules).<span style="" class="text lstspace">&#xA0;</span>Here,<span style="" class="text lstspace">&#xA0;</span>the</span><span style="" class="text typewriter">background</span> directory for convenience. The
-<span style="" class="text listing ">MODSLIBDIR}}<span style="" class="text lstspace">&#xA0;</span>specifies<span style="" class="text lstspace">&#xA0;</span>the<span style="" class="text lstspace">&#xA0;</span>location<span style="" class="text lstspace">&#xA0;</span>of<span style="" class="text lstspace">&#xA0;</span>the<span style="" class="text lstspace">&#xA0;</span>prefix<span style="" class="text lstspace">&#xA0;</span>and<span style="" class="text lstspace">&#xA0;</span>postfix<span style="" class="text lstspace">&#xA0;</span>files</span><span style="" class="text typewriter">pre.tex</span> and <span style="" class="text typewriter">post.tex</span> that will be prepended and appended to the
-modules to make them into complete files TeX files that can be converted. The last
-three lines just include the Makefiles from the sTeX distribution and configure the
-default make target (<span style="" class="text typewriter">make all</span>) to be produce the pdf version</p>
- </div>
-
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="intro.omgroup6.p4">
- <p style="" class="p" id="intro.omgroup6.p4.p1">Note that in the directory <span style="" class="text typewriter">background</span> we have a very similar Makefile as
-above. The only differences are that the variable <span style="" class="text listing ">STEXDIR}}<span style="" class="text lstspace">&#xA0;</span>is<span style="" class="text lstspace">&#xA0;</span>adapted<span style="" class="text lstspace">&#xA0;</span>and<span style="" class="text lstspace">&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;</span>that<span style="" class="text lstspace">&#xA0;</span>the</span><span style="" class="text listing ">BUTFILE}}<span style="" class="text lstspace">&#xA0;</span>variable<span style="" class="text lstspace">&#xA0;</span>is<span style="" class="text lstspace">&#xA0;</span>set<span style="" class="text lstspace">&#xA0;</span>to</span><span style="" class="text typewriter">pre.tex</span> and
-<span style="" class="text typewriter">post.tex</span>, so that they are not converted. In the directory
-<span style="" class="text typewriter">background</span> we have followed good practice by establishing a phony</p>
- </div>
-</omdoc:omgroup></omdoc:omgroup>
-</omdoc>
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/intro.pdf b/Master/texmf-dist/doc/latex/stex/example/paper/intro.pdf
new file mode 100644
index 00000000000..244a57a49c4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/stex/example/paper/intro.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/intro.sms b/Master/texmf-dist/doc/latex/stex/example/paper/intro.sms
deleted file mode 100644
index 156422aefd8..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/paper/intro.sms
+++ /dev/null
@@ -1,2 +0,0 @@
- \begin{module}[id=setup]%
-\end{module}%
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/paper.omdoc b/Master/texmf-dist/doc/latex/stex/example/paper/paper.omdoc
deleted file mode 100644
index abb6db85073..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/paper/paper.omdoc
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--This OMDoc document is generated from an sTeX-encoded one via LaTeXML, you may want to reconsider editing it.-->
-<omdoc xmlns:omdoc="http://omdoc.org/ns" xmlns="http://omdoc.org/ns" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:stex="http://kwarc.info/ns/sTeX" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns" xmlns:om="http://www.openmath.org/OpenMath">
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="p1">
- <p style="" class="p" id="p1.p1"><omdoc:oref class="expandable" href="intro.omdoc"/></p>
- </div>
-<omdoc:omgroup layout="sectioning" xml:id="sec.math" about="#sec.math" stex:srcref="paper.tex#textrange(from=40;0,to=133;13)"><omdoc:metadata xml:id="sec.math.metadata1" about="#sec.math.metadata1" stex:srcref="paper.tex#textrange(from=40;0,to=45;13)"><dc:title xml:id="sec.math.metadata1.title1" about="#sec.math.metadata1.title1" stex:srcref="paper.tex#textrange(from=40;0,to=133;13)">Mathematical Content</dc:title></omdoc:metadata><omdoc:omgroup layout="sectioning" xml:id="sec.math.omgroup2" about="#sec.math.omgroup2" stex:srcref="paper.tex#textrange(from=41;0,to=45;13)"><omdoc:metadata xml:id="sec.math.omgroup2.metadata1" about="#sec.math.omgroup2.metadata1" stex:srcref="paper.tex#textrange(from=41;0,to=41;27)"><dc:title xml:id="sec.math.omgroup2.metadata1.title1" about="#sec.math.omgroup2.metadata1.title1" stex:srcref="paper.tex#textrange(from=41;0,to=45;13)">Calculus</dc:title></omdoc:metadata>
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="sec.math.omgroup2.p1">
- <p style="" class="p" id="sec.math.omgroup2.p1.p1">We present some standard mathematical definitions, here from calculus.
-<omdoc:oref class="expandable" href="continuous.omdoc"/><omdoc:oref class="expandable" href="differentiable.omdoc"/></p>
- </div>
-</omdoc:omgroup><omdoc:omgroup layout="sectioning" xml:id="sec.matha" about="#sec.matha" stex:srcref="paper.tex#textrange(from=47;0,to=132;13)"><omdoc:metadata xml:id="sec.matha.metadata1" about="#sec.matha.metadata1" stex:srcref="paper.tex#textrange(from=47;0,to=47;67)"><dc:title xml:id="sec.matha.metadata1.title1" about="#sec.matha.metadata1.title1" stex:srcref="paper.tex#textrange(from=47;0,to=132;13)">A Theory Graph for Elementary Algebra</dc:title></omdoc:metadata>
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="sec.matha.p1">
- <p style="" class="p" id="sec.matha.p1.p1">Here we show an example for more advanced theory graph manipulations, in particular
-imports via morphisms.
-</p>
- </div>
-<theory xml:id="magma" about="#magma" stex:srcref="paper.tex#textrange(from=51;0,to=60;12)"><imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/><imports from="../../../slides/extcds/omstd/relation1.omdoc#relation1"/><omdoc:imports from="../background/functions.omdoc#functions" xml:id="magma.imports1" about="#magma.imports1" stex:srcref="paper.tex#textrange(from=52;0,to=52;48)"/><omdoc:symbol name="magbase" xml:id="magbase.sym" about="#magbase.sym" stex:srcref="paper.tex#textrange(from=53;1,to=53;22)"/><omdoc:notation cd="magma" name="magbase"><omdoc:prototype><om:OMS cd="magma" name="magbase"/></omdoc:prototype><omdoc:rendering><m:mi>G</m:mi></omdoc:rendering></omdoc:notation><omdoc:symbol name="magmaop" xml:id="magmaop.sym" about="#magmaop.sym" stex:srcref="paper.tex#textrange(from=54;0,to=54;41)"/><omdoc:notation cd="magma" name="magmaop"><omdoc:prototype><om:OMS cd="magma" name="magmaop"/></omdoc:prototype><omdoc:rendering><m:mo>&#x2218;</m:mo></omdoc:rendering></omdoc:notation><omdoc:notation cd="magma" name="magmaop"><omdoc:prototype><om:OMA><om:OMS cd="magma" cr="fun" name="magmaop"/><omdoc:expr name="arg1"/><omdoc:expr name="arg2"/></om:OMA></omdoc:prototype><omdoc:rendering><m:mrow><m:mo egroup="fence" fence="true">(</m:mo><render name="arg1"/><m:mo cr="fun">&#x2218;</m:mo><render name="arg2"/><m:mo egroup="fence" fence="true">)</m:mo></m:mrow></omdoc:rendering></omdoc:notation><omdoc:symbol name="magma" xml:id="magma.def.sym" about="#magma.def.sym" stex:srcref="paper.tex#textrange(from=56;0,to=59;17)"/><omdoc:definition for="magma" xml:id="magma.def" about="#magma.def" stex:srcref="paper.tex#textrange(from=56;0,to=59;17)"><omdoc:CMP xml:id="magma.def.CMP1" about="#magma.def.CMP1" stex:srcref="paper.tex#textrange(from=56;0,to=59;17)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="magma.def.CMP1.p1">A <omdoc:idx xml:id="magma.def.CMP1.p1.idx1" about="#magma.def.CMP1.p1.idx1" stex:srcref="paper.tex#textrange(from=56;68,to=57;18)"><omdoc:idt xml:id="magma.def.CMP1.p1.idx1.idt1" about="#magma.def.CMP1.p1.idx1.idt1" stex:srcref="paper.tex#textrange(from=56;68,to=57;18)"><omdoc:term cd="magma" name="magma" role="definiendum" xml:id="magma.def.CMP1.p1.idx1.idt1.term1" about="#magma.def.CMP1.p1.idx1.idt1.term1" stex:srcref="paper.tex#textrange(from=56;68,to=57;18)">magma</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="magma.def.CMP1.p1.idx1.ide2" about="#magma.def.CMP1.p1.idx1.ide2" stex:srcref="paper.tex#textrange(from=56;68,to=57;18)"><omdoc:idp>magma</omdoc:idp></omdoc:ide></omdoc:idx> is a structure <om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMS cd="magma" name="magbase"/><om:OMS cd="magma" name="magmaop"/></om:OMA></om:OMOBJ>, such that <om:OMOBJ><om:OMS cd="magma" name="magbase"/></om:OMOBJ> is
-closed under the operation <om:OMOBJ><om:OMA><om:OMS cd="functions" name="fun"/><om:OMS cd="magma" name="magmaop"/><om:OMA><om:OMS cd="functions" name="cart"/><om:OMS cd="magma" name="magbase"/><om:OMS cd="magma" name="magbase"/></om:OMA><om:OMS cd="magma" name="magbase"/></om:OMA></om:OMOBJ>.</p>
- </omdoc:CMP></omdoc:definition></theory><theory xml:id="semigroup" about="#semigroup" stex:srcref="paper.tex#textrange(from=62;0,to=68;12)"><imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/><imports from="../../../slides/extcds/omstd/relation1.omdoc#relation1"/><omdoc:imports from="#magma" xml:id="semigroup.imports1" about="#semigroup.imports1" stex:srcref="paper.tex#textrange(from=63;0,to=63;22)"/><omdoc:symbol name="semigroup" xml:id="semigroup.def.sym" about="#semigroup.def.sym" stex:srcref="paper.tex#textrange(from=64;0,to=67;18)"/><omdoc:definition for="semigroup" xml:id="semigroup.def" about="#semigroup.def" stex:srcref="paper.tex#textrange(from=64;0,to=67;18)"><omdoc:CMP xml:id="semigroup.def.CMP1" about="#semigroup.def.CMP1" stex:srcref="paper.tex#textrange(from=64;0,to=67;18)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="semigroup.def.CMP1.p1">A <omdoc:term cd="magma" name="magma" xml:id="semigroup.def.CMP1.p1.term1" about="#semigroup.def.CMP1.p1.term1" stex:srcref="paper.tex#textrange(from=64;63,to=65;26)">magma</omdoc:term><om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMS cd="magma" name="magbase"/><om:OMS cd="magma" name="magmaop"/></om:OMA></om:OMOBJ>, is called a <omdoc:idx xml:id="semigroup.def.CMP1.p1.idx3" about="#semigroup.def.CMP1.p1.idx3" stex:srcref="paper.tex#textrange(from=64;5,to=65;84)"><omdoc:idt xml:id="semigroup.def.CMP1.p1.idx3.idt1" about="#semigroup.def.CMP1.p1.idx3.idt1" stex:srcref="paper.tex#textrange(from=64;5,to=65;84)"><omdoc:term cd="semigroup" name="semigroup" role="definiendum" xml:id="semigroup.def.CMP1.p1.idx3.idt1.term1" about="#semigroup.def.CMP1.p1.idx3.idt1.term1" stex:srcref="paper.tex#textrange(from=64;5,to=65;84)">semigroup</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="semigroup.def.CMP1.p1.idx3.ide2" about="#semigroup.def.CMP1.p1.idx3.ide2" stex:srcref="paper.tex#textrange(from=64;5,to=65;84)"><omdoc:idp>semigroup</omdoc:idp></omdoc:ide></omdoc:idx>, iff
-<om:OMOBJ><om:OMS cd="magma" name="magmaop"/></om:OMOBJ> is associative.</p>
- </omdoc:CMP></omdoc:definition></theory><theory xml:id="monoid" about="#monoid" stex:srcref="paper.tex#textrange(from=70;0,to=84;12)"><imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/><imports from="../../../slides/extcds/omstd/relation1.omdoc#relation1"/><omdoc:imports from="#semigroup" xml:id="monoid.imports1" about="#monoid.imports1" stex:srcref="paper.tex#textrange(from=71;0,to=71;26)"/><omdoc:symbol name="monneut" xml:id="monneut.sym" about="#monneut.sym" stex:srcref="paper.tex#textrange(from=72;1,to=72;22)"/><omdoc:notation cd="monoid" name="monneut"><omdoc:prototype><om:OMS cd="monoid" name="monneut"/></omdoc:prototype><omdoc:rendering><m:mi>e</m:mi></omdoc:rendering></omdoc:notation><omdoc:symbol name="noneut" xml:id="noneut.sym" about="#noneut.sym" stex:srcref="paper.tex#textrange(from=73;1,to=73;27)"/><omdoc:notation cd="monoid" name="noneut"><omdoc:prototype><om:OMA><om:OMS cd="monoid" cr="fun" name="noneut"/><omdoc:expr name="arg1"/></om:OMA></omdoc:prototype><omdoc:rendering><m:msup><render name="arg1"/><m:mo>*</m:mo></m:msup></omdoc:rendering></omdoc:notation><omdoc:symbol name="monoid" xml:id="monoid.def.sym" about="#monoid.def.sym" stex:srcref="paper.tex#textrange(from=74;0,to=78;17)"/><omdoc:symbol name="neutral-element" xml:id="neutral-element.def.sym" about="#neutral-element.def.sym" stex:srcref="paper.tex#textrange(from=74;0,to=78;17)"/><omdoc:definition for="neutral-element monoid" xml:id="monoid.def" about="#monoid.def" stex:srcref="paper.tex#textrange(from=74;0,to=78;17)"><omdoc:CMP xml:id="monoid.def.CMP1" about="#monoid.def.CMP1" stex:srcref="paper.tex#textrange(from=74;0,to=78;17)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="monoid.def.CMP1.p1">A <omdoc:idx xml:id="monoid.def.CMP1.p1.idx1" about="#monoid.def.CMP1.p1.idx1" stex:srcref="paper.tex#textrange(from=74;63,to=75;19)"><omdoc:idt xml:id="monoid.def.CMP1.p1.idx1.idt1" about="#monoid.def.CMP1.p1.idx1.idt1" stex:srcref="paper.tex#textrange(from=74;63,to=75;19)"><omdoc:term cd="monoid" name="monoid" role="definiendum" xml:id="monoid.def.CMP1.p1.idx1.idt1.term1" about="#monoid.def.CMP1.p1.idx1.idt1.term1" stex:srcref="paper.tex#textrange(from=74;63,to=75;19)">monoid</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="monoid.def.CMP1.p1.idx1.ide2" about="#monoid.def.CMP1.p1.idx1.ide2" stex:srcref="paper.tex#textrange(from=74;63,to=75;19)"><omdoc:idp>monoid</omdoc:idp></omdoc:ide></omdoc:idx> is a structure <om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMS cd="magma" name="magbase"/><om:OMS cd="magma" name="magmaop"/><om:OMS cd="monoid" name="monneut"/></om:OMA></om:OMOBJ>, such that
-<om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMS cd="magma" name="magbase"/><om:OMS cd="magma" name="magmaop"/></om:OMA></om:OMOBJ> is a <omdoc:term cd="semigroup" name="semigroup" xml:id="monoid.def.CMP1.p1.term4" about="#monoid.def.CMP1.p1.term4" stex:srcref="paper.tex#textrange(from=75;20,to=76;65)">semigroup</omdoc:term> and <om:OMOBJ><om:OMS cd="monoid" name="monneut"/></om:OMOBJ> is a
-<omdoc:idx xml:id="monoid.def.CMP1.p1.idx6" about="#monoid.def.CMP1.p1.idx6" stex:srcref="paper.tex#textrange(from=76;64,to=77;28)"><omdoc:idt xml:id="monoid.def.CMP1.p1.idx6.idt1" about="#monoid.def.CMP1.p1.idx6.idt1" stex:srcref="paper.tex#textrange(from=76;64,to=77;28)"><omdoc:term cd="monoid" name="neutral-element" role="definiendum" xml:id="monoid.def.CMP1.p1.idx6.idt1.term1" about="#monoid.def.CMP1.p1.idx6.idt1.term1" stex:srcref="paper.tex#textrange(from=76;64,to=77;28)">neutral element</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="monoid.def.CMP1.p1.idx6.ide2" about="#monoid.def.CMP1.p1.idx6.ide2" stex:srcref="paper.tex#textrange(from=76;64,to=77;28)"><omdoc:idp>neutral</omdoc:idp><omdoc:idp>element</omdoc:idp></omdoc:ide></omdoc:idx>, i.e. that <om:OMOBJ><om:OMA><om:OMS cd="relation1" name="eq"/><om:OMA><om:OMS cd="magma" name="magmaop"/><om:OMV name="x"/><om:OMS cd="monoid" name="monneut"/></om:OMA><om:OMV name="x"/></om:OMA></om:OMOBJ> for all <om:OMOBJ><om:OMA><om:OMS cd="functions" name="inset"/><om:OMV name="x"/><om:OMS cd="magma" name="magbase"/></om:OMA></om:OMOBJ>.</p>
- </omdoc:CMP></omdoc:definition><omdoc:definition xml:id="noneut.def" about="#noneut.def" stex:srcref="paper.tex#textrange(from=80;0,to=83;17)"><omdoc:CMP xml:id="noneut.def.CMP1" about="#noneut.def.CMP1" stex:srcref="paper.tex#textrange(from=80;0,to=83;17)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="noneut.def.CMP1.p1">In a monoid <om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMS cd="magma" name="magbase"/><om:OMS cd="magma" name="magmaop"/><om:OMS cd="monoid" name="monneut"/></om:OMA></om:OMOBJ>, we use denote the set
-<om:OMOBJ><om:OMA><om:OMS cd="functions" name="setst"/><om:OMA><om:OMS cd="functions" name="inset"/><om:OMV name="x"/><om:OMV name="S"/></om:OMA><om:OMA><om:OMS cd="relation1" name="neq"/><om:OMV name="x"/><om:OMS cd="monoid" name="monneut"/></om:OMA></om:OMA></om:OMOBJ> with <om:OMOBJ><om:OMA><om:OMS cd="monoid" name="noneut"/><om:OMV name="S"/></om:OMA></om:OMOBJ>.</p>
- </omdoc:CMP></omdoc:definition></theory><theory xml:id="group" about="#group" stex:srcref="paper.tex#textrange(from=86;0,to=96;12)"><imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/><imports from="../../../slides/extcds/omstd/relation1.omdoc#relation1"/><omdoc:imports from="#monoid" xml:id="group.imports1" about="#group.imports1" stex:srcref="paper.tex#textrange(from=87;0,to=87;23)"/><omdoc:symbol name="ginvOp" xml:id="ginvOp.sym" about="#ginvOp.sym" stex:srcref="paper.tex#textrange(from=88;1,to=88;21)"/><omdoc:notation cd="group" name="ginvOp"><omdoc:prototype><om:OMS cd="group" name="ginvOp"/></omdoc:prototype><omdoc:rendering><m:mi>i</m:mi></omdoc:rendering></omdoc:notation><omdoc:symbol name="ginv" xml:id="ginv.sym" about="#ginv.sym" stex:srcref="paper.tex#textrange(from=89;1,to=89;39)"/><omdoc:notation cd="group" name="ginv"><omdoc:prototype><om:OMA><om:OMS cd="group" cr="fun" name="ginv"/><omdoc:expr name="arg1"/></om:OMA></omdoc:prototype><omdoc:rendering><m:mrow><m:mo cr="fun">i</m:mo><m:mrow><m:mo fence="true">(</m:mo><render name="arg1" precedence="-1000000"/><m:mo fence="true">)</m:mo></m:mrow></m:mrow></omdoc:rendering></omdoc:notation><omdoc:symbol name="group" xml:id="group.def.sym" about="#group.def.sym" stex:srcref="paper.tex#textrange(from=90;0,to=95;18)"/><omdoc:symbol name="inverse" xml:id="inverse.def.sym" about="#inverse.def.sym" stex:srcref="paper.tex#textrange(from=90;0,to=95;18)"/><omdoc:definition for="group inverse" xml:id="group.def" about="#group.def" stex:srcref="paper.tex#textrange(from=90;0,to=95;18)"><omdoc:CMP xml:id="group.def.CMP1" about="#group.def.CMP1" stex:srcref="paper.tex#textrange(from=90;0,to=95;18)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="group.def.CMP1.p1">A <omdoc:idx xml:id="group.def.CMP1.p1.idx1" about="#group.def.CMP1.p1.idx1" stex:srcref="paper.tex#textrange(from=90;71,to=91;18)"><omdoc:idt xml:id="group.def.CMP1.p1.idx1.idt1" about="#group.def.CMP1.p1.idx1.idt1" stex:srcref="paper.tex#textrange(from=90;71,to=91;18)"><omdoc:term cd="group" name="group" role="definiendum" xml:id="group.def.CMP1.p1.idx1.idt1.term1" about="#group.def.CMP1.p1.idx1.idt1.term1" stex:srcref="paper.tex#textrange(from=90;71,to=91;18)">group</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="group.def.CMP1.p1.idx1.ide2" about="#group.def.CMP1.p1.idx1.ide2" stex:srcref="paper.tex#textrange(from=90;71,to=91;18)"><omdoc:idp>group</omdoc:idp></omdoc:ide></omdoc:idx> is a structure <om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMS cd="magma" name="magbase"/><om:OMS cd="magma" name="magmaop"/><om:OMS cd="monoid" name="monneut"/><om:OMS cd="group" name="ginvOp"/></om:OMA></om:OMOBJ>, such that
-<om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMS cd="magma" name="magbase"/><om:OMS cd="magma" name="magmaop"/><om:OMS cd="monoid" name="monneut"/></om:OMA></om:OMOBJ> is a <omdoc:term cd="monoid" name="monoid" xml:id="group.def.CMP1.p1.term4" about="#group.def.CMP1.p1.term4" stex:srcref="paper.tex#textrange(from=91;22,to=92;68)">monoid</omdoc:term> and <om:OMOBJ><om:OMS cd="group" name="ginvOp"/></om:OMOBJ> acts as
-a <omdoc:idx xml:id="group.def.CMP1.p1.idx6" about="#group.def.CMP1.p1.idx6" stex:srcref="paper.tex#textrange(from=92;52,to=93;20)"><omdoc:idt xml:id="group.def.CMP1.p1.idx6.idt1" about="#group.def.CMP1.p1.idx6.idt1" stex:srcref="paper.tex#textrange(from=92;52,to=93;20)"><omdoc:term cd="group" name="inverse" role="definiendum" xml:id="group.def.CMP1.p1.idx6.idt1.term1" about="#group.def.CMP1.p1.idx6.idt1.term1" stex:srcref="paper.tex#textrange(from=92;52,to=93;20)">inverse</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="group.def.CMP1.p1.idx6.ide2" about="#group.def.CMP1.p1.idx6.ide2" stex:srcref="paper.tex#textrange(from=92;52,to=93;20)"><omdoc:idp>inverse</omdoc:idp></omdoc:ide></omdoc:idx>, i.e. that <om:OMOBJ><om:OMA><om:OMS cd="relation1" name="eq"/><om:OMA><om:OMS cd="magma" name="magmaop"/><om:OMV name="x"/><om:OMA><om:OMS cd="group" name="ginv"/><om:OMV name="x"/></om:OMA></om:OMA><om:OMS cd="monoid" name="monneut"/></om:OMA></om:OMOBJ> for all
-<om:OMOBJ><om:OMA><om:OMS cd="functions" name="inset"/><om:OMV name="x"/><om:OMS cd="magma" name="magbase"/></om:OMA></om:OMOBJ>.</p>
- </omdoc:CMP></omdoc:definition></theory><theory xml:id="cgroup" about="#cgroup" stex:srcref="paper.tex#textrange(from=98;0,to=104;12)"><imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/><imports from="../../../slides/extcds/omstd/relation1.omdoc#relation1"/><omdoc:imports from="#group" xml:id="cgroup.imports1" about="#cgroup.imports1" stex:srcref="paper.tex#textrange(from=99;0,to=99;20)"/><omdoc:symbol name="commutative-group" xml:id="commutative-group.def.sym" about="#commutative-group.def.sym" stex:srcref="paper.tex#textrange(from=100;0,to=103;16)"/><omdoc:definition for="commutative-group" xml:id="cgroup.def" about="#cgroup.def" stex:srcref="paper.tex#textrange(from=100;0,to=103;16)"><omdoc:CMP xml:id="cgroup.def.CMP1" about="#cgroup.def.CMP1" stex:srcref="paper.tex#textrange(from=100;0,to=103;16)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="cgroup.def.CMP1.p1">We call a <omdoc:term cd="group" name="group" xml:id="cgroup.def.CMP1.p1.term1" about="#cgroup.def.CMP1.p1.term1" stex:srcref="paper.tex#textrange(from=100;47,to=101;32)">group</omdoc:term><om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMS cd="magma" name="magbase"/><om:OMS cd="magma" name="magmaop"/><om:OMS cd="monoid" name="monneut"/><om:OMS cd="group" name="ginvOp"/></om:OMA></om:OMOBJ> a
-<omdoc:idx xml:id="cgroup.def.CMP1.p1.idx3" about="#cgroup.def.CMP1.p1.idx3" stex:srcref="paper.tex#textrange(from=101;34,to=102;28)"><omdoc:idt xml:id="cgroup.def.CMP1.p1.idx3.idt1" about="#cgroup.def.CMP1.p1.idx3.idt1" stex:srcref="paper.tex#textrange(from=101;34,to=102;28)"><omdoc:term cd="cgroup" name="commutative-group" role="definiendum" xml:id="cgroup.def.CMP1.p1.idx3.idt1.term1" about="#cgroup.def.CMP1.p1.idx3.idt1.term1" stex:srcref="paper.tex#textrange(from=101;34,to=102;28)">commutative group</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="cgroup.def.CMP1.p1.idx3.ide2" about="#cgroup.def.CMP1.p1.idx3.ide2" stex:srcref="paper.tex#textrange(from=101;34,to=102;28)"><omdoc:idp>commutative</omdoc:idp><omdoc:idp>group</omdoc:idp></omdoc:ide></omdoc:idx>, iff <om:OMOBJ><om:OMS cd="magma" name="magmaop"/></om:OMOBJ> is commutative.</p>
- </omdoc:CMP></omdoc:definition></theory><theory xml:id="ring" about="#ring" stex:srcref="paper.tex#textrange(from=106;0,to=131;12)"><imports from="../../../slides/extcds/omstd/arith1.omdoc#arith1"/><imports from="../../../slides/extcds/omstd/relation1.omdoc#relation1"/><omdoc:symbol name="rbase" xml:id="rbase.sym" about="#rbase.sym" stex:srcref="paper.tex#textrange(from=107;1,to=107;18)"/><omdoc:notation cd="ring" name="rbase"><omdoc:prototype><om:OMS cd="ring" name="rbase"/></omdoc:prototype><omdoc:rendering><m:mi>R</m:mi></omdoc:rendering></omdoc:notation><omdoc:symbol name="rtimes" xml:id="rtimes.sym" about="#rtimes.sym" stex:srcref="paper.tex#textrange(from=108;0,to=108;37)"/><omdoc:notation cd="ring" name="rtimes"><omdoc:prototype><om:OMS cd="ring" name="rtimes"/></omdoc:prototype><omdoc:rendering><m:mo>&#x22C5;</m:mo></omdoc:rendering></omdoc:notation><omdoc:notation cd="ring" name="rtimes"><omdoc:prototype><om:OMA><om:OMS cd="ring" cr="fun" name="rtimes"/><omdoc:expr name="arg1"/><omdoc:expr name="arg2"/></om:OMA></omdoc:prototype><omdoc:rendering><m:mrow><m:mo egroup="fence" fence="true">(</m:mo><render name="arg1"/><m:mo cr="fun">&#x22C5;</m:mo><render name="arg2"/><m:mo egroup="fence" fence="true">)</m:mo></m:mrow></omdoc:rendering></omdoc:notation><omdoc:symbol name="rone" xml:id="rone.sym" about="#rone.sym" stex:srcref="paper.tex#textrange(from=110;1,to=110;17)"/><omdoc:notation cd="ring" name="rone"><omdoc:prototype><om:OMS cd="ring" name="rone"/></omdoc:prototype><omdoc:rendering><m:mn>1</m:mn></omdoc:rendering></omdoc:notation><omdoc:imports from="#monoid" xml:id="ring.imports4" about="#ring.imports4" stex:srcref="paper.tex#textrange(from=111;0,to=115;21)"><omdoc:morphism><omdoc:requation xml:id="ring.imports4.requation1" about="#ring.imports4.requation1" stex:srcref="paper.tex#textrange(from=112;1,to=112;26)">rbase<om:OMOBJ><om:OMS cd="magma" name="magbase"/></om:OMOBJ></omdoc:requation><omdoc:requation xml:id="ring.imports4.requation2" about="#ring.imports4.requation2" stex:srcref="paper.tex#textrange(from=113;1,to=113;31)">rtimesOp<om:OMOBJ><om:OMS cd="magma" name="magmaop"/></om:OMOBJ></omdoc:requation><omdoc:requation xml:id="ring.imports4.requation3" about="#ring.imports4.requation3" stex:srcref="paper.tex#textrange(from=114;1,to=114;25)">rone<om:OMOBJ><om:OMS cd="monoid" name="monneut"/></om:OMOBJ></omdoc:requation></omdoc:morphism></omdoc:imports><omdoc:symbol name="rplus" xml:id="rplus.sym" about="#rplus.sym" stex:srcref="paper.tex#textrange(from=116;0,to=116;31)"/><omdoc:notation cd="ring" name="rplus"><omdoc:prototype><om:OMS cd="ring" name="rplus"/></omdoc:prototype><omdoc:rendering><m:mo>+</m:mo></omdoc:rendering></omdoc:notation><omdoc:notation cd="ring" name="rplus"><omdoc:prototype><om:OMA><om:OMS cd="ring" cr="fun" name="rplus"/><omdoc:expr name="arg1"/><omdoc:expr name="arg2"/></om:OMA></omdoc:prototype><omdoc:rendering><m:mrow><m:mo egroup="fence" fence="true">(</m:mo><render name="arg1"/><m:mo cr="fun">+</m:mo><render name="arg2"/><m:mo egroup="fence" fence="true">)</m:mo></m:mrow></omdoc:rendering></omdoc:notation><omdoc:symbol name="rzero" xml:id="rzero.sym" about="#rzero.sym" stex:srcref="paper.tex#textrange(from=118;1,to=118;18)"/><omdoc:notation cd="ring" name="rzero"><omdoc:prototype><om:OMS cd="ring" name="rzero"/></omdoc:prototype><omdoc:rendering><m:mn>0</m:mn></omdoc:rendering></omdoc:notation><omdoc:symbol name="rminus" xml:id="rminus.sym" about="#rminus.sym" stex:srcref="paper.tex#textrange(from=119;0,to=119;33)"/><omdoc:notation cd="ring" name="rminus"><omdoc:prototype><om:OMS cd="ring" name="rminus"/></omdoc:prototype><omdoc:rendering><m:mo>-</m:mo></omdoc:rendering></omdoc:notation><omdoc:notation cd="ring" name="rminus"><omdoc:prototype><om:OMA><om:OMS cd="ring" cr="fun" name="rminus"/><omdoc:expr name="arg1"/></om:OMA></omdoc:prototype><omdoc:rendering><m:mrow><m:mo cr="fun">-</m:mo><m:mrow><m:mo fence="true">(</m:mo><render name="arg1" precedence="-1000000"/><m:mo fence="true">)</m:mo></m:mrow></m:mrow></omdoc:rendering></omdoc:notation><omdoc:imports from="#cgroup" xml:id="ring.imports8" about="#ring.imports8" stex:srcref="paper.tex#textrange(from=121;0,to=125;21)"><omdoc:morphism><omdoc:requation xml:id="ring.imports8.requation1" about="#ring.imports8.requation1" stex:srcref="paper.tex#textrange(from=122;1,to=122;28)">rplus<om:OMOBJ><om:OMS cd="magma" name="magmaop"/></om:OMOBJ></omdoc:requation><omdoc:requation xml:id="ring.imports8.requation2" about="#ring.imports8.requation2" stex:srcref="paper.tex#textrange(from=123;1,to=123;26)">rzero<om:OMOBJ><om:OMS cd="monoid" name="monneut"/></om:OMOBJ></omdoc:requation><omdoc:requation xml:id="ring.imports8.requation3" about="#ring.imports8.requation3" stex:srcref="paper.tex#textrange(from=124;1,to=124;28)">rminusOp<om:OMOBJ><om:OMS cd="group" name="ginvOp"/></om:OMOBJ></omdoc:requation></omdoc:morphism></omdoc:imports><omdoc:symbol name="ring" xml:id="ring.def.sym" about="#ring.def.sym" stex:srcref="paper.tex#textrange(from=126;1,to=130;16)"/><omdoc:definition for="ring" xml:id="ring.definition10" about="#ring.definition10" stex:srcref="paper.tex#textrange(from=126;1,to=130;16)"><omdoc:CMP xml:id="ring.definition10.CMP1" about="#ring.definition10.CMP1" stex:srcref="paper.tex#textrange(from=126;1,to=130;16)">
- <p xmlns="http://www.w3.org/1999/xhtml" style="" class="p" id="ring.definition10.CMP1.p1">A <omdoc:idx xml:id="ring.definition10.CMP1.p1.idx1" about="#ring.definition10.CMP1.p1.idx1" stex:srcref="paper.tex#textrange(from=126;73,to=127;15)"><omdoc:idt xml:id="ring.definition10.CMP1.p1.idx1.idt1" about="#ring.definition10.CMP1.p1.idx1.idt1" stex:srcref="paper.tex#textrange(from=126;73,to=127;15)"><omdoc:term cd="ring" name="ring" role="definiendum" xml:id="ring.definition10.CMP1.p1.idx1.idt1.term1" about="#ring.definition10.CMP1.p1.idx1.idt1.term1" stex:srcref="paper.tex#textrange(from=126;73,to=127;15)">ring</omdoc:term></omdoc:idt><omdoc:ide index="default" xml:id="ring.definition10.CMP1.p1.idx1.ide2" about="#ring.definition10.CMP1.p1.idx1.ide2" stex:srcref="paper.tex#textrange(from=126;73,to=127;15)"><omdoc:idp>ring</omdoc:idp></omdoc:ide></omdoc:idx> is a structure <om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMS cd="ring" name="rbase"/><om:OMS cd="ring" name="rplus"/><om:OMS cd="ring" name="rzero"/><om:OMS cd="ring" name="rtimes"/><om:OMS cd="ring" name="rone"/><om:OMS cd="ring" name="rminus"/></om:OMA></om:OMOBJ>,
-such that <om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMA><om:OMS cd="monoid" name="noneut"/><om:OMS cd="ring" name="rbase"/></om:OMA><om:OMS cd="ring" name="rtimes"/><om:OMS cd="ring" name="rone"/></om:OMA></om:OMOBJ> is a monoid and
-<om:OMOBJ><om:OMA><om:OMS cd="functions" name="tup"/><om:OMS cd="ring" name="rbase"/><om:OMS cd="ring" name="rplus"/><om:OMS cd="ring" name="rzero"/><om:OMS cd="ring" name="rminus"/></om:OMA></om:OMOBJ> is a commutative group.</p>
- </omdoc:CMP></omdoc:definition></theory></omdoc:omgroup></omdoc:omgroup><omdoc:omgroup layout="sectioning" xml:id="concl" about="#concl" stex:srcref="paper.tex#textrange(from=135;0,to=138;13)"><omdoc:metadata xml:id="concl.metadata1" about="#concl.metadata1" stex:srcref="paper.tex#textrange(from=135;0,to=135;37)"><dc:title xml:id="concl.metadata1.title1" about="#concl.metadata1.title1" stex:srcref="paper.tex#textrange(from=135;0,to=138;13)">Conclusion</dc:title></omdoc:metadata>
- <div xmlns="http://www.w3.org/1999/xhtml" class="para" id="concl.p1">
- <p style="" class="p" id="concl.p1.p1">In this note we have given an example of standard mathematical markup and shown how a a
-sTeX collection can be set up for automation.</p>
- </div>
-</omdoc:omgroup><omdoc:bibliography files="kwarc"/></omdoc>
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/paper.pdf b/Master/texmf-dist/doc/latex/stex/example/paper/paper.pdf
index b850db63b87..ba4ddd3f95f 100644
--- a/Master/texmf-dist/doc/latex/stex/example/paper/paper.pdf
+++ b/Master/texmf-dist/doc/latex/stex/example/paper/paper.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stex/example/paper/paper.tex b/Master/texmf-dist/doc/latex/stex/example/paper/paper.tex
index 5451a828f20..61d4aa7f17c 100644
--- a/Master/texmf-dist/doc/latex/stex/example/paper/paper.tex
+++ b/Master/texmf-dist/doc/latex/stex/example/paper/paper.tex
@@ -1,5 +1,4 @@
\documentclass{omdoc}
-\usepackage[showmods]{stex}
\usepackage{amssymb}
\usepackage{alltt}
\usepackage{hyperref}
@@ -49,7 +48,7 @@
imports via morphisms.
\begin{module}[id=magma]
- \importmodule[\backmods{functions}]{functions}
+ \importmodule[load=\backmods{functions}]{functions}
\symdef{magbase}{G}
\symdef[name=magmaop]{magmaopOp}{\circ}
\symdef{magmaop}[2]{\infix\magmaopOp{#1}{#2}}
diff --git a/Master/texmf-dist/doc/latex/stex/example/test/Makefile b/Master/texmf-dist/doc/latex/stex/example/test/Makefile
deleted file mode 100644
index 3634c7ddcff..00000000000
--- a/Master/texmf-dist/doc/latex/stex/example/test/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-STEXDIR = ../..
-TARGET = glotest.tex
-MODSLIBDIR = background
-
-include $(STEXDIR)/make/Makefile.vars
-all: omdoc mods pdf
-include $(STEXDIR)/make/Makefile.in