From dbdb85ba0605986976b32afbc60378e58dd787ab Mon Sep 17 00:00:00 2001
From: David Carlisle <d.p.carlisle@gmail.com>
Date: Sun, 27 Feb 2022 00:11:05 +0000
Subject: [PATCH 1/6] add custom highligher to respec schema inclusion

---
 RelaxNG/mathml4/mathml4-presentation.rnc | 240 ++++-------------------
 index.html                               |   9 +-
 2 files changed, 42 insertions(+), 207 deletions(-)

diff --git a/RelaxNG/mathml4/mathml4-presentation.rnc b/RelaxNG/mathml4/mathml4-presentation.rnc
index 3e34059b..98e2c802 100644
--- a/RelaxNG/mathml4/mathml4-presentation.rnc
+++ b/RelaxNG/mathml4/mathml4-presentation.rnc
@@ -9,24 +9,20 @@
 #     W3C Software Notice and License
 #     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
-default namespace m = "http://www.w3.org/1998/Math/MathML"
 
-MathExpression |= PresentationExpression
+## MathML Core
+include "mathml4-core.rnc" 
+
 
-ImpliedMrow = MathExpression*
+MathExpression |= PresentationExpression
 
-TableRowExpression = mtr|mlabeledtr
+TableRowExpression |= mlabeledtr
 
-TableCellExpression = mtd
 
 MstackExpression = MathExpression|mscarries|msline|msrow|msgroup
 
 MsrowExpression = MathExpression|none
 
-MultiScriptExpression = (MathExpression|none),(MathExpression|none)
-
-mpadded-length = xsd:string {
-  pattern = '\s*([\+\-]?[0-9]*([0-9]\.?|\.[0-9])[0-9]*\s*((%?\s*(height|depth|width)?)|e[mx]|in|cm|mm|p[xtc]|((negative)?((very){0,2}thi(n|ck)|medium)mathspace))?)\s*' }
 
 linestyle = "none" | "solid" | "dashed"
 
@@ -64,9 +60,6 @@ number = xsd:decimal
 character = xsd:string {
   pattern = '\s*\S\s*'}
 
-color =  xsd:string {
-  pattern = '\s*((#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?)|[aA][qQ][uU][aA]|[bB][lL][aA][cC][kK]|[bB][lL][uU][eE]|[fF][uU][cC][hH][sS][iI][aA]|[gG][rR][aA][yY]|[gG][rR][eE][eE][nN]|[lL][iI][mM][eE]|[mM][aA][rR][oO][oO][nN]|[nN][aA][vV][yY]|[oO][lL][iI][vV][eE]|[pP][uU][rR][pP][lL][eE]|[rR][eE][dD]|[sS][iI][lL][vV][eE][rR]|[tT][eE][aA][lL]|[wW][hH][iI][tT][eE]|[yY][eE][lL][lL][oO][wW])\s*'}
-
 
 group-alignment = "left" | "center" | "right" | "decimalpoint"
 group-alignment-list = list {group-alignment+}
@@ -75,41 +68,11 @@ group-alignment-list-list = xsd:string {
 positive-integer = xsd:positiveInteger
 
 
-TokenExpression = mi|mn|mo|mtext|mspace|ms
+token.content |= mglyph|malignmark|text
 
-token.content = mglyph|malignmark|text
 
-mi = element mi {mi.attributes, token.content*}
-mi.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt
 
-
-mn = element mn {mn.attributes, token.content*}
-mn.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt
-
-
-mo = element mo {mo.attributes, token.content*}
-mo.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt,
-  attribute form {"prefix" | "infix" | "postfix"}?,
-  attribute fence {"true" | "false"}?,
-  attribute separator {"true" | "false"}?,
-  attribute lspace {length}?,
-  attribute rspace {length}?,
-  attribute stretchy {"true" | "false"}?,
-  attribute symmetric {"true" | "false"}?,
-  attribute maxsize {length | "infinity"}?,
-  attribute minsize {length}?,
-  attribute largeop {"true" | "false"}?,
-  attribute movablelimits {"true" | "false"}?,
-  attribute accent {"true" | "false"}?,
+mo.attributes |= 
   attribute linebreak {"auto" | "newline" | "nobreak" | "goodbreak" | "badbreak"}?,
   attribute lineleading {length}?,
   attribute linebreakstyle {"before" | "after" | "duplicate" | "infixlinebreakstyle"}?,
@@ -123,21 +86,7 @@ mo.attributes =
   attribute indentshiftlast {length | "indentshift"}?
 
 
-mtext = element mtext {mtext.attributes, token.content*}
-mtext.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt
-
-
-mspace = element mspace {mspace.attributes, empty}
-mspace.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt,
-  attribute width {length}?,
-  attribute height {length}?,
-  attribute depth {length}?,
+mspace.attributes |= 
   attribute linebreak {"auto" | "newline" | "nobreak" | "goodbreak" | "badbreak" | "indentingnewline"}?,
   attribute indentalign {"left" | "center" | "right" | "auto" | "id"}?,
   attribute indentshift {length}?,
@@ -148,18 +97,14 @@ mspace.attributes =
   attribute indentshiftlast {length | "indentshift"}?
 
 
-ms = element ms {ms.attributes, token.content*}
-ms.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt,
+ms.attributes |= 
   attribute lquote {text}?,
   attribute rquote {text}?
 
 
 mglyph = element mglyph {mglyph.attributes,mglyph.deprecatedattributes,empty}
 mglyph.attributes = 
-  CommonAtt,  CommonPresAtt,
+  GlobalAttributes,
   attribute src {xsd:anyURI}?,
   attribute width {length}?,
   attribute height {length}?,
@@ -168,58 +113,30 @@ mglyph.attributes =
 mglyph.deprecatedattributes =
   attribute index {integer}?,
   attribute mathvariant {"normal" | "bold" | "italic" | "bold-italic" | "double-struck" | "bold-fraktur" | "script" | "bold-script" | "fraktur" | "sans-serif" | "bold-sans-serif" | "sans-serif-italic" | "sans-serif-bold-italic" | "monospace" | "initial" | "tailed" | "looped" | "stretched"}?,
-  attribute mathsize {"small" | "normal" | "big" | length}?,
-  DeprecatedTokenAtt
+  attribute mathsize {"small" | "normal" | "big" | length}?
 
 msline = element msline {msline.attributes,empty}
 msline.attributes = 
-  CommonAtt,  CommonPresAtt,
+  GlobalAttributes,
   attribute position {integer}?,
   attribute length {unsigned-integer}?,
   attribute leftoverhang {length}?,
   attribute rightoverhang {length}?,
   attribute mslinethickness {length | "thin" | "medium" | "thick"}?
 
-none = element none {none.attributes,empty}
-none.attributes = 
-  CommonAtt,
-  CommonPresAtt
 
-mprescripts = element mprescripts {mprescripts.attributes,empty}
-mprescripts.attributes = 
-  CommonAtt,
-  CommonPresAtt
-
-
-CommonPresAtt = 
-  attribute mathcolor {color}?,
-  attribute mathbackground {color | "transparent"}?
-
-TokenAtt = 
-  attribute mathvariant {"normal" | "bold" | "italic" | "bold-italic" | "double-struck" | "bold-fraktur" | "script" | "bold-script" | "fraktur" | "sans-serif" | "bold-sans-serif" | "sans-serif-italic" | "sans-serif-bold-italic" | "monospace" | "initial" | "tailed" | "looped" | "stretched"}?,
-  attribute mathsize {"small" | "normal" | "big" | length}?,
-  attribute dir {"ltr" | "rtl"}?,
-  DeprecatedTokenAtt
-
-DeprecatedTokenAtt = 
-  attribute fontfamily {text}?,
-  attribute fontweight {"normal" | "bold"}?,
-  attribute fontstyle {"normal" | "italic"}?,
-  attribute fontsize {length}?,
-  attribute color {color}?,
-  attribute background {color | "transparent"}?
 
 MalignExpression = maligngroup|malignmark
 
 malignmark = element malignmark {malignmark.attributes, empty}
 malignmark.attributes = 
-  CommonAtt, CommonPresAtt,
+  GlobalAttributes,
   attribute edge {"left" | "right"}?
 
 
 maligngroup = element maligngroup {maligngroup.attributes, empty}
 maligngroup.attributes = 
-  CommonAtt, CommonPresAtt,
+  GlobalAttributes,
   attribute groupalign {"left" | "center" | "right" | "decimalpoint"}?
 
 
@@ -230,34 +147,16 @@ PresentationExpression = TokenExpression|MalignExpression|
 
 
 
-mrow = element mrow {mrow.attributes, MathExpression*}
-mrow.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute dir {"ltr" | "rtl"}?
 
 
-mfrac = element mfrac {mfrac.attributes, MathExpression, MathExpression}
-mfrac.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute linethickness {length | "thin" | "medium" | "thick"}?,
+mfrac.attributes |= 
   attribute numalign {"left" | "center" | "right"}?,
   attribute denomalign {"left" | "center" | "right"}?,
   attribute bevelled {"true" | "false"}?
 
 
-msqrt = element msqrt {msqrt.attributes, ImpliedMrow}
-msqrt.attributes = 
-  CommonAtt, CommonPresAtt
 
-
-mroot = element mroot {mroot.attributes, MathExpression, MathExpression}
-mroot.attributes = 
-  CommonAtt, CommonPresAtt
-
-
-mstyle = element mstyle {mstyle.attributes, ImpliedMrow}
-mstyle.attributes = 
-  CommonAtt, CommonPresAtt,
+mstyle.attributes |= 
   mstyle.specificattributes,
   mstyle.generalattributes,
   mstyle.deprecatedattributes
@@ -348,7 +247,6 @@ mstyle.generalattributes =
   attribute width {length}?
 
 mstyle.deprecatedattributes =
-  DeprecatedTokenAtt,
   attribute veryverythinmathspace {length}?,
   attribute verythinmathspace {length}?,
   attribute thinmathspace {length}?,
@@ -357,36 +255,13 @@ mstyle.deprecatedattributes =
   attribute verythickmathspace {length}?,
   attribute veryverythickmathspace {length}?
 
-math.attributes &= CommonPresAtt
+
 math.attributes &= mstyle.specificattributes
 math.attributes &= mstyle.generalattributes
 
-
-
-
-merror = element merror {merror.attributes, ImpliedMrow}
-merror.attributes = 
-  CommonAtt, CommonPresAtt
-
-
-mpadded = element mpadded {mpadded.attributes, ImpliedMrow}
-mpadded.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute height {mpadded-length}?,
-  attribute depth {mpadded-length}?,
-  attribute width {mpadded-length}?,
-  attribute lspace {mpadded-length}?,
-  attribute voffset {mpadded-length}?
-
-
-mphantom = element mphantom {mphantom.attributes, ImpliedMrow}
-mphantom.attributes = 
-  CommonAtt, CommonPresAtt
-
-
 mfenced = element mfenced {mfenced.attributes, MathExpression*}
 mfenced.attributes = 
-  CommonAtt, CommonPresAtt,
+  GlobalAttributes,
   attribute open {text}?,
   attribute close {text}?,
   attribute separators {text}?
@@ -394,59 +269,20 @@ mfenced.attributes =
 
 menclose = element menclose {menclose.attributes, ImpliedMrow}
 menclose.attributes = 
-  CommonAtt, CommonPresAtt,
+  GlobalAttributes,
   attribute notation {text}?
 
 
-msub = element msub {msub.attributes, MathExpression, MathExpression}
-msub.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute subscriptshift {length}?
-
-
-msup = element msup {msup.attributes, MathExpression, MathExpression}
-msup.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute superscriptshift {length}?
-
-
-msubsup = element msubsup {msubsup.attributes, MathExpression, MathExpression, MathExpression}
-msubsup.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute subscriptshift {length}?,
-  attribute superscriptshift {length}?
-
-
-munder = element munder {munder.attributes, MathExpression, MathExpression}
-munder.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute accentunder {"true" | "false"}?,
+munder.attributes |= 
   attribute align {"left" | "right" | "center"}?
 
-
-mover = element mover {mover.attributes, MathExpression, MathExpression}
-mover.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute accent {"true" | "false"}?,
+mover.attributes |= 
   attribute align {"left" | "right" | "center"}?
 
-
-munderover = element munderover {munderover.attributes, MathExpression, MathExpression, MathExpression}
-munderover.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute accent {"true" | "false"}?,
-  attribute accentunder {"true" | "false"}?,
+munderover.attributes |= 
   attribute align {"left" | "right" | "center"}?
 
-
-mmultiscripts = element mmultiscripts {mmultiscripts.attributes, MathExpression,MultiScriptExpression*,(mprescripts,MultiScriptExpression*)?}
-mmultiscripts.attributes = 
-  msubsup.attributes
-
-
-mtable = element mtable {mtable.attributes, TableRowExpression*}
-mtable.attributes = 
-  CommonAtt, CommonPresAtt,
+mtable.attributes |= 
   attribute align {xsd:string {
     pattern ='\s*(top|bottom|center|baseline|axis)(\s+-?[0-9]+)?\s*'}}?,
   attribute rowalign {list {verticalalign+} }?,
@@ -468,24 +304,21 @@ mtable.attributes =
   attribute minlabelspacing {length}?
 
 
-mlabeledtr = element mlabeledtr {mlabeledtr.attributes, TableCellExpression+}
+mlabeledtr = element mlabeledtr {mlabeledtr.attributes, mtd+}
 mlabeledtr.attributes = 
   mtr.attributes
 
 
-mtr = element mtr {mtr.attributes, TableCellExpression*}
-mtr.attributes = 
-  CommonAtt, CommonPresAtt,
+
+      
+mtr.attributes |= 
   attribute rowalign {"top" | "bottom" | "center" | "baseline" | "axis"}?,
   attribute columnalign {list {columnalignstyle+} }?,
   attribute groupalign {group-alignment-list-list}?
 
 
-mtd = element mtd {mtd.attributes, ImpliedMrow}
-mtd.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute rowspan {positive-integer}?,
-  attribute columnspan {positive-integer}?,
+
+mtd.attributes |= 
   attribute rowalign {"top" | "bottom" | "center" | "baseline" | "axis"}?,
   attribute columnalign {columnalignstyle}?,
   attribute groupalign {group-alignment-list}?
@@ -493,7 +326,7 @@ mtd.attributes =
 
 mstack = element mstack {mstack.attributes, MstackExpression*}
 mstack.attributes = 
-  CommonAtt, CommonPresAtt,
+  GlobalAttributes,
   attribute align {xsd:string {
     pattern ='\s*(top|bottom|center|baseline|axis)(\s+-?[0-9]+)?\s*'}}?,
   attribute stackalign {"left" | "center" | "right" | "decimalpoint"}?,
@@ -509,20 +342,20 @@ mlongdiv.attributes =
 
 msgroup = element msgroup {msgroup.attributes, MstackExpression*}
 msgroup.attributes = 
-  CommonAtt, CommonPresAtt,
+  GlobalAttributes,
   attribute position {integer}?,
   attribute shift {integer}?
 
 
 msrow = element msrow {msrow.attributes, MsrowExpression*}
 msrow.attributes = 
-  CommonAtt, CommonPresAtt,
+  GlobalAttributes,
   attribute position {integer}?
 
 
 mscarries = element mscarries {mscarries.attributes, (MsrowExpression|mscarry)*}
 mscarries.attributes = 
-  CommonAtt, CommonPresAtt,
+  GlobalAttributes,
   attribute position {integer}?,
   attribute location {"w" | "nw" | "n" | "ne" | "e" | "se" | "s" | "sw"}?,
   attribute crossout {list {("none" | "updiagonalstrike" | "downdiagonalstrike" | "verticalstrike" | "horizontalstrike")*}}?,
@@ -531,13 +364,8 @@ mscarries.attributes =
 
 mscarry = element mscarry {mscarry.attributes, MsrowExpression*}
 mscarry.attributes = 
-  CommonAtt, CommonPresAtt,
+  GlobalAttributes,
   attribute location {"w" | "nw" | "n" | "ne" | "e" | "se" | "s" | "sw"}?,
   attribute crossout {list {("none" | "updiagonalstrike" | "downdiagonalstrike" | "verticalstrike" | "horizontalstrike")*}}?
 
 
-maction = element maction {maction.attributes, MathExpression+}
-maction.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute actiontype {text},
-  attribute selection {positive-integer}?
diff --git a/index.html b/index.html
index 1c24b144..0063e167 100644
--- a/index.html
+++ b/index.html
@@ -66,6 +66,13 @@
    }
    };
   </script>
+  <script class='remove'>
+    function relaxhl (r,s,u) {
+	var s2=s.replaceAll(/#[^\n]*/g,'<span style="color:brown">$&</span>');
+	s2=s2.replaceAll(/include *"([^"]*)"/g,'<span style="color:green">include</span> "<span style="color:red">$1</span>"');
+	return  s2;
+    }
+    </script>
  </head>
  <body>
   <section id='abstract'>
@@ -389,7 +396,7 @@ <h4 id="parsing_rnc_common">Elements Common to Presentation and Content MathML</
     <section>
      <h4 id="parsing_rnc_pres">The Grammar for Presentation MathML</h4>
      
-     <pre data-include="src/rnc-pres.html" data-include-replace="true"></pre>
+     <pre class="nohighlight" data-oninclude="relaxhl" data-include-format='html' data-include="RelaxNG/mathml4/mathml4-presentation.rnc" ></pre>
 
     </section>
     

From fe8b55bd87db5f36a8fd9941dcf3d66a83368566 Mon Sep 17 00:00:00 2001
From: David Carlisle <d.p.carlisle@gmail.com>
Date: Sun, 27 Feb 2022 15:20:40 +0000
Subject: [PATCH 2/6] update and simplify text describing the schema, format
 schema directly from github

---
 RelaxNG/mathml3/mathml3-common.rnc         |  84 ----
 RelaxNG/mathml3/mathml3-content.rnc        | 373 --------------
 RelaxNG/mathml3/mathml3-presentation.rnc   | 543 ---------------------
 RelaxNG/mathml3/mathml3-strict-content.rnc |  60 ---
 RelaxNG/mathml3/mathml3.rnc                |  21 -
 RelaxNG/mathml4/mathml4-common.rnc         |  84 ----
 RelaxNG/mathml4/mathml4-content.rnc        | 373 --------------
 RelaxNG/mathml4/mathml4-presentation.rnc   | 371 --------------
 RelaxNG/mathml4/mathml4-strict-content.rnc |  60 ---
 RelaxNG/mathml4/mathml4.rnc                |  21 -
 index.html                                 |  77 ++-
 src/parsing-1.html                         |  74 +--
 src/parsing-2.html                         | 129 +----
 13 files changed, 76 insertions(+), 2194 deletions(-)
 delete mode 100644 RelaxNG/mathml3/mathml3-common.rnc
 delete mode 100644 RelaxNG/mathml3/mathml3-content.rnc
 delete mode 100644 RelaxNG/mathml3/mathml3-presentation.rnc
 delete mode 100644 RelaxNG/mathml3/mathml3-strict-content.rnc
 delete mode 100644 RelaxNG/mathml3/mathml3.rnc
 delete mode 100644 RelaxNG/mathml4/mathml4-common.rnc
 delete mode 100644 RelaxNG/mathml4/mathml4-content.rnc
 delete mode 100644 RelaxNG/mathml4/mathml4-presentation.rnc
 delete mode 100644 RelaxNG/mathml4/mathml4-strict-content.rnc
 delete mode 100644 RelaxNG/mathml4/mathml4.rnc

diff --git a/RelaxNG/mathml3/mathml3-common.rnc b/RelaxNG/mathml3/mathml3-common.rnc
deleted file mode 100644
index 719f190a..00000000
--- a/RelaxNG/mathml3/mathml3-common.rnc
+++ /dev/null
@@ -1,84 +0,0 @@
-#     This is the Mathematical Markup Language (MathML) 3.0, an XML
-#     application for describing mathematical notation and capturing
-#     both its structure and content.
-#
-#     Copyright 1998-2014 W3C (MIT, ERCIM, Keio, Beihang)
-# 
-#     Use and distribution of this code are permitted under the terms
-#     W3C Software Notice and License
-#     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
-default namespace m = "http://www.w3.org/1998/Math/MathML"
-namespace local = ""
-
-start = math
-
-math = element math {math.attributes,MathExpression*}
-MathExpression = semantics
-
-NonMathMLAtt = attribute (* - (local:*|m:*)) {xsd:string} 
-
-CommonDeprecatedAtt = attribute other {text}?
-
-CommonAtt = attribute id {xsd:ID}?,
-            attribute xref {text}?,
-            attribute class {xsd:NMTOKENS}?,
-            attribute style {xsd:string}?,
-            attribute href {xsd:anyURI}?,
-            CommonDeprecatedAtt,
-            NonMathMLAtt*
-
-
-math.attributes = CommonAtt,
-               attribute display {"block" | "inline"}?,
-               attribute maxwidth {length}?,
-               attribute overflow {"linebreak" | "scroll" | "elide" | "truncate" | "scale"}?,
-               attribute altimg {xsd:anyURI}?,
-               attribute altimg-width {length}?,
-               attribute altimg-height {length}?,
-               attribute altimg-valign {length | "top" | "middle" | "bottom"}?,
-               attribute alttext {text}?,
-               attribute cdgroup {xsd:anyURI}?,
-               math.deprecatedattributes
-
-# the mathml3-presentation schema  adds additional attributes
-# to the math element, all those valid on mstyle
-
-math.deprecatedattributes = attribute mode {xsd:string}?,
-                            attribute macros {xsd:string}?
-
-
-name = attribute name {xsd:NCName}
-cd = attribute cd {xsd:NCName}
-
-src = attribute src {xsd:anyURI}?
-
-annotation = element annotation {annotation.attributes,text}
-                     
-annotation-xml.model = (MathExpression|anyElement)*
-
-anyElement =  element (* - m:*) {(attribute * {text}|text| anyElement)*}
-
-annotation-xml = element annotation-xml {annotation.attributes,
-                                         annotation-xml.model}
-annotation.attributes = CommonAtt,
-	                cd?,
-                        name?,
-                        DefEncAtt,
-                        src?
-
-DefEncAtt = attribute encoding {xsd:string}?,
-            attribute definitionURL {xsd:anyURI}?
-
-semantics = element semantics {semantics.attributes,
-                               MathExpression, 
-                              (annotation|annotation-xml)*}
-semantics.attributes = CommonAtt,DefEncAtt,cd?,name?
-
-
-
-length = xsd:string {
-  pattern = '\s*((-?[0-9]*([0-9]\.?|\.[0-9])[0-9]*(e[mx]|in|cm|mm|p[xtc]|%)?)|(negative)?((very){0,2}thi(n|ck)|medium)mathspace)\s*' 
-}
-
diff --git a/RelaxNG/mathml3/mathml3-content.rnc b/RelaxNG/mathml3/mathml3-content.rnc
deleted file mode 100644
index 9603ed45..00000000
--- a/RelaxNG/mathml3/mathml3-content.rnc
+++ /dev/null
@@ -1,373 +0,0 @@
-
-#     This is the Mathematical Markup Language (MathML) 3.0, an XML
-#     application for describing mathematical notation and capturing
-#     both its structure and content.
-#
-#     Copyright 1998-2014 W3C (MIT, ERCIM, Keio, Beihang)
-# 
-#     Use and distribution of this code are permitted under the terms
-#     W3C Software Notice and License
-#     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-include "mathml3-strict-content.rnc"{
-  cn.content = (text | mglyph | sep | PresentationExpression)* 
-  cn.attributes = CommonAtt, DefEncAtt, attribute type {text}?, base?
-
-  ci.attributes = CommonAtt, DefEncAtt, ci.type?
-  ci.type = attribute type {text}
-  ci.content = (text | mglyph | PresentationExpression)* 
-
-  csymbol.attributes = CommonAtt, DefEncAtt, attribute type {text}?,cd?
-  csymbol.content = (text | mglyph | PresentationExpression)* 
-
-  bvar = element bvar {CommonAtt, ((ci | semantics-ci) & degree?)}
-
-  cbytes.attributes = CommonAtt, DefEncAtt
-
-  cs.attributes = CommonAtt, DefEncAtt
-
-  apply.content = ContExp+ | (ContExp, BvarQ, Qualifier*, ContExp*)
-
-  bind.content = apply.content
-}
-
-base = attribute base {text}
-
-
-sep = element sep {empty}
-PresentationExpression |= notAllowed
-
-
-DomainQ = (domainofapplication|condition|interval|(lowlimit,uplimit?))*
-domainofapplication = element domainofapplication {ContExp}
-condition = element condition {ContExp}
-uplimit = element uplimit {ContExp}
-lowlimit = element lowlimit {ContExp}
-
-Qualifier = DomainQ|degree|momentabout|logbase
-degree = element degree {ContExp}
-momentabout = element momentabout {ContExp}
-logbase = element logbase {ContExp}
-
-type = attribute type {text}
-order = attribute order {"numeric" | "lexicographic"}
-closure = attribute closure {text}
-
-
-ContExp |= piecewise
-
-
-piecewise = element piecewise {CommonAtt, DefEncAtt,(piece* & otherwise?)}
-
-piece = element piece {CommonAtt, DefEncAtt, ContExp, ContExp}
-
-otherwise = element otherwise {CommonAtt, DefEncAtt, ContExp}
-
-
-DeprecatedContExp = reln | fn | declare
-ContExp |= DeprecatedContExp
-
-reln = element reln {ContExp*}
-fn = element fn {ContExp}
-declare = element declare {attribute type {xsd:string}?,
-                           attribute scope {xsd:string}?,
-                           attribute nargs {xsd:nonNegativeInteger}?,
-                           attribute occurrence {"prefix"|"infix"|"function-model"}?,
-                           DefEncAtt, 
-                           ContExp+}
-
-
-interval.class = interval
-ContExp |= interval.class
-
-
-interval = element interval { CommonAtt, DefEncAtt,closure?, ContExp,ContExp}
-
-unary-functional.class = inverse | ident | domain | codomain | image | ln | log | moment
-ContExp |= unary-functional.class
-
-
-inverse = element inverse { CommonAtt, DefEncAtt, empty}
-ident = element ident { CommonAtt, DefEncAtt, empty}
-domain = element domain { CommonAtt, DefEncAtt, empty}
-codomain = element codomain { CommonAtt, DefEncAtt, empty}
-image = element image { CommonAtt, DefEncAtt, empty}
-ln = element ln { CommonAtt, DefEncAtt, empty}
-log = element log { CommonAtt, DefEncAtt, empty}
-moment = element moment { CommonAtt, DefEncAtt, empty}
-
-lambda.class = lambda
-ContExp |= lambda.class
-
-
-lambda = element lambda { CommonAtt, DefEncAtt, BvarQ, DomainQ, ContExp}
-
-nary-functional.class = compose
-ContExp |= nary-functional.class
-
-
-compose = element compose { CommonAtt, DefEncAtt, empty}
-
-binary-arith.class = quotient | divide | minus | power | rem | root
-ContExp |= binary-arith.class
-
-
-quotient = element quotient { CommonAtt, DefEncAtt, empty}
-divide = element divide { CommonAtt, DefEncAtt, empty}
-minus = element minus { CommonAtt, DefEncAtt, empty}
-power = element power { CommonAtt, DefEncAtt, empty}
-rem = element rem { CommonAtt, DefEncAtt, empty}
-root = element root { CommonAtt, DefEncAtt, empty}
-
-unary-arith.class = factorial | minus | root | abs | conjugate | arg | real | imaginary | floor | ceiling | exp
-ContExp |= unary-arith.class
-
-
-factorial = element factorial { CommonAtt, DefEncAtt, empty}
-abs = element abs { CommonAtt, DefEncAtt, empty}
-conjugate = element conjugate { CommonAtt, DefEncAtt, empty}
-arg = element arg { CommonAtt, DefEncAtt, empty}
-real = element real { CommonAtt, DefEncAtt, empty}
-imaginary = element imaginary { CommonAtt, DefEncAtt, empty}
-floor = element floor { CommonAtt, DefEncAtt, empty}
-ceiling = element ceiling { CommonAtt, DefEncAtt, empty}
-exp = element exp { CommonAtt, DefEncAtt, empty}
-
-nary-minmax.class = max | min
-ContExp |= nary-minmax.class
-
-
-max = element max { CommonAtt, DefEncAtt, empty}
-min = element min { CommonAtt, DefEncAtt, empty}
-
-nary-arith.class = plus | times | gcd | lcm
-ContExp |= nary-arith.class
-
-
-plus = element plus { CommonAtt, DefEncAtt, empty}
-times = element times { CommonAtt, DefEncAtt, empty}
-gcd = element gcd { CommonAtt, DefEncAtt, empty}
-lcm = element lcm { CommonAtt, DefEncAtt, empty}
-
-nary-logical.class = and | or | xor
-ContExp |= nary-logical.class
-
-
-and = element and { CommonAtt, DefEncAtt, empty}
-or = element or { CommonAtt, DefEncAtt, empty}
-xor = element xor { CommonAtt, DefEncAtt, empty}
-
-unary-logical.class = not
-ContExp |= unary-logical.class
-
-
-not = element not { CommonAtt, DefEncAtt, empty}
-
-binary-logical.class = implies | equivalent
-ContExp |= binary-logical.class
-
-
-implies = element implies { CommonAtt, DefEncAtt, empty}
-equivalent = element equivalent { CommonAtt, DefEncAtt, empty}
-
-quantifier.class = forall | exists
-ContExp |= quantifier.class
-
-
-forall = element forall { CommonAtt, DefEncAtt, empty}
-exists = element exists { CommonAtt, DefEncAtt, empty}
-
-nary-reln.class = eq | gt | lt | geq | leq
-ContExp |= nary-reln.class
-
-
-eq = element eq { CommonAtt, DefEncAtt, empty}
-gt = element gt { CommonAtt, DefEncAtt, empty}
-lt = element lt { CommonAtt, DefEncAtt, empty}
-geq = element geq { CommonAtt, DefEncAtt, empty}
-leq = element leq { CommonAtt, DefEncAtt, empty}
-
-binary-reln.class = neq | approx | factorof | tendsto
-ContExp |= binary-reln.class
-
-
-neq = element neq { CommonAtt, DefEncAtt, empty}
-approx = element approx { CommonAtt, DefEncAtt, empty}
-factorof = element factorof { CommonAtt, DefEncAtt, empty}
-tendsto = element tendsto { CommonAtt, DefEncAtt, type?, empty}
-
-int.class = int
-ContExp |= int.class
-
-
-int = element int { CommonAtt, DefEncAtt, empty}
-
-Differential-Operator.class = diff
-ContExp |= Differential-Operator.class
-
-
-diff = element diff { CommonAtt, DefEncAtt, empty}
-
-partialdiff.class = partialdiff
-ContExp |= partialdiff.class
-
-
-partialdiff = element partialdiff { CommonAtt, DefEncAtt, empty}
-
-unary-veccalc.class = divergence | grad | curl | laplacian
-ContExp |= unary-veccalc.class
-
-
-divergence = element divergence { CommonAtt, DefEncAtt, empty}
-grad = element grad { CommonAtt, DefEncAtt, empty}
-curl = element curl { CommonAtt, DefEncAtt, empty}
-laplacian = element laplacian { CommonAtt, DefEncAtt, empty}
-
-nary-setlist-constructor.class = set | \list
-ContExp |= nary-setlist-constructor.class
-
-
-set = element set { CommonAtt, DefEncAtt, type?, BvarQ*, DomainQ*, ContExp*}
-\list = element \list { CommonAtt, DefEncAtt, order?, BvarQ*, DomainQ*, ContExp*}
-
-nary-set.class = union | intersect | cartesianproduct
-ContExp |= nary-set.class
-
-
-union = element union { CommonAtt, DefEncAtt, empty}
-intersect = element intersect { CommonAtt, DefEncAtt, empty}
-cartesianproduct = element cartesianproduct { CommonAtt, DefEncAtt, empty}
-
-binary-set.class = in | notin | notsubset | notprsubset | setdiff
-ContExp |= binary-set.class
-
-
-in = element in { CommonAtt, DefEncAtt, empty}
-notin = element notin { CommonAtt, DefEncAtt, empty}
-notsubset = element notsubset { CommonAtt, DefEncAtt, empty}
-notprsubset = element notprsubset { CommonAtt, DefEncAtt, empty}
-setdiff = element setdiff { CommonAtt, DefEncAtt, empty}
-
-nary-set-reln.class = subset | prsubset
-ContExp |= nary-set-reln.class
-
-
-subset = element subset { CommonAtt, DefEncAtt, empty}
-prsubset = element prsubset { CommonAtt, DefEncAtt, empty}
-
-unary-set.class = card
-ContExp |= unary-set.class
-
-
-card = element card { CommonAtt, DefEncAtt, empty}
-
-sum.class = sum
-ContExp |= sum.class
-
-
-sum = element sum { CommonAtt, DefEncAtt, empty}
-
-product.class = product
-ContExp |= product.class
-
-
-product = element product { CommonAtt, DefEncAtt, empty}
-
-limit.class = limit
-ContExp |= limit.class
-
-
-limit = element limit { CommonAtt, DefEncAtt, empty}
-
-unary-elementary.class = sin | cos | tan | sec | csc | cot | sinh | cosh | tanh | sech | csch | coth | arcsin | arccos | arctan | arccosh | arccot | arccoth | arccsc | arccsch | arcsec | arcsech | arcsinh | arctanh
-ContExp |= unary-elementary.class
-
-
-sin = element sin { CommonAtt, DefEncAtt, empty}
-cos = element cos { CommonAtt, DefEncAtt, empty}
-tan = element tan { CommonAtt, DefEncAtt, empty}
-sec = element sec { CommonAtt, DefEncAtt, empty}
-csc = element csc { CommonAtt, DefEncAtt, empty}
-cot = element cot { CommonAtt, DefEncAtt, empty}
-sinh = element sinh { CommonAtt, DefEncAtt, empty}
-cosh = element cosh { CommonAtt, DefEncAtt, empty}
-tanh = element tanh { CommonAtt, DefEncAtt, empty}
-sech = element sech { CommonAtt, DefEncAtt, empty}
-csch = element csch { CommonAtt, DefEncAtt, empty}
-coth = element coth { CommonAtt, DefEncAtt, empty}
-arcsin = element arcsin { CommonAtt, DefEncAtt, empty}
-arccos = element arccos { CommonAtt, DefEncAtt, empty}
-arctan = element arctan { CommonAtt, DefEncAtt, empty}
-arccosh = element arccosh { CommonAtt, DefEncAtt, empty}
-arccot = element arccot { CommonAtt, DefEncAtt, empty}
-arccoth = element arccoth { CommonAtt, DefEncAtt, empty}
-arccsc = element arccsc { CommonAtt, DefEncAtt, empty}
-arccsch = element arccsch { CommonAtt, DefEncAtt, empty}
-arcsec = element arcsec { CommonAtt, DefEncAtt, empty}
-arcsech = element arcsech { CommonAtt, DefEncAtt, empty}
-arcsinh = element arcsinh { CommonAtt, DefEncAtt, empty}
-arctanh = element arctanh { CommonAtt, DefEncAtt, empty}
-
-nary-stats.class = mean | sdev | variance | median | mode
-ContExp |= nary-stats.class
-
-
-mean = element mean { CommonAtt, DefEncAtt, empty}
-sdev = element sdev { CommonAtt, DefEncAtt, empty}
-variance = element variance { CommonAtt, DefEncAtt, empty}
-median = element median { CommonAtt, DefEncAtt, empty}
-mode = element mode { CommonAtt, DefEncAtt, empty}
-
-nary-constructor.class = vector | matrix | matrixrow
-ContExp |= nary-constructor.class
-
-
-vector = element vector { CommonAtt, DefEncAtt, BvarQ, DomainQ, ContExp*}
-matrix = element matrix { CommonAtt, DefEncAtt, BvarQ, DomainQ, ContExp*}
-matrixrow = element matrixrow { CommonAtt, DefEncAtt, BvarQ, DomainQ, ContExp*}
-
-unary-linalg.class = determinant | transpose
-ContExp |= unary-linalg.class
-
-
-determinant = element determinant { CommonAtt, DefEncAtt, empty}
-transpose = element transpose { CommonAtt, DefEncAtt, empty}
-
-nary-linalg.class = selector
-ContExp |= nary-linalg.class
-
-
-selector = element selector { CommonAtt, DefEncAtt, empty}
-
-binary-linalg.class = vectorproduct | scalarproduct | outerproduct
-ContExp |= binary-linalg.class
-
-
-vectorproduct = element vectorproduct { CommonAtt, DefEncAtt, empty}
-scalarproduct = element scalarproduct { CommonAtt, DefEncAtt, empty}
-outerproduct = element outerproduct { CommonAtt, DefEncAtt, empty}
-
-constant-set.class = integers | reals | rationals | naturalnumbers | complexes | primes | emptyset
-ContExp |= constant-set.class
-
-
-integers = element integers { CommonAtt, DefEncAtt, empty}
-reals = element reals { CommonAtt, DefEncAtt, empty}
-rationals = element rationals { CommonAtt, DefEncAtt, empty}
-naturalnumbers = element naturalnumbers { CommonAtt, DefEncAtt, empty}
-complexes = element complexes { CommonAtt, DefEncAtt, empty}
-primes = element primes { CommonAtt, DefEncAtt, empty}
-emptyset = element emptyset { CommonAtt, DefEncAtt, empty}
-
-constant-arith.class = exponentiale | imaginaryi | notanumber | true | false | pi | eulergamma | infinity
-ContExp |= constant-arith.class
-
-
-exponentiale = element exponentiale { CommonAtt, DefEncAtt, empty}
-imaginaryi = element imaginaryi { CommonAtt, DefEncAtt, empty}
-notanumber = element notanumber { CommonAtt, DefEncAtt, empty}
-true = element true { CommonAtt, DefEncAtt, empty}
-false = element false { CommonAtt, DefEncAtt, empty}
-pi = element pi { CommonAtt, DefEncAtt, empty}
-eulergamma = element eulergamma { CommonAtt, DefEncAtt, empty}
-infinity = element infinity { CommonAtt, DefEncAtt, empty}
\ No newline at end of file
diff --git a/RelaxNG/mathml3/mathml3-presentation.rnc b/RelaxNG/mathml3/mathml3-presentation.rnc
deleted file mode 100644
index 7606d908..00000000
--- a/RelaxNG/mathml3/mathml3-presentation.rnc
+++ /dev/null
@@ -1,543 +0,0 @@
-
-#     This is the Mathematical Markup Language (MathML) 3.0, an XML
-#     application for describing mathematical notation and capturing
-#     both its structure and content.
-#
-#     Copyright 1998-2014 W3C (MIT, ERCIM, Keio, Beihang)
-# 
-#     Use and distribution of this code are permitted under the terms
-#     W3C Software Notice and License
-#     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-default namespace m = "http://www.w3.org/1998/Math/MathML"
-
-MathExpression |= PresentationExpression
-
-ImpliedMrow = MathExpression*
-
-TableRowExpression = mtr|mlabeledtr
-
-TableCellExpression = mtd
-
-MstackExpression = MathExpression|mscarries|msline|msrow|msgroup
-
-MsrowExpression = MathExpression|none
-
-MultiScriptExpression = (MathExpression|none),(MathExpression|none)
-
-mpadded-length = xsd:string {
-  pattern = '\s*([\+\-]?[0-9]*([0-9]\.?|\.[0-9])[0-9]*\s*((%?\s*(height|depth|width)?)|e[mx]|in|cm|mm|p[xtc]|((negative)?((very){0,2}thi(n|ck)|medium)mathspace))?)\s*' }
-
-linestyle = "none" | "solid" | "dashed"
-
-verticalalign =
-      "top" |
-      "bottom" |
-      "center" |
-      "baseline" |
-      "axis"
-
-columnalignstyle = "left" | "center" | "right"
-
-notationstyle =
-     "longdiv" |
-     "actuarial" |
-     "radical" |
-     "box" |
-     "roundedbox" |
-     "circle" |
-     "left" |
-     "right" |
-     "top" |
-     "bottom" |
-     "updiagonalstrike" |
-     "downdiagonalstrike" |
-     "verticalstrike" |
-     "horizontalstrike" |
-     "madruwb"
-
-idref = text
-unsigned-integer = xsd:unsignedLong
-integer = xsd:integer
-number = xsd:decimal
-
-character = xsd:string {
-  pattern = '\s*\S\s*'}
-
-color =  xsd:string {
-  pattern = '\s*((#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?)|[aA][qQ][uU][aA]|[bB][lL][aA][cC][kK]|[bB][lL][uU][eE]|[fF][uU][cC][hH][sS][iI][aA]|[gG][rR][aA][yY]|[gG][rR][eE][eE][nN]|[lL][iI][mM][eE]|[mM][aA][rR][oO][oO][nN]|[nN][aA][vV][yY]|[oO][lL][iI][vV][eE]|[pP][uU][rR][pP][lL][eE]|[rR][eE][dD]|[sS][iI][lL][vV][eE][rR]|[tT][eE][aA][lL]|[wW][hH][iI][tT][eE]|[yY][eE][lL][lL][oO][wW])\s*'}
-
-
-group-alignment = "left" | "center" | "right" | "decimalpoint"
-group-alignment-list = list {group-alignment+}
-group-alignment-list-list = xsd:string {
-  pattern = '(\s*\{\s*(left|center|right|decimalpoint)(\s+(left|center|right|decimalpoint))*\})*\s*' }
-positive-integer = xsd:positiveInteger
-
-
-TokenExpression = mi|mn|mo|mtext|mspace|ms
-
-token.content = mglyph|malignmark|text
-
-mi = element mi {mi.attributes, token.content*}
-mi.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt
-
-
-mn = element mn {mn.attributes, token.content*}
-mn.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt
-
-
-mo = element mo {mo.attributes, token.content*}
-mo.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt,
-  attribute form {"prefix" | "infix" | "postfix"}?,
-  attribute fence {"true" | "false"}?,
-  attribute separator {"true" | "false"}?,
-  attribute lspace {length}?,
-  attribute rspace {length}?,
-  attribute stretchy {"true" | "false"}?,
-  attribute symmetric {"true" | "false"}?,
-  attribute maxsize {length | "infinity"}?,
-  attribute minsize {length}?,
-  attribute largeop {"true" | "false"}?,
-  attribute movablelimits {"true" | "false"}?,
-  attribute accent {"true" | "false"}?,
-  attribute linebreak {"auto" | "newline" | "nobreak" | "goodbreak" | "badbreak"}?,
-  attribute lineleading {length}?,
-  attribute linebreakstyle {"before" | "after" | "duplicate" | "infixlinebreakstyle"}?,
-  attribute linebreakmultchar {text}?,
-  attribute indentalign {"left" | "center" | "right" | "auto" | "id"}?,
-  attribute indentshift {length}?,
-  attribute indenttarget {idref}?,
-  attribute indentalignfirst {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentshiftfirst {length | "indentshift"}?,
-  attribute indentalignlast {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentshiftlast {length | "indentshift"}?
-
-
-mtext = element mtext {mtext.attributes, token.content*}
-mtext.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt
-
-
-mspace = element mspace {mspace.attributes, empty}
-mspace.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt,
-  attribute width {length}?,
-  attribute height {length}?,
-  attribute depth {length}?,
-  attribute linebreak {"auto" | "newline" | "nobreak" | "goodbreak" | "badbreak" | "indentingnewline"}?,
-  attribute indentalign {"left" | "center" | "right" | "auto" | "id"}?,
-  attribute indentshift {length}?,
-  attribute indenttarget {idref}?,
-  attribute indentalignfirst {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentshiftfirst {length | "indentshift"}?,
-  attribute indentalignlast {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentshiftlast {length | "indentshift"}?
-
-
-ms = element ms {ms.attributes, token.content*}
-ms.attributes = 
-  CommonAtt,
-  CommonPresAtt,
-  TokenAtt,
-  attribute lquote {text}?,
-  attribute rquote {text}?
-
-
-mglyph = element mglyph {mglyph.attributes,mglyph.deprecatedattributes,empty}
-mglyph.attributes = 
-  CommonAtt,  CommonPresAtt,
-  attribute src {xsd:anyURI}?,
-  attribute width {length}?,
-  attribute height {length}?,
-  attribute valign {length}?,
-  attribute alt {text}?
-mglyph.deprecatedattributes =
-  attribute index {integer}?,
-  attribute mathvariant {"normal" | "bold" | "italic" | "bold-italic" | "double-struck" | "bold-fraktur" | "script" | "bold-script" | "fraktur" | "sans-serif" | "bold-sans-serif" | "sans-serif-italic" | "sans-serif-bold-italic" | "monospace" | "initial" | "tailed" | "looped" | "stretched"}?,
-  attribute mathsize {"small" | "normal" | "big" | length}?,
-  DeprecatedTokenAtt
-
-msline = element msline {msline.attributes,empty}
-msline.attributes = 
-  CommonAtt,  CommonPresAtt,
-  attribute position {integer}?,
-  attribute length {unsigned-integer}?,
-  attribute leftoverhang {length}?,
-  attribute rightoverhang {length}?,
-  attribute mslinethickness {length | "thin" | "medium" | "thick"}?
-
-none = element none {none.attributes,empty}
-none.attributes = 
-  CommonAtt,
-  CommonPresAtt
-
-mprescripts = element mprescripts {mprescripts.attributes,empty}
-mprescripts.attributes = 
-  CommonAtt,
-  CommonPresAtt
-
-
-CommonPresAtt = 
-  attribute mathcolor {color}?,
-  attribute mathbackground {color | "transparent"}?
-
-TokenAtt = 
-  attribute mathvariant {"normal" | "bold" | "italic" | "bold-italic" | "double-struck" | "bold-fraktur" | "script" | "bold-script" | "fraktur" | "sans-serif" | "bold-sans-serif" | "sans-serif-italic" | "sans-serif-bold-italic" | "monospace" | "initial" | "tailed" | "looped" | "stretched"}?,
-  attribute mathsize {"small" | "normal" | "big" | length}?,
-  attribute dir {"ltr" | "rtl"}?,
-  DeprecatedTokenAtt
-
-DeprecatedTokenAtt = 
-  attribute fontfamily {text}?,
-  attribute fontweight {"normal" | "bold"}?,
-  attribute fontstyle {"normal" | "italic"}?,
-  attribute fontsize {length}?,
-  attribute color {color}?,
-  attribute background {color | "transparent"}?
-
-MalignExpression = maligngroup|malignmark
-
-malignmark = element malignmark {malignmark.attributes, empty}
-malignmark.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute edge {"left" | "right"}?
-
-
-maligngroup = element maligngroup {maligngroup.attributes, empty}
-maligngroup.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute groupalign {"left" | "center" | "right" | "decimalpoint"}?
-
-
-PresentationExpression = TokenExpression|MalignExpression|
-                         mrow|mfrac|msqrt|mroot|mstyle|merror|mpadded|mphantom|
-                         mfenced|menclose|msub|msup|msubsup|munder|mover|munderover|
-                         mmultiscripts|mtable|mstack|mlongdiv|maction
-
-
-
-mrow = element mrow {mrow.attributes, MathExpression*}
-mrow.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute dir {"ltr" | "rtl"}?
-
-
-mfrac = element mfrac {mfrac.attributes, MathExpression, MathExpression}
-mfrac.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute linethickness {length | "thin" | "medium" | "thick"}?,
-  attribute numalign {"left" | "center" | "right"}?,
-  attribute denomalign {"left" | "center" | "right"}?,
-  attribute bevelled {"true" | "false"}?
-
-
-msqrt = element msqrt {msqrt.attributes, ImpliedMrow}
-msqrt.attributes = 
-  CommonAtt, CommonPresAtt
-
-
-mroot = element mroot {mroot.attributes, MathExpression, MathExpression}
-mroot.attributes = 
-  CommonAtt, CommonPresAtt
-
-
-mstyle = element mstyle {mstyle.attributes, ImpliedMrow}
-mstyle.attributes = 
-  CommonAtt, CommonPresAtt,
-  mstyle.specificattributes,
-  mstyle.generalattributes,
-  mstyle.deprecatedattributes
-
-mstyle.specificattributes =
-  attribute scriptlevel {integer}?,
-  attribute displaystyle {"true" | "false"}?,
-  attribute scriptsizemultiplier {number}?,
-  attribute scriptminsize {length}?,
-  attribute infixlinebreakstyle {"before" | "after" | "duplicate"}?,
-  attribute decimalpoint {character}?
-
-mstyle.generalattributes =
-  attribute accent {"true" | "false"}?,
-  attribute accentunder {"true" | "false"}?,
-  attribute align {"left" | "right" | "center"}?,
-  attribute alignmentscope {list {("true" | "false") +}}?,
-  attribute bevelled {"true" | "false"}?,
-  attribute charalign {"left" | "center" | "right"}?,
-  attribute charspacing {length | "loose" | "medium" | "tight"}?,
-  attribute close {text}?,
-  attribute columnalign {list {columnalignstyle+} }?,
-  attribute columnlines {list {linestyle +}}?,
-  attribute columnspacing {list {(length) +}}?,
-  attribute columnspan {positive-integer}?,
-  attribute columnwidth {list {("auto" | length | "fit") +}}?,
-  attribute crossout {list {("none" | "updiagonalstrike" | "downdiagonalstrike" | "verticalstrike" | "horizontalstrike")*}}?,
-  attribute denomalign {"left" | "center" | "right"}?,
-  attribute depth {length}?,
-  attribute dir {"ltr" | "rtl"}?,
-  attribute edge {"left" | "right"}?,
-  attribute equalcolumns {"true" | "false"}?,
-  attribute equalrows {"true" | "false"}?,
-  attribute fence {"true" | "false"}?,
-  attribute form {"prefix" | "infix" | "postfix"}?,
-  attribute frame {linestyle}?,
-  attribute framespacing {list {length, length}}?,
-  attribute groupalign {group-alignment-list-list}?,
-  attribute height {length}?,
-  attribute indentalign {"left" | "center" | "right" | "auto" | "id"}?,
-  attribute indentalignfirst {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentalignlast {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentshift {length}?,
-  attribute indentshiftfirst {length | "indentshift"}?,
-  attribute indentshiftlast {length | "indentshift"}?,
-  attribute indenttarget {idref}?,
-  attribute largeop {"true" | "false"}?,
-  attribute leftoverhang {length}?,
-  attribute length {unsigned-integer}?,
-  attribute linebreak {"auto" | "newline" | "nobreak" | "goodbreak" | "badbreak"}?,
-  attribute linebreakmultchar {text}?,
-  attribute linebreakstyle {"before" | "after" | "duplicate" | "infixlinebreakstyle"}?,
-  attribute lineleading {length}?,
-  attribute linethickness {length | "thin" | "medium" | "thick"}?,
-  attribute location {"w" | "nw" | "n" | "ne" | "e" | "se" | "s" | "sw"}?,
-  attribute longdivstyle {"lefttop" | "stackedrightright" | "mediumstackedrightright" | "shortstackedrightright" | "righttop" | "left/\right" | "left)(right" | ":right=right" | "stackedleftleft" | "stackedleftlinetop"}?,
-  attribute lquote {text}?,
-  attribute lspace {length}?,
-  attribute mathsize {"small" | "normal" | "big" | length}?,
-  attribute mathvariant {"normal" | "bold" | "italic" | "bold-italic" | "double-struck" | "bold-fraktur" | "script" | "bold-script" | "fraktur" | "sans-serif" | "bold-sans-serif" | "sans-serif-italic" | "sans-serif-bold-italic" | "monospace" | "initial" | "tailed" | "looped" | "stretched"}?,
-  attribute maxsize {length | "infinity"}?,
-  attribute minlabelspacing {length}?,
-  attribute minsize {length}?,
-  attribute movablelimits {"true" | "false"}?,
-  attribute mslinethickness {length | "thin" | "medium" | "thick"}?,
-  attribute notation {text}?,
-  attribute numalign {"left" | "center" | "right"}?,
-  attribute open {text}?,
-  attribute position {integer}?,
-  attribute rightoverhang {length}?,
-  attribute rowalign {list {verticalalign+} }?,
-  attribute rowlines {list {linestyle +}}?,
-  attribute rowspacing {list {(length) +}}?,
-  attribute rowspan {positive-integer}?,
-  attribute rquote {text}?,
-  attribute rspace {length}?,
-  attribute selection {positive-integer}?,
-  attribute separator {"true" | "false"}?,
-  attribute separators {text}?,
-  attribute shift {integer}?,
-  attribute side {"left" | "right" | "leftoverlap" | "rightoverlap"}?,
-  attribute stackalign {"left" | "center" | "right" | "decimalpoint"}?,
-  attribute stretchy {"true" | "false"}?,
-  attribute subscriptshift {length}?,
-  attribute superscriptshift {length}?,
-  attribute symmetric {"true" | "false"}?,
-  attribute valign {length}?,
-  attribute width {length}?
-
-mstyle.deprecatedattributes =
-  DeprecatedTokenAtt,
-  attribute veryverythinmathspace {length}?,
-  attribute verythinmathspace {length}?,
-  attribute thinmathspace {length}?,
-  attribute mediummathspace {length}?,
-  attribute thickmathspace {length}?,
-  attribute verythickmathspace {length}?,
-  attribute veryverythickmathspace {length}?
-
-math.attributes &= CommonPresAtt
-math.attributes &= mstyle.specificattributes
-math.attributes &= mstyle.generalattributes
-
-
-
-
-merror = element merror {merror.attributes, ImpliedMrow}
-merror.attributes = 
-  CommonAtt, CommonPresAtt
-
-
-mpadded = element mpadded {mpadded.attributes, ImpliedMrow}
-mpadded.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute height {mpadded-length}?,
-  attribute depth {mpadded-length}?,
-  attribute width {mpadded-length}?,
-  attribute lspace {mpadded-length}?,
-  attribute voffset {mpadded-length}?
-
-
-mphantom = element mphantom {mphantom.attributes, ImpliedMrow}
-mphantom.attributes = 
-  CommonAtt, CommonPresAtt
-
-
-mfenced = element mfenced {mfenced.attributes, MathExpression*}
-mfenced.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute open {text}?,
-  attribute close {text}?,
-  attribute separators {text}?
-
-
-menclose = element menclose {menclose.attributes, ImpliedMrow}
-menclose.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute notation {text}?
-
-
-msub = element msub {msub.attributes, MathExpression, MathExpression}
-msub.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute subscriptshift {length}?
-
-
-msup = element msup {msup.attributes, MathExpression, MathExpression}
-msup.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute superscriptshift {length}?
-
-
-msubsup = element msubsup {msubsup.attributes, MathExpression, MathExpression, MathExpression}
-msubsup.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute subscriptshift {length}?,
-  attribute superscriptshift {length}?
-
-
-munder = element munder {munder.attributes, MathExpression, MathExpression}
-munder.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute accentunder {"true" | "false"}?,
-  attribute align {"left" | "right" | "center"}?
-
-
-mover = element mover {mover.attributes, MathExpression, MathExpression}
-mover.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute accent {"true" | "false"}?,
-  attribute align {"left" | "right" | "center"}?
-
-
-munderover = element munderover {munderover.attributes, MathExpression, MathExpression, MathExpression}
-munderover.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute accent {"true" | "false"}?,
-  attribute accentunder {"true" | "false"}?,
-  attribute align {"left" | "right" | "center"}?
-
-
-mmultiscripts = element mmultiscripts {mmultiscripts.attributes, MathExpression,MultiScriptExpression*,(mprescripts,MultiScriptExpression*)?}
-mmultiscripts.attributes = 
-  msubsup.attributes
-
-
-mtable = element mtable {mtable.attributes, TableRowExpression*}
-mtable.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute align {xsd:string {
-    pattern ='\s*(top|bottom|center|baseline|axis)(\s+-?[0-9]+)?\s*'}}?,
-  attribute rowalign {list {verticalalign+} }?,
-  attribute columnalign {list {columnalignstyle+} }?,
-  attribute groupalign {group-alignment-list-list}?,
-  attribute alignmentscope {list {("true" | "false") +}}?,
-  attribute columnwidth {list {("auto" | length | "fit") +}}?,
-  attribute width {"auto" | length}?,
-  attribute rowspacing {list {(length) +}}?,
-  attribute columnspacing {list {(length) +}}?,
-  attribute rowlines {list {linestyle +}}?,
-  attribute columnlines {list {linestyle +}}?,
-  attribute frame {linestyle}?,
-  attribute framespacing {list {length, length}}?,
-  attribute equalrows {"true" | "false"}?,
-  attribute equalcolumns {"true" | "false"}?,
-  attribute displaystyle {"true" | "false"}?,
-  attribute side {"left" | "right" | "leftoverlap" | "rightoverlap"}?,
-  attribute minlabelspacing {length}?
-
-
-mlabeledtr = element mlabeledtr {mlabeledtr.attributes, TableCellExpression+}
-mlabeledtr.attributes = 
-  mtr.attributes
-
-
-mtr = element mtr {mtr.attributes, TableCellExpression*}
-mtr.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute rowalign {"top" | "bottom" | "center" | "baseline" | "axis"}?,
-  attribute columnalign {list {columnalignstyle+} }?,
-  attribute groupalign {group-alignment-list-list}?
-
-
-mtd = element mtd {mtd.attributes, ImpliedMrow}
-mtd.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute rowspan {positive-integer}?,
-  attribute columnspan {positive-integer}?,
-  attribute rowalign {"top" | "bottom" | "center" | "baseline" | "axis"}?,
-  attribute columnalign {columnalignstyle}?,
-  attribute groupalign {group-alignment-list}?
-
-
-mstack = element mstack {mstack.attributes, MstackExpression*}
-mstack.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute align {xsd:string {
-    pattern ='\s*(top|bottom|center|baseline|axis)(\s+-?[0-9]+)?\s*'}}?,
-  attribute stackalign {"left" | "center" | "right" | "decimalpoint"}?,
-  attribute charalign {"left" | "center" | "right"}?,
-  attribute charspacing {length | "loose" | "medium" | "tight"}?
-
-
-mlongdiv = element mlongdiv {mlongdiv.attributes, MstackExpression,MstackExpression,MstackExpression+}
-mlongdiv.attributes = 
-  msgroup.attributes,
-  attribute longdivstyle {"lefttop" | "stackedrightright" | "mediumstackedrightright" | "shortstackedrightright" | "righttop" | "left/\right" | "left)(right" | ":right=right" | "stackedleftleft" | "stackedleftlinetop"}?
-
-
-msgroup = element msgroup {msgroup.attributes, MstackExpression*}
-msgroup.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute position {integer}?,
-  attribute shift {integer}?
-
-
-msrow = element msrow {msrow.attributes, MsrowExpression*}
-msrow.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute position {integer}?
-
-
-mscarries = element mscarries {mscarries.attributes, (MsrowExpression|mscarry)*}
-mscarries.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute position {integer}?,
-  attribute location {"w" | "nw" | "n" | "ne" | "e" | "se" | "s" | "sw"}?,
-  attribute crossout {list {("none" | "updiagonalstrike" | "downdiagonalstrike" | "verticalstrike" | "horizontalstrike")*}}?,
-  attribute scriptsizemultiplier {number}?
-
-
-mscarry = element mscarry {mscarry.attributes, MsrowExpression*}
-mscarry.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute location {"w" | "nw" | "n" | "ne" | "e" | "se" | "s" | "sw"}?,
-  attribute crossout {list {("none" | "updiagonalstrike" | "downdiagonalstrike" | "verticalstrike" | "horizontalstrike")*}}?
-
-
-maction = element maction {maction.attributes, MathExpression+}
-maction.attributes = 
-  CommonAtt, CommonPresAtt,
-  attribute actiontype {text},
-  attribute selection {positive-integer}?
diff --git a/RelaxNG/mathml3/mathml3-strict-content.rnc b/RelaxNG/mathml3/mathml3-strict-content.rnc
deleted file mode 100644
index dce0422c..00000000
--- a/RelaxNG/mathml3/mathml3-strict-content.rnc
+++ /dev/null
@@ -1,60 +0,0 @@
-#     This is the Mathematical Markup Language (MathML) 3.0, an XML
-#     application for describing mathematical notation and capturing
-#     both its structure and content.
-#
-#     Copyright 1998-2014 W3C (MIT, ERCIM, Keio, Beihang)
-# 
-#     Use and distribution of this code are permitted under the terms
-#     W3C Software Notice and License
-#     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
-default namespace m = "http://www.w3.org/1998/Math/MathML"
-
-ContExp = semantics-contexp | cn | ci | csymbol | apply | bind | share | cerror | cbytes | cs
-
-cn = element cn {cn.attributes,cn.content}
-cn.content = text
-cn.attributes = CommonAtt, attribute type {"integer" | "real" | "double" | "hexdouble"}
-
-semantics-ci = element semantics {semantics.attributes,(ci|semantics-ci), 
-  (annotation|annotation-xml)*}
-
-semantics-contexp = element semantics {semantics.attributes,ContExp, 
-  (annotation|annotation-xml)*}
-
-ci = element ci {ci.attributes, ci.content}
-ci.attributes = CommonAtt, ci.type?
-ci.type = attribute type {"integer" | "rational" | "real" | "complex" | "complex-polar" | "complex-cartesian" | "constant" | "function" | "vector" | "list" | "set" | "matrix"}
-ci.content = text
-
-
-csymbol = element csymbol {csymbol.attributes,csymbol.content}
-
-SymbolName = xsd:NCName
-csymbol.attributes = CommonAtt, cd
-csymbol.content = SymbolName
-
-BvarQ = bvar*
-bvar = element bvar {CommonAtt, (ci | semantics-ci)}
-
-apply = element apply {CommonAtt,apply.content}
-apply.content = ContExp+
-
-
-bind = element bind {CommonAtt,bind.content}
-bind.content = ContExp,bvar*,ContExp
-
-share = element share {CommonAtt, src, empty}
-
-cerror = element cerror {cerror.attributes, csymbol, ContExp*}
-cerror.attributes = CommonAtt
-
-cbytes = element cbytes {cbytes.attributes, base64}
-cbytes.attributes = CommonAtt
-base64 = xsd:base64Binary
-
-cs = element cs {cs.attributes, text}
-cs.attributes = CommonAtt
-
-MathExpression |= ContExp
diff --git a/RelaxNG/mathml3/mathml3.rnc b/RelaxNG/mathml3/mathml3.rnc
deleted file mode 100644
index 3c68cdb7..00000000
--- a/RelaxNG/mathml3/mathml3.rnc
+++ /dev/null
@@ -1,21 +0,0 @@
-#     This is the Mathematical Markup Language (MathML) 3.0, an XML
-#     application for describing mathematical notation and capturing
-#     both its structure and content.
-#
-#     Copyright 1998-2010 W3C (MIT, ERCIM, Keio)
-# 
-#     Use and distribution of this code are permitted under the terms
-#     W3C Software Notice and License
-#     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
-default namespace m = "http://www.w3.org/1998/Math/MathML"
-
-## Content  MathML
-include "mathml3-content.rnc" 
-
-## Presentation MathML
-include "mathml3-presentation.rnc"
-
-## math and semantics common to both Content and Presentation
-include "mathml3-common.rnc"
diff --git a/RelaxNG/mathml4/mathml4-common.rnc b/RelaxNG/mathml4/mathml4-common.rnc
deleted file mode 100644
index 97e66b90..00000000
--- a/RelaxNG/mathml4/mathml4-common.rnc
+++ /dev/null
@@ -1,84 +0,0 @@
-#     This is the Mathematical Markup Language (MathML) 4.0, an XML
-#     application for describing mathematical notation and capturing
-#     both its structure and content.
-#
-#     Copyright 1998-2014 W3C (MIT, ERCIM, Keio, Beihang)
-# 
-#     Use and distribution of this code are permitted under the terms
-#     W3C Software Notice and License
-#     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
-default namespace m = "http://www.w3.org/1998/Math/MathML"
-namespace local = ""
-
-start = math
-
-math = element math {math.attributes,MathExpression*}
-MathExpression = semantics
-
-NonMathMLAtt = attribute (* - (local:*|m:*)) {xsd:string} 
-
-CommonDeprecatedAtt = attribute other {text}?
-
-CommonAtt = attribute id {xsd:ID}?,
-            attribute xref {text}?,
-            attribute class {xsd:NMTOKENS}?,
-            attribute style {xsd:string}?,
-            attribute href {xsd:anyURI}?,
-            CommonDeprecatedAtt,
-            NonMathMLAtt*
-
-
-math.attributes = CommonAtt,
-               attribute display {"block" | "inline"}?,
-               attribute maxwidth {length}?,
-               attribute overflow {"linebreak" | "scroll" | "elide" | "truncate" | "scale"}?,
-               attribute altimg {xsd:anyURI}?,
-               attribute altimg-width {length}?,
-               attribute altimg-height {length}?,
-               attribute altimg-valign {length | "top" | "middle" | "bottom"}?,
-               attribute alttext {text}?,
-               attribute cdgroup {xsd:anyURI}?,
-               math.deprecatedattributes
-
-# the mathml3-presentation schema  adds additional attributes
-# to the math element, all those valid on mstyle
-
-math.deprecatedattributes = attribute mode {xsd:string}?,
-                            attribute macros {xsd:string}?
-
-
-name = attribute name {xsd:NCName}
-cd = attribute cd {xsd:NCName}
-
-src = attribute src {xsd:anyURI}?
-
-annotation = element annotation {annotation.attributes,text}
-                     
-annotation-xml.model = (MathExpression|anyElement)*
-
-anyElement =  element (* - m:*) {(attribute * {text}|text| anyElement)*}
-
-annotation-xml = element annotation-xml {annotation.attributes,
-                                         annotation-xml.model}
-annotation.attributes = CommonAtt,
-	                cd?,
-                        name?,
-                        DefEncAtt,
-                        src?
-
-DefEncAtt = attribute encoding {xsd:string}?,
-            attribute definitionURL {xsd:anyURI}?
-
-semantics = element semantics {semantics.attributes,
-                               MathExpression, 
-                              (annotation|annotation-xml)*}
-semantics.attributes = CommonAtt,DefEncAtt,cd?,name?
-
-
-
-length = xsd:string {
-  pattern = '\s*((-?[0-9]*([0-9]\.?|\.[0-9])[0-9]*(e[mx]|in|cm|mm|p[xtc]|%)?)|(negative)?((very){0,2}thi(n|ck)|medium)mathspace)\s*' 
-}
-
diff --git a/RelaxNG/mathml4/mathml4-content.rnc b/RelaxNG/mathml4/mathml4-content.rnc
deleted file mode 100644
index e826220f..00000000
--- a/RelaxNG/mathml4/mathml4-content.rnc
+++ /dev/null
@@ -1,373 +0,0 @@
-
-#     This is the Mathematical Markup Language (MathML) 4.0, an XML
-#     application for describing mathematical notation and capturing
-#     both its structure and content.
-#
-#     Copyright 1998-2019 W3C (MIT, ERCIM, Keio, Beihang)
-# 
-#     Use and distribution of this code are permitted under the terms
-#     W3C Software Notice and License
-#     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-include "mathml4-strict-content.rnc"{
-  cn.content = (text | mglyph | sep | PresentationExpression)* 
-  cn.attributes = CommonAtt, DefEncAtt, attribute type {text}?, base?
-
-  ci.attributes = CommonAtt, DefEncAtt, ci.type?
-  ci.type = attribute type {text}
-  ci.content = (text | mglyph | PresentationExpression)* 
-
-  csymbol.attributes = CommonAtt, DefEncAtt, attribute type {text}?,cd?
-  csymbol.content = (text | mglyph | PresentationExpression)* 
-
-  bvar = element bvar {CommonAtt, ((ci | semantics-ci) & degree?)}
-
-  cbytes.attributes = CommonAtt, DefEncAtt
-
-  cs.attributes = CommonAtt, DefEncAtt
-
-  apply.content = ContExp+ | (ContExp, BvarQ, Qualifier*, ContExp*)
-
-  bind.content = apply.content
-}
-
-base = attribute base {text}
-
-
-sep = element sep {empty}
-PresentationExpression |= notAllowed
-
-
-DomainQ = (domainofapplication|condition|interval|(lowlimit,uplimit?))*
-domainofapplication = element domainofapplication {ContExp}
-condition = element condition {ContExp}
-uplimit = element uplimit {ContExp}
-lowlimit = element lowlimit {ContExp}
-
-Qualifier = DomainQ|degree|momentabout|logbase
-degree = element degree {ContExp}
-momentabout = element momentabout {ContExp}
-logbase = element logbase {ContExp}
-
-type = attribute type {text}
-order = attribute order {"numeric" | "lexicographic"}
-closure = attribute closure {text}
-
-
-ContExp |= piecewise
-
-
-piecewise = element piecewise {CommonAtt, DefEncAtt,(piece* & otherwise?)}
-
-piece = element piece {CommonAtt, DefEncAtt, ContExp, ContExp}
-
-otherwise = element otherwise {CommonAtt, DefEncAtt, ContExp}
-
-
-DeprecatedContExp = reln | fn | declare
-ContExp |= DeprecatedContExp
-
-reln = element reln {ContExp*}
-fn = element fn {ContExp}
-declare = element declare {attribute type {xsd:string}?,
-                           attribute scope {xsd:string}?,
-                           attribute nargs {xsd:nonNegativeInteger}?,
-                           attribute occurrence {"prefix"|"infix"|"function-model"}?,
-                           DefEncAtt, 
-                           ContExp+}
-
-
-interval.class = interval
-ContExp |= interval.class
-
-
-interval = element interval { CommonAtt, DefEncAtt,closure?, ContExp,ContExp}
-
-unary-functional.class = inverse | ident | domain | codomain | image | ln | log | moment
-ContExp |= unary-functional.class
-
-
-inverse = element inverse { CommonAtt, DefEncAtt, empty}
-ident = element ident { CommonAtt, DefEncAtt, empty}
-domain = element domain { CommonAtt, DefEncAtt, empty}
-codomain = element codomain { CommonAtt, DefEncAtt, empty}
-image = element image { CommonAtt, DefEncAtt, empty}
-ln = element ln { CommonAtt, DefEncAtt, empty}
-log = element log { CommonAtt, DefEncAtt, empty}
-moment = element moment { CommonAtt, DefEncAtt, empty}
-
-lambda.class = lambda
-ContExp |= lambda.class
-
-
-lambda = element lambda { CommonAtt, DefEncAtt, BvarQ, DomainQ, ContExp}
-
-nary-functional.class = compose
-ContExp |= nary-functional.class
-
-
-compose = element compose { CommonAtt, DefEncAtt, empty}
-
-binary-arith.class = quotient | divide | minus | power | rem | root
-ContExp |= binary-arith.class
-
-
-quotient = element quotient { CommonAtt, DefEncAtt, empty}
-divide = element divide { CommonAtt, DefEncAtt, empty}
-minus = element minus { CommonAtt, DefEncAtt, empty}
-power = element power { CommonAtt, DefEncAtt, empty}
-rem = element rem { CommonAtt, DefEncAtt, empty}
-root = element root { CommonAtt, DefEncAtt, empty}
-
-unary-arith.class = factorial | minus | root | abs | conjugate | arg | real | imaginary | floor | ceiling | exp
-ContExp |= unary-arith.class
-
-
-factorial = element factorial { CommonAtt, DefEncAtt, empty}
-abs = element abs { CommonAtt, DefEncAtt, empty}
-conjugate = element conjugate { CommonAtt, DefEncAtt, empty}
-arg = element arg { CommonAtt, DefEncAtt, empty}
-real = element real { CommonAtt, DefEncAtt, empty}
-imaginary = element imaginary { CommonAtt, DefEncAtt, empty}
-floor = element floor { CommonAtt, DefEncAtt, empty}
-ceiling = element ceiling { CommonAtt, DefEncAtt, empty}
-exp = element exp { CommonAtt, DefEncAtt, empty}
-
-nary-minmax.class = max | min
-ContExp |= nary-minmax.class
-
-
-max = element max { CommonAtt, DefEncAtt, empty}
-min = element min { CommonAtt, DefEncAtt, empty}
-
-nary-arith.class = plus | times | gcd | lcm
-ContExp |= nary-arith.class
-
-
-plus = element plus { CommonAtt, DefEncAtt, empty}
-times = element times { CommonAtt, DefEncAtt, empty}
-gcd = element gcd { CommonAtt, DefEncAtt, empty}
-lcm = element lcm { CommonAtt, DefEncAtt, empty}
-
-nary-logical.class = and | or | xor
-ContExp |= nary-logical.class
-
-
-and = element and { CommonAtt, DefEncAtt, empty}
-or = element or { CommonAtt, DefEncAtt, empty}
-xor = element xor { CommonAtt, DefEncAtt, empty}
-
-unary-logical.class = not
-ContExp |= unary-logical.class
-
-
-not = element not { CommonAtt, DefEncAtt, empty}
-
-binary-logical.class = implies | equivalent
-ContExp |= binary-logical.class
-
-
-implies = element implies { CommonAtt, DefEncAtt, empty}
-equivalent = element equivalent { CommonAtt, DefEncAtt, empty}
-
-quantifier.class = forall | exists
-ContExp |= quantifier.class
-
-
-forall = element forall { CommonAtt, DefEncAtt, empty}
-exists = element exists { CommonAtt, DefEncAtt, empty}
-
-nary-reln.class = eq | gt | lt | geq | leq
-ContExp |= nary-reln.class
-
-
-eq = element eq { CommonAtt, DefEncAtt, empty}
-gt = element gt { CommonAtt, DefEncAtt, empty}
-lt = element lt { CommonAtt, DefEncAtt, empty}
-geq = element geq { CommonAtt, DefEncAtt, empty}
-leq = element leq { CommonAtt, DefEncAtt, empty}
-
-binary-reln.class = neq | approx | factorof | tendsto
-ContExp |= binary-reln.class
-
-
-neq = element neq { CommonAtt, DefEncAtt, empty}
-approx = element approx { CommonAtt, DefEncAtt, empty}
-factorof = element factorof { CommonAtt, DefEncAtt, empty}
-tendsto = element tendsto { CommonAtt, DefEncAtt, type?, empty}
-
-int.class = int
-ContExp |= int.class
-
-
-int = element int { CommonAtt, DefEncAtt, empty}
-
-Differential-Operator.class = diff
-ContExp |= Differential-Operator.class
-
-
-diff = element diff { CommonAtt, DefEncAtt, empty}
-
-partialdiff.class = partialdiff
-ContExp |= partialdiff.class
-
-
-partialdiff = element partialdiff { CommonAtt, DefEncAtt, empty}
-
-unary-veccalc.class = divergence | grad | curl | laplacian
-ContExp |= unary-veccalc.class
-
-
-divergence = element divergence { CommonAtt, DefEncAtt, empty}
-grad = element grad { CommonAtt, DefEncAtt, empty}
-curl = element curl { CommonAtt, DefEncAtt, empty}
-laplacian = element laplacian { CommonAtt, DefEncAtt, empty}
-
-nary-setlist-constructor.class = set | \list
-ContExp |= nary-setlist-constructor.class
-
-
-set = element set { CommonAtt, DefEncAtt, type?, BvarQ*, DomainQ*, ContExp*}
-\list = element \list { CommonAtt, DefEncAtt, order?, BvarQ*, DomainQ*, ContExp*}
-
-nary-set.class = union | intersect | cartesianproduct
-ContExp |= nary-set.class
-
-
-union = element union { CommonAtt, DefEncAtt, empty}
-intersect = element intersect { CommonAtt, DefEncAtt, empty}
-cartesianproduct = element cartesianproduct { CommonAtt, DefEncAtt, empty}
-
-binary-set.class = in | notin | notsubset | notprsubset | setdiff
-ContExp |= binary-set.class
-
-
-in = element in { CommonAtt, DefEncAtt, empty}
-notin = element notin { CommonAtt, DefEncAtt, empty}
-notsubset = element notsubset { CommonAtt, DefEncAtt, empty}
-notprsubset = element notprsubset { CommonAtt, DefEncAtt, empty}
-setdiff = element setdiff { CommonAtt, DefEncAtt, empty}
-
-nary-set-reln.class = subset | prsubset
-ContExp |= nary-set-reln.class
-
-
-subset = element subset { CommonAtt, DefEncAtt, empty}
-prsubset = element prsubset { CommonAtt, DefEncAtt, empty}
-
-unary-set.class = card
-ContExp |= unary-set.class
-
-
-card = element card { CommonAtt, DefEncAtt, empty}
-
-sum.class = sum
-ContExp |= sum.class
-
-
-sum = element sum { CommonAtt, DefEncAtt, empty}
-
-product.class = product
-ContExp |= product.class
-
-
-product = element product { CommonAtt, DefEncAtt, empty}
-
-limit.class = limit
-ContExp |= limit.class
-
-
-limit = element limit { CommonAtt, DefEncAtt, empty}
-
-unary-elementary.class = sin | cos | tan | sec | csc | cot | sinh | cosh | tanh | sech | csch | coth | arcsin | arccos | arctan | arccosh | arccot | arccoth | arccsc | arccsch | arcsec | arcsech | arcsinh | arctanh
-ContExp |= unary-elementary.class
-
-
-sin = element sin { CommonAtt, DefEncAtt, empty}
-cos = element cos { CommonAtt, DefEncAtt, empty}
-tan = element tan { CommonAtt, DefEncAtt, empty}
-sec = element sec { CommonAtt, DefEncAtt, empty}
-csc = element csc { CommonAtt, DefEncAtt, empty}
-cot = element cot { CommonAtt, DefEncAtt, empty}
-sinh = element sinh { CommonAtt, DefEncAtt, empty}
-cosh = element cosh { CommonAtt, DefEncAtt, empty}
-tanh = element tanh { CommonAtt, DefEncAtt, empty}
-sech = element sech { CommonAtt, DefEncAtt, empty}
-csch = element csch { CommonAtt, DefEncAtt, empty}
-coth = element coth { CommonAtt, DefEncAtt, empty}
-arcsin = element arcsin { CommonAtt, DefEncAtt, empty}
-arccos = element arccos { CommonAtt, DefEncAtt, empty}
-arctan = element arctan { CommonAtt, DefEncAtt, empty}
-arccosh = element arccosh { CommonAtt, DefEncAtt, empty}
-arccot = element arccot { CommonAtt, DefEncAtt, empty}
-arccoth = element arccoth { CommonAtt, DefEncAtt, empty}
-arccsc = element arccsc { CommonAtt, DefEncAtt, empty}
-arccsch = element arccsch { CommonAtt, DefEncAtt, empty}
-arcsec = element arcsec { CommonAtt, DefEncAtt, empty}
-arcsech = element arcsech { CommonAtt, DefEncAtt, empty}
-arcsinh = element arcsinh { CommonAtt, DefEncAtt, empty}
-arctanh = element arctanh { CommonAtt, DefEncAtt, empty}
-
-nary-stats.class = mean | sdev | variance | median | mode
-ContExp |= nary-stats.class
-
-
-mean = element mean { CommonAtt, DefEncAtt, empty}
-sdev = element sdev { CommonAtt, DefEncAtt, empty}
-variance = element variance { CommonAtt, DefEncAtt, empty}
-median = element median { CommonAtt, DefEncAtt, empty}
-mode = element mode { CommonAtt, DefEncAtt, empty}
-
-nary-constructor.class = vector | matrix | matrixrow
-ContExp |= nary-constructor.class
-
-
-vector = element vector { CommonAtt, DefEncAtt, BvarQ, DomainQ, ContExp*}
-matrix = element matrix { CommonAtt, DefEncAtt, BvarQ, DomainQ, ContExp*}
-matrixrow = element matrixrow { CommonAtt, DefEncAtt, BvarQ, DomainQ, ContExp*}
-
-unary-linalg.class = determinant | transpose
-ContExp |= unary-linalg.class
-
-
-determinant = element determinant { CommonAtt, DefEncAtt, empty}
-transpose = element transpose { CommonAtt, DefEncAtt, empty}
-
-nary-linalg.class = selector
-ContExp |= nary-linalg.class
-
-
-selector = element selector { CommonAtt, DefEncAtt, empty}
-
-binary-linalg.class = vectorproduct | scalarproduct | outerproduct
-ContExp |= binary-linalg.class
-
-
-vectorproduct = element vectorproduct { CommonAtt, DefEncAtt, empty}
-scalarproduct = element scalarproduct { CommonAtt, DefEncAtt, empty}
-outerproduct = element outerproduct { CommonAtt, DefEncAtt, empty}
-
-constant-set.class = integers | reals | rationals | naturalnumbers | complexes | primes | emptyset
-ContExp |= constant-set.class
-
-
-integers = element integers { CommonAtt, DefEncAtt, empty}
-reals = element reals { CommonAtt, DefEncAtt, empty}
-rationals = element rationals { CommonAtt, DefEncAtt, empty}
-naturalnumbers = element naturalnumbers { CommonAtt, DefEncAtt, empty}
-complexes = element complexes { CommonAtt, DefEncAtt, empty}
-primes = element primes { CommonAtt, DefEncAtt, empty}
-emptyset = element emptyset { CommonAtt, DefEncAtt, empty}
-
-constant-arith.class = exponentiale | imaginaryi | notanumber | true | false | pi | eulergamma | infinity
-ContExp |= constant-arith.class
-
-
-exponentiale = element exponentiale { CommonAtt, DefEncAtt, empty}
-imaginaryi = element imaginaryi { CommonAtt, DefEncAtt, empty}
-notanumber = element notanumber { CommonAtt, DefEncAtt, empty}
-true = element true { CommonAtt, DefEncAtt, empty}
-false = element false { CommonAtt, DefEncAtt, empty}
-pi = element pi { CommonAtt, DefEncAtt, empty}
-eulergamma = element eulergamma { CommonAtt, DefEncAtt, empty}
-infinity = element infinity { CommonAtt, DefEncAtt, empty}
\ No newline at end of file
diff --git a/RelaxNG/mathml4/mathml4-presentation.rnc b/RelaxNG/mathml4/mathml4-presentation.rnc
deleted file mode 100644
index 98e2c802..00000000
--- a/RelaxNG/mathml4/mathml4-presentation.rnc
+++ /dev/null
@@ -1,371 +0,0 @@
-
-#     This is the Mathematical Markup Language (MathML) 4.0, an XML
-#     application for describing mathematical notation and capturing
-#     both its structure and content.
-#
-#     Copyright 1998-2019 W3C (MIT, ERCIM, Keio, Beihang)
-# 
-#     Use and distribution of this code are permitted under the terms
-#     W3C Software Notice and License
-#     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
-## MathML Core
-include "mathml4-core.rnc" 
-
-
-MathExpression |= PresentationExpression
-
-TableRowExpression |= mlabeledtr
-
-
-MstackExpression = MathExpression|mscarries|msline|msrow|msgroup
-
-MsrowExpression = MathExpression|none
-
-
-linestyle = "none" | "solid" | "dashed"
-
-verticalalign =
-      "top" |
-      "bottom" |
-      "center" |
-      "baseline" |
-      "axis"
-
-columnalignstyle = "left" | "center" | "right"
-
-notationstyle =
-     "longdiv" |
-     "actuarial" |
-     "radical" |
-     "box" |
-     "roundedbox" |
-     "circle" |
-     "left" |
-     "right" |
-     "top" |
-     "bottom" |
-     "updiagonalstrike" |
-     "downdiagonalstrike" |
-     "verticalstrike" |
-     "horizontalstrike" |
-     "madruwb"
-
-idref = text
-unsigned-integer = xsd:unsignedLong
-integer = xsd:integer
-number = xsd:decimal
-
-character = xsd:string {
-  pattern = '\s*\S\s*'}
-
-
-group-alignment = "left" | "center" | "right" | "decimalpoint"
-group-alignment-list = list {group-alignment+}
-group-alignment-list-list = xsd:string {
-  pattern = '(\s*\{\s*(left|center|right|decimalpoint)(\s+(left|center|right|decimalpoint))*\})*\s*' }
-positive-integer = xsd:positiveInteger
-
-
-token.content |= mglyph|malignmark|text
-
-
-
-mo.attributes |= 
-  attribute linebreak {"auto" | "newline" | "nobreak" | "goodbreak" | "badbreak"}?,
-  attribute lineleading {length}?,
-  attribute linebreakstyle {"before" | "after" | "duplicate" | "infixlinebreakstyle"}?,
-  attribute linebreakmultchar {text}?,
-  attribute indentalign {"left" | "center" | "right" | "auto" | "id"}?,
-  attribute indentshift {length}?,
-  attribute indenttarget {idref}?,
-  attribute indentalignfirst {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentshiftfirst {length | "indentshift"}?,
-  attribute indentalignlast {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentshiftlast {length | "indentshift"}?
-
-
-mspace.attributes |= 
-  attribute linebreak {"auto" | "newline" | "nobreak" | "goodbreak" | "badbreak" | "indentingnewline"}?,
-  attribute indentalign {"left" | "center" | "right" | "auto" | "id"}?,
-  attribute indentshift {length}?,
-  attribute indenttarget {idref}?,
-  attribute indentalignfirst {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentshiftfirst {length | "indentshift"}?,
-  attribute indentalignlast {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentshiftlast {length | "indentshift"}?
-
-
-ms.attributes |= 
-  attribute lquote {text}?,
-  attribute rquote {text}?
-
-
-mglyph = element mglyph {mglyph.attributes,mglyph.deprecatedattributes,empty}
-mglyph.attributes = 
-  GlobalAttributes,
-  attribute src {xsd:anyURI}?,
-  attribute width {length}?,
-  attribute height {length}?,
-  attribute valign {length}?,
-  attribute alt {text}?
-mglyph.deprecatedattributes =
-  attribute index {integer}?,
-  attribute mathvariant {"normal" | "bold" | "italic" | "bold-italic" | "double-struck" | "bold-fraktur" | "script" | "bold-script" | "fraktur" | "sans-serif" | "bold-sans-serif" | "sans-serif-italic" | "sans-serif-bold-italic" | "monospace" | "initial" | "tailed" | "looped" | "stretched"}?,
-  attribute mathsize {"small" | "normal" | "big" | length}?
-
-msline = element msline {msline.attributes,empty}
-msline.attributes = 
-  GlobalAttributes,
-  attribute position {integer}?,
-  attribute length {unsigned-integer}?,
-  attribute leftoverhang {length}?,
-  attribute rightoverhang {length}?,
-  attribute mslinethickness {length | "thin" | "medium" | "thick"}?
-
-
-
-MalignExpression = maligngroup|malignmark
-
-malignmark = element malignmark {malignmark.attributes, empty}
-malignmark.attributes = 
-  GlobalAttributes,
-  attribute edge {"left" | "right"}?
-
-
-maligngroup = element maligngroup {maligngroup.attributes, empty}
-maligngroup.attributes = 
-  GlobalAttributes,
-  attribute groupalign {"left" | "center" | "right" | "decimalpoint"}?
-
-
-PresentationExpression = TokenExpression|MalignExpression|
-                         mrow|mfrac|msqrt|mroot|mstyle|merror|mpadded|mphantom|
-                         mfenced|menclose|msub|msup|msubsup|munder|mover|munderover|
-                         mmultiscripts|mtable|mstack|mlongdiv|maction
-
-
-
-
-
-mfrac.attributes |= 
-  attribute numalign {"left" | "center" | "right"}?,
-  attribute denomalign {"left" | "center" | "right"}?,
-  attribute bevelled {"true" | "false"}?
-
-
-
-mstyle.attributes |= 
-  mstyle.specificattributes,
-  mstyle.generalattributes,
-  mstyle.deprecatedattributes
-
-mstyle.specificattributes =
-  attribute scriptlevel {integer}?,
-  attribute displaystyle {"true" | "false"}?,
-  attribute scriptsizemultiplier {number}?,
-  attribute scriptminsize {length}?,
-  attribute infixlinebreakstyle {"before" | "after" | "duplicate"}?,
-  attribute decimalpoint {character}?
-
-mstyle.generalattributes =
-  attribute accent {"true" | "false"}?,
-  attribute accentunder {"true" | "false"}?,
-  attribute align {"left" | "right" | "center"}?,
-  attribute alignmentscope {list {("true" | "false") +}}?,
-  attribute bevelled {"true" | "false"}?,
-  attribute charalign {"left" | "center" | "right"}?,
-  attribute charspacing {length | "loose" | "medium" | "tight"}?,
-  attribute close {text}?,
-  attribute columnalign {list {columnalignstyle+} }?,
-  attribute columnlines {list {linestyle +}}?,
-  attribute columnspacing {list {(length) +}}?,
-  attribute columnspan {positive-integer}?,
-  attribute columnwidth {list {("auto" | length | "fit") +}}?,
-  attribute crossout {list {("none" | "updiagonalstrike" | "downdiagonalstrike" | "verticalstrike" | "horizontalstrike")*}}?,
-  attribute denomalign {"left" | "center" | "right"}?,
-  attribute depth {length}?,
-  attribute dir {"ltr" | "rtl"}?,
-  attribute edge {"left" | "right"}?,
-  attribute equalcolumns {"true" | "false"}?,
-  attribute equalrows {"true" | "false"}?,
-  attribute fence {"true" | "false"}?,
-  attribute form {"prefix" | "infix" | "postfix"}?,
-  attribute frame {linestyle}?,
-  attribute framespacing {list {length, length}}?,
-  attribute groupalign {group-alignment-list-list}?,
-  attribute height {length}?,
-  attribute indentalign {"left" | "center" | "right" | "auto" | "id"}?,
-  attribute indentalignfirst {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentalignlast {"left" | "center" | "right" | "auto" | "id" | "indentalign"}?,
-  attribute indentshift {length}?,
-  attribute indentshiftfirst {length | "indentshift"}?,
-  attribute indentshiftlast {length | "indentshift"}?,
-  attribute indenttarget {idref}?,
-  attribute largeop {"true" | "false"}?,
-  attribute leftoverhang {length}?,
-  attribute length {unsigned-integer}?,
-  attribute linebreak {"auto" | "newline" | "nobreak" | "goodbreak" | "badbreak"}?,
-  attribute linebreakmultchar {text}?,
-  attribute linebreakstyle {"before" | "after" | "duplicate" | "infixlinebreakstyle"}?,
-  attribute lineleading {length}?,
-  attribute linethickness {length | "thin" | "medium" | "thick"}?,
-  attribute location {"w" | "nw" | "n" | "ne" | "e" | "se" | "s" | "sw"}?,
-  attribute longdivstyle {"lefttop" | "stackedrightright" | "mediumstackedrightright" | "shortstackedrightright" | "righttop" | "left/\right" | "left)(right" | ":right=right" | "stackedleftleft" | "stackedleftlinetop"}?,
-  attribute lquote {text}?,
-  attribute lspace {length}?,
-  attribute mathsize {"small" | "normal" | "big" | length}?,
-  attribute mathvariant {"normal" | "bold" | "italic" | "bold-italic" | "double-struck" | "bold-fraktur" | "script" | "bold-script" | "fraktur" | "sans-serif" | "bold-sans-serif" | "sans-serif-italic" | "sans-serif-bold-italic" | "monospace" | "initial" | "tailed" | "looped" | "stretched"}?,
-  attribute maxsize {length | "infinity"}?,
-  attribute minlabelspacing {length}?,
-  attribute minsize {length}?,
-  attribute movablelimits {"true" | "false"}?,
-  attribute mslinethickness {length | "thin" | "medium" | "thick"}?,
-  attribute notation {text}?,
-  attribute numalign {"left" | "center" | "right"}?,
-  attribute open {text}?,
-  attribute position {integer}?,
-  attribute rightoverhang {length}?,
-  attribute rowalign {list {verticalalign+} }?,
-  attribute rowlines {list {linestyle +}}?,
-  attribute rowspacing {list {(length) +}}?,
-  attribute rowspan {positive-integer}?,
-  attribute rquote {text}?,
-  attribute rspace {length}?,
-  attribute selection {positive-integer}?,
-  attribute separator {"true" | "false"}?,
-  attribute separators {text}?,
-  attribute shift {integer}?,
-  attribute side {"left" | "right" | "leftoverlap" | "rightoverlap"}?,
-  attribute stackalign {"left" | "center" | "right" | "decimalpoint"}?,
-  attribute stretchy {"true" | "false"}?,
-  attribute subscriptshift {length}?,
-  attribute superscriptshift {length}?,
-  attribute symmetric {"true" | "false"}?,
-  attribute valign {length}?,
-  attribute width {length}?
-
-mstyle.deprecatedattributes =
-  attribute veryverythinmathspace {length}?,
-  attribute verythinmathspace {length}?,
-  attribute thinmathspace {length}?,
-  attribute mediummathspace {length}?,
-  attribute thickmathspace {length}?,
-  attribute verythickmathspace {length}?,
-  attribute veryverythickmathspace {length}?
-
-
-math.attributes &= mstyle.specificattributes
-math.attributes &= mstyle.generalattributes
-
-mfenced = element mfenced {mfenced.attributes, MathExpression*}
-mfenced.attributes = 
-  GlobalAttributes,
-  attribute open {text}?,
-  attribute close {text}?,
-  attribute separators {text}?
-
-
-menclose = element menclose {menclose.attributes, ImpliedMrow}
-menclose.attributes = 
-  GlobalAttributes,
-  attribute notation {text}?
-
-
-munder.attributes |= 
-  attribute align {"left" | "right" | "center"}?
-
-mover.attributes |= 
-  attribute align {"left" | "right" | "center"}?
-
-munderover.attributes |= 
-  attribute align {"left" | "right" | "center"}?
-
-mtable.attributes |= 
-  attribute align {xsd:string {
-    pattern ='\s*(top|bottom|center|baseline|axis)(\s+-?[0-9]+)?\s*'}}?,
-  attribute rowalign {list {verticalalign+} }?,
-  attribute columnalign {list {columnalignstyle+} }?,
-  attribute groupalign {group-alignment-list-list}?,
-  attribute alignmentscope {list {("true" | "false") +}}?,
-  attribute columnwidth {list {("auto" | length | "fit") +}}?,
-  attribute width {"auto" | length}?,
-  attribute rowspacing {list {(length) +}}?,
-  attribute columnspacing {list {(length) +}}?,
-  attribute rowlines {list {linestyle +}}?,
-  attribute columnlines {list {linestyle +}}?,
-  attribute frame {linestyle}?,
-  attribute framespacing {list {length, length}}?,
-  attribute equalrows {"true" | "false"}?,
-  attribute equalcolumns {"true" | "false"}?,
-  attribute displaystyle {"true" | "false"}?,
-  attribute side {"left" | "right" | "leftoverlap" | "rightoverlap"}?,
-  attribute minlabelspacing {length}?
-
-
-mlabeledtr = element mlabeledtr {mlabeledtr.attributes, mtd+}
-mlabeledtr.attributes = 
-  mtr.attributes
-
-
-
-      
-mtr.attributes |= 
-  attribute rowalign {"top" | "bottom" | "center" | "baseline" | "axis"}?,
-  attribute columnalign {list {columnalignstyle+} }?,
-  attribute groupalign {group-alignment-list-list}?
-
-
-
-mtd.attributes |= 
-  attribute rowalign {"top" | "bottom" | "center" | "baseline" | "axis"}?,
-  attribute columnalign {columnalignstyle}?,
-  attribute groupalign {group-alignment-list}?
-
-
-mstack = element mstack {mstack.attributes, MstackExpression*}
-mstack.attributes = 
-  GlobalAttributes,
-  attribute align {xsd:string {
-    pattern ='\s*(top|bottom|center|baseline|axis)(\s+-?[0-9]+)?\s*'}}?,
-  attribute stackalign {"left" | "center" | "right" | "decimalpoint"}?,
-  attribute charalign {"left" | "center" | "right"}?,
-  attribute charspacing {length | "loose" | "medium" | "tight"}?
-
-
-mlongdiv = element mlongdiv {mlongdiv.attributes, MstackExpression,MstackExpression,MstackExpression+}
-mlongdiv.attributes = 
-  msgroup.attributes,
-  attribute longdivstyle {"lefttop" | "stackedrightright" | "mediumstackedrightright" | "shortstackedrightright" | "righttop" | "left/\right" | "left)(right" | ":right=right" | "stackedleftleft" | "stackedleftlinetop"}?
-
-
-msgroup = element msgroup {msgroup.attributes, MstackExpression*}
-msgroup.attributes = 
-  GlobalAttributes,
-  attribute position {integer}?,
-  attribute shift {integer}?
-
-
-msrow = element msrow {msrow.attributes, MsrowExpression*}
-msrow.attributes = 
-  GlobalAttributes,
-  attribute position {integer}?
-
-
-mscarries = element mscarries {mscarries.attributes, (MsrowExpression|mscarry)*}
-mscarries.attributes = 
-  GlobalAttributes,
-  attribute position {integer}?,
-  attribute location {"w" | "nw" | "n" | "ne" | "e" | "se" | "s" | "sw"}?,
-  attribute crossout {list {("none" | "updiagonalstrike" | "downdiagonalstrike" | "verticalstrike" | "horizontalstrike")*}}?,
-  attribute scriptsizemultiplier {number}?
-
-
-mscarry = element mscarry {mscarry.attributes, MsrowExpression*}
-mscarry.attributes = 
-  GlobalAttributes,
-  attribute location {"w" | "nw" | "n" | "ne" | "e" | "se" | "s" | "sw"}?,
-  attribute crossout {list {("none" | "updiagonalstrike" | "downdiagonalstrike" | "verticalstrike" | "horizontalstrike")*}}?
-
-
diff --git a/RelaxNG/mathml4/mathml4-strict-content.rnc b/RelaxNG/mathml4/mathml4-strict-content.rnc
deleted file mode 100644
index f6c17759..00000000
--- a/RelaxNG/mathml4/mathml4-strict-content.rnc
+++ /dev/null
@@ -1,60 +0,0 @@
-#     This is the Mathematical Markup Language (MathML) 4.0, an XML
-#     application for describing mathematical notation and capturing
-#     both its structure and content.
-#
-#     Copyright 1998-2014 W3C (MIT, ERCIM, Keio, Beihang)
-# 
-#     Use and distribution of this code are permitted under the terms
-#     W3C Software Notice and License
-#     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
-default namespace m = "http://www.w3.org/1998/Math/MathML"
-
-ContExp = semantics-contexp | cn | ci | csymbol | apply | bind | share | cerror | cbytes | cs
-
-cn = element cn {cn.attributes,cn.content}
-cn.content = text
-cn.attributes = CommonAtt, attribute type {"integer" | "real" | "double" | "hexdouble"}
-
-semantics-ci = element semantics {semantics.attributes,(ci|semantics-ci), 
-  (annotation|annotation-xml)*}
-
-semantics-contexp = element semantics {semantics.attributes,ContExp, 
-  (annotation|annotation-xml)*}
-
-ci = element ci {ci.attributes, ci.content}
-ci.attributes = CommonAtt, ci.type?
-ci.type = attribute type {"integer" | "rational" | "real" | "complex" | "complex-polar" | "complex-cartesian" | "constant" | "function" | "vector" | "list" | "set" | "matrix"}
-ci.content = text
-
-
-csymbol = element csymbol {csymbol.attributes,csymbol.content}
-
-SymbolName = xsd:NCName
-csymbol.attributes = CommonAtt, cd
-csymbol.content = SymbolName
-
-BvarQ = bvar*
-bvar = element bvar {CommonAtt, (ci | semantics-ci)}
-
-apply = element apply {CommonAtt,apply.content}
-apply.content = ContExp+
-
-
-bind = element bind {CommonAtt,bind.content}
-bind.content = ContExp,bvar*,ContExp
-
-share = element share {CommonAtt, src, empty}
-
-cerror = element cerror {cerror.attributes, csymbol, ContExp*}
-cerror.attributes = CommonAtt
-
-cbytes = element cbytes {cbytes.attributes, base64}
-cbytes.attributes = CommonAtt
-base64 = xsd:base64Binary
-
-cs = element cs {cs.attributes, text}
-cs.attributes = CommonAtt
-
-MathExpression |= ContExp
diff --git a/RelaxNG/mathml4/mathml4.rnc b/RelaxNG/mathml4/mathml4.rnc
deleted file mode 100644
index ec5b21d9..00000000
--- a/RelaxNG/mathml4/mathml4.rnc
+++ /dev/null
@@ -1,21 +0,0 @@
-#     This is the Mathematical Markup Language (MathML) 3.0, an XML
-#     application for describing mathematical notation and capturing
-#     both its structure and content.
-#
-#     Copyright 1998-2019 W3C (MIT, ERCIM, Keio)
-# 
-#     Use and distribution of this code are permitted under the terms
-#     W3C Software Notice and License
-#     http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-
-default namespace m = "http://www.w3.org/1998/Math/MathML"
-
-## Content  MathML
-include "mathml4-content.rnc" 
-
-## Presentation MathML
-include "mathml4-presentation.rnc"
-
-## math and semantics common to both Content and Presentation
-include "mathml4-common.rnc"
diff --git a/index.html b/index.html
index 0063e167..111b1c0d 100644
--- a/index.html
+++ b/index.html
@@ -36,6 +36,14 @@
 	  ],
    github: "https://github.com/w3c/mathml",
    localBiblio: {     
+	      "MathML-Core": {
+		  title: "MathML Core",
+		                    authors: [
+                      "Frédéric Wang, et al."
+                  ],
+                  status: "ED",
+                  href: "https://w3c.github.io/mathml-core/"
+	      },
    "Pierce1961": {title: "Pierce1961"},
    "Cajori1928": {title: "Cajori1928"},
    "Knuth1986": {title: "Knuth1986"},
@@ -48,7 +56,7 @@
    "XMLSchemas": {title: "XMLSchemas"},
    "Namespaces": {title: "Namespaces"},
    "HTML4": {title: "HTML4"},
-   "Entities": {title: "Entities"},
+   "Entities": {title: "XML Entity Definitions for Characters"},
    "MathMLforCSS": {title: "MathMLforCSS"},
    "Chaundy1954": {title: "Chaundy1954"},
    "IEEE754": {title: "IEEE754"},
@@ -69,6 +77,7 @@
   <script class='remove'>
     function relaxhl (r,s,u) {
 	var s2=s.replaceAll(/#[^\n]*/g,'<span style="color:brown">$&</span>');
+	s2=s2.replaceAll(/([a-z0-9A-Z-]+)(\s*=\s*[^"])/g,'<b>$1</b>$2');
 	s2=s2.replaceAll(/include *"([^"]*)"/g,'<span style="color:green">include</span> "<span style="color:red">$1</span>"');
 	return  s2;
     }
@@ -358,45 +367,20 @@ <h3 id="parsing_usingrnc">Using the RelaxNG Schema for Mathml4</h3>
     <p>In contrast to DTDs there is no in-document method to associate a RelaxNG schema with
     a document.</p>
     
-    <p>We provide five RelaxNG schema for Mathml4 in five parts:
-    </p>
-    <ul>
-     <li>
-      <p>The grammar for full MathML</p>
-     </li>
-     <li>
-      <p>The grammar for elements common to Content and Presentation</p>
-     </li>
-     <li>
-      <p>The grammar for Presentation MathML</p>
-     </li>
-     <li>
-      <p>The grammar for Strict Content MathML</p>
-     </li>
-     <li>
-      <p>The grammar for Content Mathml4</p>
-     </li>
-    </ul>
-    
-    <section>
-     <h4 id="parsing_rnc_full">Full MathML</h4>
-     
-     <p>The RelaxNG schema for full MathML builds on the schema describing the various parts
-     of the language which are given in the following sections. It can be found at <a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc">http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc</a>.</p>
-     
-     <pre data-include="src/rnc-full.html" data-include-replace="true"></pre>
-    </section>
-    
+  
+   
+
     <section>
-     <h4 id="parsing_rnc_common">Elements Common to Presentation and Content MathML</h4>
+     <h4 id="parsing_rnc_pres">The Grammar for MathML Core</h4>
      
-     <pre data-include="src/rnc-common.html" data-include-replace="true"></pre>
+     <pre class="nohighlight" style="white-space:pre-wrap" data-oninclude="relaxhl" data-include-format='html' data-include="https://raw.githubusercontent.com/mathml-refresh/mathml-schema/main/rnc/mathml4-core.rnc" ></pre>
+
     </section>
     
     <section>
      <h4 id="parsing_rnc_pres">The Grammar for Presentation MathML</h4>
      
-     <pre class="nohighlight" data-oninclude="relaxhl" data-include-format='html' data-include="RelaxNG/mathml4/mathml4-presentation.rnc" ></pre>
+     <pre class="nohighlight" style="white-space:pre-wrap" data-oninclude="relaxhl" data-include-format='html' data-include="https://raw.githubusercontent.com/mathml-refresh/mathml-schema/main/rnc/mathml4-presentation.rnc" ></pre>
 
     </section>
     
@@ -405,7 +389,7 @@ <h4 id="parsing_rnc_strict">The Grammar for Strict Content Mathml4</h4>
      
      <p>The grammar for Strict Content Mathml4 can be found at <a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4-strict-content.rnc">http://www.w3.org/Math/RelaxNG/mathml4/mathml4-strict-content.rnc</a>.</p>
      
-     <pre data-include="src/rnc-strict.html" data-include-replace="true"></pre>
+     <pre class="nohighlight" style="white-space:pre-wrap" data-oninclude="relaxhl" data-include-format='html' data-include="https://raw.githubusercontent.com/mathml-refresh/mathml-schema/main/rnc/mathml4-strict-content.rnc" ></pre>
     </section>
     
     
@@ -415,10 +399,21 @@ <h4 id="parsing_rnc_content">The Grammar for Content MathML</h4>
      <p>The grammar for Content Mathml4 builds on the grammar for the Strict Content MathML
      subset, and can be found at <a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4-content.rnc">http://www.w3.org/Math/RelaxNG/mathml4/mathml4-content.rnc</a>.</p>
      
-     <pre data-include="src/rnc-content.html" data-include-replace="true"></pre>
+     <pre class="nohighlight" style="white-space:pre-wrap" data-oninclude="relaxhl" data-include-format='html' data-include="https://raw.githubusercontent.com/mathml-refresh/mathml-schema/main/rnc/mathml4-content.rnc" ></pre>
      
     </section>
-    
+
+    <section>
+     <h4 id="parsing_rnc_full">The Grammar for Full MathML</h4>
+     
+     <p>The grammar for full Mathml4 is simply a merger of thae above grammars,
+     sand can be found at <a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc">http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc</a>.</p>
+     
+     <pre class="nohighlight" style="white-space:pre-wrap" data-oninclude="relaxhl" data-include-format='html' data-include="https://raw.githubusercontent.com/mathml-refresh/mathml-schema/main/rnc/mathml4.rnc" ></pre>
+     
+    </section>
+
+
     <section>
      <h4 id="parsing_rnc_module">MathML as a module in a RelaxNG Schema</h4>
      
@@ -561,16 +556,6 @@ <h4 id="parsing_rnc_module">MathML as a module in a RelaxNG Schema</h4>
      <code>Inline.class</code> and <code>Block.class</code> to collect the the content models
      for inline and block-level elements.</p>
      
-     <p>Customizing the Mathml4 schema so that we can restrict the content of
-     <code class="element">annotation-xml</code> elements is similarly simple, for example:
-     
-     <div class="example ">
-      <pre># A RelaxNG Schema for MathML with OpenMath3 annotations
-      omobj = external "openmath3.rnc" 
-      include "mathml4.rnc" {anotation-xml.model = omobj}</pre>
-     </div>
-     </p>
-     
      <p>
       The Mathml4 schema is organized so that subsetting to one of the sublanguages specified
       here is easy.
diff --git a/src/parsing-1.html b/src/parsing-1.html
index 136044e0..07c67eaa 100644
--- a/src/parsing-1.html
+++ b/src/parsing-1.html
@@ -1,54 +1,24 @@
 <section>
-      <h3 id="parsing_wellformed">Use of MathML as Well-Formed XML</h3>
-      
-      
- 
-    
-      
-      <p>A MathML document must be a well-formed XML document using elements in the MathML
-         namespace as defined by this specification, however it is not required that the document
-         refer to any specific Document Type Definition (DTD) or schema that specifies MathML.
-         It
-         is sometimes advantageous <em>not</em> to specify such a language definition as these
-         files are large, often much larger than the MathML expression and unless they have
-         been
-         previously cached by the MathML application, the time taken to fetch the DTD or schema
-         may
-         have an appreciable effect on the processing of the MathML document.</p>
-      
-      
-      <p>Note that if no DTD is specified with a DOCTYPE declaration, that entity
-         references (for example to refer to MathML characters by name) may not be used. The
-         document should be encoded in an encoding (for example UTF-8) in which all needed
-         characters may be encoded as character data, or characters may be referenced using
-         numeric
-         character references, for example &amp;#x222B; rather than &amp;int;</p>
-      
-      
-      <p>If a MathML fragment is parsed without a DTD, in other words as a well-formed XML
-         fragment, it is the responsibility of the processing application to treat the white
-         space
-         characters occurring outside of token elements as not significant.</p>
-      
-      
-      <p>However, in many circumstances, especially while producing or editing MathML, it is
-         useful to use a language definition to constrain the editing process or to check the
-         correctness of generated files. The following section, <a href="#parsing_usingrnc"></a>,
-         discusses the RelaxNG Schema for Mathml4 [[RELAX-NG]], which forms a normative
-         part of the specification. Following that, <a href="#parsing_usingxsd"></a>, and <a href="#parsing_usingdtd"></a> discuss alternative languages definition using the document type
-         definitions (DTD) and the W3C XML schema language, [[XMLSchemas]], both of
-         which are derived from the normative RelaxNG schema automatically.  One should note
-         that
-         the schema definitions of the language is currently stricter than the DTD version.
-         That
-         is, a schema validating processor will declare invalid documents that are declared
-         valid
-         by a (DTD) validating XML parser. This is partly due to the fact that the XML schema
-         language may express additional constraints not expressable in the DTD, and partly
-         due to
-         the fact that for reasons of compatibility with earlier releases, the DTD is intentionally
-         forgiving in some places and does not enforce constraints that are specified in the
-         text
-         of this specification.</p>
-      </section>
+  <h3 id="parsing_wellformed">Validating MathML</h3>
+      
+ <p>Presented here are Relax NG schema for MathML.
+ A Relax NG Schema is most naturally associated with the XML serialization
+ of MathML, but may also form the basis of  validation in other
+ formats. (Some HTML validators are based on Relax NG for
+ example).</p>
+ <p>Even when using the XML serialization, some normalization of
+ the input may be required before applying these schema, Notably,
+ following HTML, [[MathML-Core]] allows attributes such as
+ <code>onclick</code> to be specified in any case, eg
+ <code>OnClick="..."</code>
+ It is not practically feasible to specify that attribute names are
+ case insensitive here so only the lowercase names are allowed.
+ Similarly any attribute with name starting with the prefix
+ <code>data-</code> should be considered valid. The schema here only
+ allows a fixed attribute, <code>data-extra</code>,so input should be
+ normalized to remove data attributes before validating, or the schema
+ should be extended to support th attributes used in a particular
+ application.</p>
+           
+</section>
    
diff --git a/src/parsing-2.html b/src/parsing-2.html
index b204dc32..cc4787a2 100644
--- a/src/parsing-2.html
+++ b/src/parsing-2.html
@@ -1,51 +1,16 @@
-   
+
    <section>
       <h3 id="parsing_usingdtd">Using the MathML DTD</h3>
       
       
-      
-      
-      <section>
-         <h4 id="interf_validation">Document Validation Issues</h4>
-         
-         
-         <p>The use of namespace prefixes creates an issue for DTD validation
-            of documents embedding MathML.  DTD validation requires knowing the
-            literal (possibly prefixed) element names used in the document.
-            However, the Namespaces in XML Recommendation [[Namespaces]] allows the prefix to be changed at arbitrary points
-            in the document, since namespace prefixes may be declared on any
-            element.</p>
-         
-         
-         
-         <p>The MathML DTD uses the strategy outlined in [[Modularization]]
-            of making every element
-            name in the DTD be accessed by an entity reference. This means that by
-            declaring a couple of entities to specify the prefix before the DTD is
-            loaded, the prefix can be chosen by a document author, and compound
-            DTDs that include several modules can, without changing the module
-            DTDs, specify unique prefixes for each module to avoid clashes.</p>
-         
-         </section>
-      
-      
-      <section>
-         <h4>Attribute values in the MathML DTD</h4>
-         
-         
-         
-         
-         <p>Note that the DTD is far more permissive than the Relax NG schema, many constraints
-            on attribute values may not be enforced using DTD syntax.
-            For example, many attributes expect numerical values or specific micro-syntax, but
-            are declared as CDATA (arbitrary string) in the DTD.
-            However, lack of enforcement of a requirement in the DTD
-            does <em>not</em> imply that the requirement is not part of the MathML
-            language itself, or that it will not be enforced by a particular MathML
-            renderer. (See <a href="#interf_error"></a> for a description of how
-            MathML renderers should respond to MathML errors.)</p>
-         
+                
+         <p>The MathML DTD uses the strategy outlined in
+           [[Modularization]] to allow the use of namespace prefixes
+           on MathML eelements. However it is recommended that
+           namespace prefixes are not used in XML serialisation of
+           MathML, for compatibility with the HTML serialisation.</p>
          
+               
          <p>Furthermore, the MathML DTD is provided for convenience; although it is
             intended to be fully compatible with the text of the specification, the
             text should be taken as definitive if there is a contradiction.  (Any
@@ -53,14 +18,7 @@ <h4>Attribute values in the MathML DTD</h4>
             be resolved by favoring <a href="#chars"></a> first, then <a href="#presm"></a>, <a href="#contm"></a>, then <a href="#fund_syntax"></a>,
             and then other parts of the text.)</p>
          
-         </section>
       
-      
-      
-      
-      <section>
-         <h4 id="parsing_doctype">DOCTYPE declaration for MathML</h4>
-         
          <p>MathML documents should be validated using the XML DTD for
             MathML,
             <a href="http://www.w3.org/Math/DTD/mathml4/mathml4.dtd">http://www.w3.org/Math/DTD/mathml4/mathml4.dtd</a>.
@@ -72,13 +30,22 @@ <h4 id="parsing_doctype">DOCTYPE declaration for MathML</h4>
             
             <div class="example ">
                <pre>&lt;!DOCTYPE math 
-    PUBLIC "-//W3C//DTD MathML 3.0//EN"
+    PUBLIC "-//W3C//DTD MathML 4.0//EN"
            "http://www.w3.org/Math/DTD/mathml4/mathml4.dtd"&gt;</pre>
             </div>
             The URI may be changed to that of a local copy
-            of the DTD if required.</p>
-         </section>
-      
+         of the DTD if required.</p>
+
+	 <p>Note that unlike the HTML serialization, when using the
+	 XML serialization, character entity references such as
+	 <code>&amp;int</code> may not be used unless a DTD is
+	 specified, either the full MathML DTD as described here or the
+         set of HTML/MathML entity declarations as specified by [[Entities].
+	 Characters may always be specified by using character data directly, or numeric character referencess, so
+	 <code>∫</code> or <code>&amp;#x222B;</code> rather than
+	 <code>&amp;int;</code>.</p>
+      
+
       </section>
    
    
@@ -93,58 +60,7 @@ <h3 id="parsing_usingxsd">Using the MathML XML Schema</h3>
          provided schema  has been mechanically generated from the Relax NG schema, it omits
          some constraints that can not be enforced using XSD syntax.</p>
       
-      
-      
-      <section>
-         <h4 id="parsing_schemalocation">Associating the MathML schema with MathML fragments</h4>
-         
-         
-         
-         <p>Similarly to the DOCTYPE declaration used in documents, it is possible to link a MathML
-            fragment to the XML Schema, as shown below.</p>
-         
-         
-         <div class="example mathml-fragment">
-            <pre>&lt;mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://www.w3.org/1998/Math/MathML
-            http://www.w3.org/Math/XMLSchema/mathml4/mathml4.xsd"&gt;
-...
-&lt;/mml:math&gt;</pre>
-         </div>
-         
-         
-         <p>The <code class="attribute">xsi:schemaLocation</code> attribute belongs to the XML Schema
-            instance namespace, defined in [[XMLSchemas]].  The value
-            of the attribute is a pair of URIs: the first is the MathML namespace
-            URI and the second is the location of the schema for that
-            namespace. The second URI may be changed to that of a local copy if
-            required.</p>
-         
-         
-         <p>As the XML Schema specification indicates, the use of the
-            <code class="attribute">schemaLocation</code> attribute is only a hint for schema
-            processors: validation by a MathML-aware processor can be performed
-            without requiring that the <code class="attribute">schemaLocation</code> attribute be
-            declared in the instance. Moreover, a processor can even ignore or
-            override the specified schema URI, if it is directed to.</p>
-         </section>
-      
-      
-      </section>
-   
-   
-   <section>
-      <h3 id="parsing_mml_xhtml">Parsing MathML in XHTML</h3>
-      
-      
-      <p>As noted in <a href="#interf_xhtml"></a> The schema used for
-         XHTML+MathML documents extends the content model of <code class="element">mtext</code> to
-         allow inline (phrasing) html elements. The extension used by the W3C
-         validator uses the RelaxNG schema, however DTD and XSD versions of the
-         grammar may be similarly extended.</p>
-      </section>
-   
+   </section>
    
    <section>
       <h3 id="parsing_mml_html">Parsing MathML in HTML</h3>
@@ -152,3 +68,4 @@ <h3 id="parsing_mml_html">Parsing MathML in HTML</h3>
       
       <p>See <a href="#interf_html"></a> for more details of the parsing of MathML in HTML.</p>
       </section>
+

From 4bb74ce25f9a6b976a80c9f819cc0e34995d8445 Mon Sep 17 00:00:00 2001
From: David Carlisle <d.p.carlisle@gmail.com>
Date: Sun, 27 Feb 2022 21:27:13 +0000
Subject: [PATCH 3/6] edits after review in PR #269

---
 index.html         |  4 ++--
 src/parsing-1.html |  5 ++---
 src/parsing-2.html | 34 ++++------------------------------
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/index.html b/index.html
index 111b1c0d..6ba265a7 100644
--- a/index.html
+++ b/index.html
@@ -406,8 +406,8 @@ <h4 id="parsing_rnc_content">The Grammar for Content MathML</h4>
     <section>
      <h4 id="parsing_rnc_full">The Grammar for Full MathML</h4>
      
-     <p>The grammar for full Mathml4 is simply a merger of thae above grammars,
-     sand can be found at <a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc">http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc</a>.</p>
+     <p>The grammar for full Mathml4 is simply a merger of the above grammars,
+     and can be found at <a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc">http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc</a>.</p>
      
      <pre class="nohighlight" style="white-space:pre-wrap" data-oninclude="relaxhl" data-include-format='html' data-include="https://raw.githubusercontent.com/mathml-refresh/mathml-schema/main/rnc/mathml4.rnc" ></pre>
      
diff --git a/src/parsing-1.html b/src/parsing-1.html
index 07c67eaa..c32838f4 100644
--- a/src/parsing-1.html
+++ b/src/parsing-1.html
@@ -4,8 +4,7 @@ <h3 id="parsing_wellformed">Validating MathML</h3>
  <p>Presented here are Relax NG schema for MathML.
  A Relax NG Schema is most naturally associated with the XML serialization
  of MathML, but may also form the basis of  validation in other
- formats. (Some HTML validators are based on Relax NG for
- example).</p>
+ formats such as HTML5.</p>
  <p>Even when using the XML serialization, some normalization of
  the input may be required before applying these schema, Notably,
  following HTML, [[MathML-Core]] allows attributes such as
@@ -15,7 +14,7 @@ <h3 id="parsing_wellformed">Validating MathML</h3>
  case insensitive here so only the lowercase names are allowed.
  Similarly any attribute with name starting with the prefix
  <code>data-</code> should be considered valid. The schema here only
- allows a fixed attribute, <code>data-extra</code>,so input should be
+ allows a fixed attribute, <code>data-extra</code>, so input should be
  normalized to remove data attributes before validating, or the schema
  should be extended to support th attributes used in a particular
  application.</p>
diff --git a/src/parsing-2.html b/src/parsing-2.html
index cc4787a2..2e706b07 100644
--- a/src/parsing-2.html
+++ b/src/parsing-2.html
@@ -2,46 +2,20 @@
    <section>
       <h3 id="parsing_usingdtd">Using the MathML DTD</h3>
       
-      
-                
+        
          <p>The MathML DTD uses the strategy outlined in
            [[Modularization]] to allow the use of namespace prefixes
-           on MathML eelements. However it is recommended that
+           on MathML elements. However it is recommended that
            namespace prefixes are not used in XML serialisation of
            MathML, for compatibility with the HTML serialisation.</p>
+                 
          
-               
-         <p>Furthermore, the MathML DTD is provided for convenience; although it is
-            intended to be fully compatible with the text of the specification, the
-            text should be taken as definitive if there is a contradiction.  (Any
-            contradictions which may exist between various chapters of the text should
-            be resolved by favoring <a href="#chars"></a> first, then <a href="#presm"></a>, <a href="#contm"></a>, then <a href="#fund_syntax"></a>,
-            and then other parts of the text.)</p>
-         
-      
-         <p>MathML documents should be validated using the XML DTD for
-            MathML,
-            <a href="http://www.w3.org/Math/DTD/mathml4/mathml4.dtd">http://www.w3.org/Math/DTD/mathml4/mathml4.dtd</a>.
-            </p> 
-         
-         
-         <p>Documents using this DTD should contain a DOCTYPE declaration
-            of the form:
-            
-            <div class="example ">
-               <pre>&lt;!DOCTYPE math 
-    PUBLIC "-//W3C//DTD MathML 4.0//EN"
-           "http://www.w3.org/Math/DTD/mathml4/mathml4.dtd"&gt;</pre>
-            </div>
-            The URI may be changed to that of a local copy
-         of the DTD if required.</p>
-
 	 <p>Note that unlike the HTML serialization, when using the
 	 XML serialization, character entity references such as
 	 <code>&amp;int</code> may not be used unless a DTD is
 	 specified, either the full MathML DTD as described here or the
          set of HTML/MathML entity declarations as specified by [[Entities].
-	 Characters may always be specified by using character data directly, or numeric character referencess, so
+	 Characters may always be specified by using character data directly, or numeric character references, so
 	 <code>∫</code> or <code>&amp;#x222B;</code> rather than
 	 <code>&amp;int;</code>.</p>
       

From 38f5a10679f3341503f0224660796e97bd8eed1a Mon Sep 17 00:00:00 2001
From: David Carlisle <d.p.carlisle@gmail.com>
Date: Mon, 28 Feb 2022 17:00:43 +0000
Subject: [PATCH 4/6] delete duplicate/obsolete sections

---
 index.html         | 158 +--------------------------------------------
 src/parsing-2.html |   7 --
 2 files changed, 1 insertion(+), 164 deletions(-)

diff --git a/index.html b/index.html
index 6ba265a7..80087506 100644
--- a/index.html
+++ b/index.html
@@ -414,164 +414,8 @@ <h4 id="parsing_rnc_full">The Grammar for Full MathML</h4>
     </section>
 
 
-    <section>
-     <h4 id="parsing_rnc_module">MathML as a module in a RelaxNG Schema</h4>
-     
-     <p>Normally, a MathML expression does not constitute an entire XML document. MathML is
-     designed to be used as the mathematics fragment of larger markup languages. In
-     particular it is designed to be used as a <em>module</em> in documents marked up
-     with the XHTML family of markup languages. As RelaxNG directly supports modular
-     development, this is usually very easy: an XHTML+MathML schema can be specified as
-     simply as
-     
-     <div class="example ">
-      <pre># A RelaxNG Schema for  XHTML+MathML
-      include "xhtml.rnc"
-      math = external "mathml4.rnc"
-      Inline.class |= math
-      Block.class |= math</pre>
-     </div>
-     
-     assuming that we have access to a modular RelaxNG schema for XHTML that uses
-     <code>Inline.class</code> and <code>Block.class</code> to collect the the content models
-     for inline and block-level elements.</p>
-     
-     <p>Customizing the Mathml4 schema so that we can restrict the content of
-     <code class="element">annotation-xml</code> elements is similarly simple, for example:
-     
-     <div class="example ">
-      <pre># A RelaxNG Schema for MathML with OpenMath3 annotations
-      omobj = external "openmath3.rnc" 
-      include "mathml4.rnc" {anotation-xml.model = omobj}</pre>
-     </div>
-     </p>
-     
-     <p>
-      The Mathml4 schema is organized so that subsetting to one of the sublanguages specified
-      here is easy.
-      To include strict content Mathml4 in a schema just include
-      
-      <div class="example ">
-       <pre>include "mathml4-common.rnc"
-       include "mathml4-strict-content.rnc"</pre>
-      </div>
-      instead of <code>include mathml4.rnc</code>.
-     </p>
-     
-     <p>For details about RelaxNG grammars and modularization see [[RELAX-NG]] or [[RelaxNGBook]].</p>
-     
-    </section>
-   </section>
-   <section>
-    <h3 id="parsing_usingrnc">Using the RelaxNG Schema for Mathml4</h3>
-    
-    <p>MathML documents should be validated using the RelaxNG Schema for MathML, either in
-    the XML encoding (<a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rng">http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rng</a>)
-    or in compact notation (<a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc">http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc</a>)
-    which is also shown below.</p>
-    
-    <p>In contrast to DTDs there is no in-document method to associate a RelaxNG schema with
-    a document.</p>
-    
-    <p>We provide five RelaxNG schema for Mathml4 in five parts:
-    </p>
-    <ul>
-     <li>
-      <p>The grammar for full MathML</p>
-     </li>
-     <li>
-      <p>The grammar for elements common to Content and Presentation</p>
-     </li>
-     <li>
-      <p>The grammar for Presentation MathML</p>
-     </li>
-     <li>
-      <p>The grammar for Strict Content MathML</p>
-     </li>
-     <li>
-      <p>The grammar for Content Mathml4</p>
-     </li>
-    </ul>
-    
-    <section>
-     <h4 id="parsing_rnc_full">Full MathML</h4>
-     
-     <p>The RelaxNG schema for full MathML builds on the schema describing the various parts
-     of the language which are given in the following sections. It can be found at <a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc">http://www.w3.org/Math/RelaxNG/mathml4/mathml4.rnc</a>.</p>
-     
-     <pre data-include="src/rnc-full.html" data-include-replace="true"></pre>
-    </section>
-    
-    <section>
-     <h4 id="parsing_rnc_common">Elements Common to Presentation and Content MathML</h4>
-     
-     <pre data-include="src/rnc-common.html" data-include-replace="true"></pre>
-    </section>
-    
-    <section>
-     <h4 id="parsing_rnc_pres">The Grammar for Presentation MathML</h4>
-     
-     <pre data-include="src/rnc-pres.html" data-include-replace="true"></pre>
-     
-    </section>
-    
-    <section>
-     <h4 id="parsing_rnc_strict">The Grammar for Strict Content Mathml4</h4>
-     
-     
-     <p>The grammar for Strict Content Mathml4 can be found at <a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4-strict-content.rnc">http://www.w3.org/Math/RelaxNG/mathml4/mathml4-strict-content.rnc</a>.</p>
-     
-     <pre data-include="src/rnc-strict.html" data-include-replace="true"></pre>
-    </section>
-    
-    <section>
-     <h4 id="parsing_rnc_content">The Grammar for Content MathML</h4>
-     
-     <p>The grammar for Content Mathml4 builds on the grammar for the Strict Content MathML
-     subset, and can be found at <a href="http://www.w3.org/Math/RelaxNG/mathml4/mathml4-content.rnc">http://www.w3.org/Math/RelaxNG/mathml4/mathml4-content.rnc</a>.</p>
-     
-     <pre data-include="src/rnc-content.html" data-include-replace="true"></pre>
-     
-    </section>
-    
-    <section>
-     <h4 id="parsing_rnc_module">MathML as a module in a RelaxNG Schema</h4>
-     
-     <p>Normally, a MathML expression does not constitute an entire XML document. MathML is
-     designed to be used as the mathematics fragment of larger markup languages. In
-     particular it is designed to be used as a <em>module</em> in documents marked up
-     with the XHTML family of markup languages. As RelaxNG directly supports modular
-     development, this is usually very easy: an XHTML+MathML schema can be specified as
-     simply as
-     
-     <div class="example ">
-      <pre># A RelaxNG Schema for  XHTML+MathML
-      include "xhtml.rnc"
-      math = external "mathml4.rnc"
-      Inline.class |= math
-      Block.class |= math</pre>
-     </div>
-     
-     assuming that we have access to a modular RelaxNG schema for XHTML that uses
-     <code>Inline.class</code> and <code>Block.class</code> to collect the the content models
-     for inline and block-level elements.</p>
-     
-     <p>
-      The Mathml4 schema is organized so that subsetting to one of the sublanguages specified
-      here is easy.
-      To include strict content Mathml4 in a schema just include
-      
-      <div class="example ">
-       <pre>include "mathml4-common.rnc"
-       include "mathml4-strict-content.rnc"</pre>
-      </div>
-      instead of <code>include mathml4.rnc</code>.
-     </p>
-     
-     <p>For details about RelaxNG grammars and modularization see [[RELAX-NG]] or [[RelaxNGBook]].</p>
-     
-    </section>
    </section>
+
    
    <section data-include="src/parsing-2.html" data-include-replace="true"></section>
   </section>
diff --git a/src/parsing-2.html b/src/parsing-2.html
index 2e706b07..0bb063b1 100644
--- a/src/parsing-2.html
+++ b/src/parsing-2.html
@@ -36,10 +36,3 @@ <h3 id="parsing_usingxsd">Using the MathML XML Schema</h3>
       
    </section>
    
-   <section>
-      <h3 id="parsing_mml_html">Parsing MathML in HTML</h3>
-      
-      
-      <p>See <a href="#interf_html"></a> for more details of the parsing of MathML in HTML.</p>
-      </section>
-

From ca6c4a007de05b5d6aacd602c101f6120f0d3ac3 Mon Sep 17 00:00:00 2001
From: David Carlisle <d.p.carlisle@gmail.com>
Date: Mon, 28 Feb 2022 17:01:43 +0000
Subject: [PATCH 5/6] delete mathml3 -mathml3 2nd ed changelog (references now
 deleted sections)

---
 src/changes.html | 658 +----------------------------------------------
 1 file changed, 1 insertion(+), 657 deletions(-)

diff --git a/src/changes.html b/src/changes.html
index 6ee28507..03972e57 100644
--- a/src/changes.html
+++ b/src/changes.html
@@ -93,660 +93,4 @@ <h3 id="changes_mathml4.0-mathml3.02e">Changes between MathML 3.0 Second Edition
             </li>
          </ul>
       </section>
-   
-   
-   <section>
-      <h3 id="changes_mathml3.02e-3.0">Changes between MathML 3.0 First Edition and Second Edition</h3>
-      
-      
-      
-      
-      
-      <ul>
-         
-         
-         <li>
-            
-            <p>Changes to the Frontmatter</p>
-            
-            <ul>
-               
-               <li>
-                  <p>Changes to Authors to acknowlege the death of Robert Miner.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to <a href="#abstract"></a> to highlight MathML may be used in HTML as well as XML.</p>
-               </li>
-               
-               <li>
-                  <p>Update  the <a href="#sotd"></a>.</p>
-               </li>
-               </ul>
-            </li>
-         
-         <li>
-            
-            <p>Changes to the <a href="#intro"></a></p>
-            
-            <ul>
-               
-               <li>
-                  <p>Changes to <a href="#intro_overview"></a> to highlight MathML may be used in HTML as well as XML.</p>
-               </li>
-               </ul>
-            </li>
-         
-         <li>
-            
-            <p>Changes to the <a href="#fund"></a></p>
-            
-            <ul>
-               
-               <li>
-                  <p>Changes to <a href="#fund_xmlgeneral"></a> to highlight MathML may be used in HTML as well as XML.</p>
-               </li>
-               
-               <li>
-                  <p>Add element markup to heading in <a href="#interf_toplevel"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to <a href="#interf_namespace"></a> the <code class="attribute">xmlns</code> syntax for namespaces only applies to the XML serialisation.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to <a href="#fund_units"></a> to clarify that values specified with a <code>%</code> or no unit are multiples of a <em>reference</em> value, which may differ from the <em>default</em> value used when the value is not specified.</p>
-               </li>
-               
-               <li id="chg3e_attval">
-                  <p>Changes to <a class="intref" href="#type_namedspace"><em>namedspace</em></a> in <a href="#fund_units"></a> some attribute values such as <code class="attributevalue">thinmathspace</code> were marked up as attribute <em>names</em>. (This affected  formatting and also the index).</p>
-               </li>
-               
-               <li>
-                  <p>Additional paragraph describing global document property defaults in <a href="#fund_defaults"></a></p>
-               </li>
-               </ul>
-            </li>
-         
-         <li>
-            
-            <p>Changes to the <a href="#presm"></a></p>
-            
-            <ul>
-               
-               <li>
-                  <p>Refer to <span>&#x201c;characters&#x201d;</span> rather than <span>&#x201c;MathML Characters&#x201d;</span> in <a href="#presm_intro"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Delete the note about bidi in HTML in <a href="#presm_bidi_token"></a> (As there are proposals to change the HTML behavior).</p>
-               </li>
-               
-               <li>
-                  <p>Corrected mistaken refererence to <code class="element">mtext</code>, replaced by reference to <code class="element">mo</code> in <a href="#presm_warnspacing"></a></p>
-               </li>
-               
-               <li>
-                  <p>Refer to HTML rather than XHTML in <a href="#presm_presatt"></a></p>
-               </li>
-               
-               <li>
-                  <p>Modify heading of <a href="#presm_tokenchars"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Note in <a href="#presm_mglyph"></a> that the requirement to use  <code class="attribute">src</code> and <code class="attribute">alt</code> is not enforced by the schema.</p>
-               </li>
-               
-               <li>
-                  <p>New section <a href="#presm_html_insertion"></a> detailing the use of HTML elements on MathML token elements</p>
-               </li>
-               
-               <li>
-                  <p>Use U+2026 rather than <code>. . .</code> in the example in <a href="#presm_mi"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Use percentage lengths rather than unitless lengths in examples in <a href="#presm_op_stretch"></a> 
-                     and <a href="#presm_mfrac"></a></p>
-               </li>
-               
-               <li>
-                  <p>Reference the Arabic Mathematical Symbols block in describing <code class="attribute">mathvariant</code> in <a href="#presm_commatt"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Do not specify that Math defaults may be set by using attributes in the MathML Namespace
-                     on the containing document, leave the mechanism open. <a href="#presm_mo"></a></p>
-               </li>
-               
-               <li>
-                  <p>Changes to <a href="#presm_mo_attrs"></a> to clarify defaults may be specified in any containing document.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to <a href="#presm_mo_dict_attrs"></a> to clarify the interpretation of <code class="attribute">maxsize</code>, <code class="attribute">minsize</code> and <code class="attribute">symmetric</code> values.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to <a href="#presm_lbindent_attrs"></a> to clarify behaviour if <code class="attribute">indenttarget</code> results in an unachievable alignment specification.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to the examples in <a href="#presm_invisibleops"></a> so that each example is rendered as a separate <code class="element">math</code> expression.</p>
-               </li>
-               
-               <li>
-                  <p>Suggest CSS Counters as a possible mechanism for equation numbering in <a href="#presm_mlabeledtr"></a></p>
-               </li>
-               
-               <li>
-                  <p>Minor improvements to the markup in <a href="#presm_mstyle"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Minor improvements to the markup in <a href="#presm_menclose"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to the attribute table <a href="#presm_mpaddedatt"></a> To clarify that unitless lengths are allowed on <code class="element">mpadded</code>, meaning, as usual, a multiplier of the stated default. Note that this change also
-                     affects the <code>mpadded-length</code> grammar uin the extracted schema.</p>
-               </li>
-               
-               <li>
-                  <p>Explictly list mprescripts and none in heading for <a href="#presm_mmultiscripts"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to <a href="#presm_mtable_attrs"></a> to clarify that <code class="attribute">displaystyle</code> defaults to <code class="attributevalue">false</code> and to clarify the wording describing percentage values for <code class="attribute">width</code>.</p>
-               </li>
-               
-               <li>
-                  <p>Minor improvements to the markup in <a href="#presm_mstack"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Editorial improvements to <a href="#presm_addsub"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Modify the markup in the examples in <a href="#presm_repeatdec"></a> so that MathML renderings are shown in some versions of this specification.</p>
-               </li>
-               
-               <li>
-                  <p>Note that attributes in other namespaces are not available in HTML in <a href="#presm_maction"></a></p>
-               </li>
-               </ul>
-            </li>
-         
-         <li>
-            
-            <p>Changes to the <a href="#contm"></a></p>
-            
-            <ul>
-               
-               <li>
-                  <p>Add element markup to heading in <a href="#contm_rendering_numbers"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Add syntax table for qualifier elements in  <a href="#contm_domainofapplication_qualifier"></a> and <a href="#contm_degree"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Modify the text in  <a href="#contm_concepts"></a> to clarify the role of the <code>Qualifier</code> row of syntax tables. (AM)</p>
-               </li>
-               
-               <li>
-                  <p>Spurious <code class="element">apply</code> removed from the <span>&#x201c;0&#x201d;</span> case in  <a class="intref" href="#contm_piecewise-example">the example</a> in <a href="#contm_piecewise"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to <a href="#contm_p2s.partialdiff"></a> The expression <em>expression-in-x1-xk</em> was rewritten to <em>A</em>. (AM)</p>
-               </li>
-               
-               <li>
-                  <p>Additional note added to the <a class="intref" href="#contm_ci_mathmltypes">mathmltypes</a> description clarifying that <code class="attributevalue">complex</code> should be taken as an alias for <code class="attributevalue">complex-cartesian</code> when rewriting to Strict Content MathML. (AM)</p>
-               </li>
-               
-               <li>
-                  <p>Changes to <a class="intref" href="#s_data1.mean.ex1">s_data1.mean</a>, <a class="intref" href="#s_dist1.mean.ex1">s_dist1.mean</a>, <a class="intref" href="#s_dist1.moment.ex1">s_dist1.moment</a> and <a class="intref" href="#s_data1.moment.ex1">s_data1.moment</a> examples to use new values for &amp;lang; and &amp;rang; so the result is in Unicode NFC
-                     form.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to markup of syntax tables in <a href="#contm_apply"></a> and <a href="#contm_share"></a> to avoid redundant colspans, which make the html5 version invalid.</p>
-               </li>
-               
-               <li>
-                  <p>Clarify the behavior of qualifiers in <a class="intref" href="#contm_p2s_step_vector">Step 4b</a> of the rewrite to Strict Content MathML. (AM)</p>
-               </li>
-               
-               <li>
-                  <p>Clarify that the types of the <em>arguments</em> are used to distinguish between set and multiset use of the <code class="element">set</code> constructor in <a href="#contm_nary_rewrite"></a> and <a href="#contm_narysetlist_rewrite"></a>. (AM)</p>
-               </li>
-               
-               <li>
-                  <p>Fix spelling in <a href="#contm_not"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Fix spelling in <a href="#contm_eq"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Split <a href="#contm_trig"></a> into separate sections <a href="#contm_trig"></a>,
-                     <a href="#contm_trig"></a>,<a href="#contm_invtrig"></a>, <a href="#contm_hyperbolic"></a>, <a href="#contm_invhyperbolic"></a>, add new presentation images for
-                     <a class="intref" href="#transc1.arcsin.ex1">arcsin</a>.</p>
-               </li>
-               
-               <li>
-                  <p>Add element markup to heading in <a href="#contm_log"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Minor rearrangement of heading in <a href="#contm_moment"></a></p>
-               </li>
-               
-               <li>
-                  <p>Add syntax table for deprecated elements in  <a href="#contm_declare"></a>, <a href="#contm_fn"></a> and <a href="#contm_reln"></a>.</p>
-               </li>
-               </ul>
-            </li>
-         
-         <li>
-            <p>Changes to <a href="#mixing"></a>.</p>
-            
-            <ul>
-               
-               <li>
-                  <p>Changes to <a href="#mixing_annotation_elements"></a> to highlight MathML may be used in HTML as well as XML.</p>
-               </li>
-               
-               <li>
-                  <p>Add additional <a class="intref" href="#html-xml1">note</a> warning namespace extensibility example not applicable to HTML.</p>
-               </li>
-               
-               <li>
-                  <p>Add additional <a class="intref" href="#html-xml2">note</a> warning namespace extensibility example not applicable to HTML.</p>
-               </li>
-               
-               <li>
-                  <p>Add additional <a class="intref" href="#html-xml3">note</a> warning namespace extensibility example not applicable to HTML.</p>
-               </li>
-               
-               <li>
-                  <p>Additional section <a href="#html_annotation_xml"></a> detailing the use of <code class="element">annotation-xml</code>in HTML documents</p>
-               </li>
-               
-               <li>
-                  <p>Show tag markup around element names in section headings in <a class="intref" href="#mixing_elements_semantics">semantics</a>, <a class="intref" href="#mixing_elements_annotation">annotation</a> and  <a class="intref" href="#mixing_elements_annotation_xml">annotation-xml</a>.</p>
-               </li>
-               </ul>
-            </li>
-         
-         
-         
-         <li>
-            <p>Changes to <a href="#world-interactions"></a>.</p>
-            
-            <ul>
-               
-               <li>
-                  <p>Editorial wording changes in <a href="#world-int-combine-other"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Editorial wording changes in <a href="#world-int-style"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Changes to wording on namespace use in <a href="#world_introduction"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Additional section <a href="#world_recognizing_mathml_html"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Remove XML Declaration and <code>mml</code> namespace prefix from the examples in <a href="#world-int-transf-exa"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Delete recommendation to use prefixed element names in XHTML in <a href="#interf_xhtml"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Split HTML into a separate section from other non-XML use <a href="#interf_html"></a> and <a href="#interf_nonxml"></a></p>
-               </li>
-               
-               <li>
-                  <p>Remove the reference to [[MathMLforCSS]] in <a href="#world-interactions"></a>.</p>
-               </li>
-               </ul>
-            </li>
-         
-         
-         <li>
-            <p>Changes to <a href="#chars"></a>.</p>
-            
-            <ul>
-               
-               <li>
-                  <p>Change the DTD description in <a href="#chars_entities"></a> to reference the Combined HTML MathML entity set rather than the legacy ISO entity
-                     sets. This does not change any existing definition, but adds the following 38 entity
-                     definitions:
-                     <code class="entity">QUOT</code> (U+0022), 
-                     <code class="entity">AMP</code> (U+0026), 
-                     <code class="entity">LT</code> (U+003C), 
-                     <code class="entity">GT</code> (U+003E), 
-                     <code class="entity">COPY</code> (U+00A9), 
-                     <code class="entity">REG</code> (U+00AE), 
-                     <code class="entity">Alpha</code> (U+0391), 
-                     <code class="entity">Beta</code> (U+0392), 
-                     <code class="entity">Epsilon</code> (U+0395), 
-                     <code class="entity">Zeta</code> (U+0396), 
-                     <code class="entity">Eta</code> (U+0397), 
-                     <code class="entity">Iota</code> (U+0399), 
-                     <code class="entity">Kappa</code> (U+039A), 
-                     <code class="entity">Mu</code> (U+039C), 
-                     <code class="entity">Nu</code> (U+039D), 
-                     <code class="entity">Omicron</code> (U+039F), 
-                     <code class="entity">Rho</code> (U+03A1), 
-                     <code class="entity">Tau</code> (U+03A4), 
-                     <code class="entity">Chi</code> (U+03A7), 
-                     <code class="entity">epsilon</code> (U+03B5), 
-                     <code class="entity">omicron</code> (U+03BF), 
-                     <code class="entity">sigmaf</code> (U+03C2), 
-                     <code class="entity">thetasym</code> (U+03D1), 
-                     <code class="entity">upsih</code> (U+03D2), 
-                     <code class="entity">zwnj</code> (U+200C), 
-                     <code class="entity">zwj</code> (U+200D), 
-                     <code class="entity">lrm</code> (U+200E), 
-                     <code class="entity">rlm</code> (U+200F), 
-                     <code class="entity">sbquo</code> (U+201A), 
-                     <code class="entity">bdquo</code> (U+201E), 
-                     <code class="entity">lsaquo</code> (U+2039), 
-                     <code class="entity">rsaquo</code> (U+203A), 
-                     <code class="entity">oline</code> (U+203E), 
-                     <code class="entity">frasl</code> (U+2044), 
-                     <code class="entity">euro</code> (U+20AC), 
-                     <code class="entity">TRADE</code> (U+2122), 
-                     <code class="entity">alefsym</code> (U+2135), 
-                     <code class="entity">crarr</code> (U+21B5).</p>
-               </li>
-               </ul>
-            </li>
-         
-         
-         <li>
-            <p>Changes to <a href="#parsing"></a>.</p>
-            
-            <ul>
-               
-               <li>
-                  <p>Modify the schema regular expression to allow the deprecated unitless length attributes.</p>
-               </li>
-               
-               <li>
-                  <p>The schema now enforces a mandatory space and optional minus sign before <em>rownumber</em> in the <code class="attribute">align</code> attribute of <code class="element">mtable</code> and <code class="element">mstack</code>.</p>
-               </li>
-               
-               <li>
-                  <p>Modify the schema (including DTD and XSD versions) to include the attributes listed
-                     in <a href="#presm_lbindent_attrs"></a> on <code class="element">mspace</code> to match the text description in <a href="#presm_mspace"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Modify the schema  to include the Common Attributes such as <code class="attribute">id</code> on <code class="element">bvar</code> and <code class="element">cn</code> to match the attribute tables in the text</p>
-               </li>
-               
-               <li>
-                  <p>Modify the regular expressions used for <code>mpadded-length</code> and <code>length</code> so that there must be at most one <code>.</code> and at least one digit. (FW)</p>
-               </li>
-               
-               <li>
-                  <p>New sections: <a href="#parsing_mml_xhtml"></a> and <a href="#parsing_mml_html"></a>.</p>
-               </li>
-               </ul>
-            </li>
-         
-         
-         
-         <li>
-            <p>Changes to <a href="#oper-dict"></a>.</p>
-            
-            <ul>
-               
-               <li>
-                  <p>Add entries for the characters listed in <a href="#chars_pseudo-scripts"></a>.</p>
-               </li>
-               </ul>
-            </li>
-         
-         
-         <li>
-            <p>Changes to <a href="#contributors"></a>.</p>
-            
-            <ul>
-               
-               <li>
-                  <p>Changes to <a href="#contrib"></a> to note the death of Robert Miner.</p>
-               </li>
-               </ul>
-            </li>
-         
-         
-         
-         
-         <li>
-            <p>Changes to <a href="#references"></a>.</p>
-            
-            <ul>
-               
-               <li>
-                  <p>Make [[HTML5]] normative.</p>
-               </li>
-               
-               <li>
-                  <p>Update the references to current versions, 
-                     [[Bidi]], [[Entities]],
-                     [[Normal]], [[RELAX-NG]],
-                     [[Unicode]].</p>
-               </li>
-               </ul>
-            </li>
-         
-         
-         
-         <li>
-            <p>Changes to <a href="#references"></a>.</p>
-            
-            <ul>
-               
-               <li>
-                  <p>Update the references to current versions, 
-                     [[AAP-math]], [[Abramowitz1977]],
-                     [[CSS21]], [[ISO-12083]],
-                     [[XLink]].</p>
-               </li>
-               </ul>
-            </li>
-         
-         
-         </ul>
-      
-      </section>
-   
-   
-   <section>
-      <h3 id="changes_mathml2.0e-3.0">Changes between MathML 2.0 Second Edition and MathML 3.0</h3>
-      
-      
-      
-      
-      <ul>
-         
-         
-         <li>
-            <p>Changes to <a href="#fund"></a>.</p>
-            
-            <ul>
-               
-               <li>
-                  <p>The attribute <code class="attribute">href</code> added to the common MathML attributes, <a href="#fund_globatt"></a> to allow hypertext links.</p>
-               </li>
-               
-               <li>
-                  <p>Additional attributes added to the <code class="element">math</code> element, see
-                     <a href="#interf_toplevel_atts"></a>.</p>
-               </li>
-               </ul>
-            </li>
-         
-         <li>
-            
-            <p>Changes to <a href="#presm"></a>.</p>
-            
-            
-            <ul>
-               
-               <li>
-                  <p>Introduced mechanisms for controlling the Directionality of layout, as described in
-                     <a href="#presm_bidi"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Introduced mechanisms for controlling linebreaking <a href="#presm_linebreaking"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>Extended <code class="element">mglyph</code> to support general image inclusion, <a href="#presm_mglyph"></a>.</p>
-               </li>
-               
-               <li>
-                  <p>The facilities for adjusting spacing with <code class="element">mpadded</code> have been extended and rationalised, <a href="#presm_mpadded"></a>.</p>
-               </li>
-               
-               <li>
-                  
-                  <p>Introduced new presentation elements for elementary math layouts, <a href="#presm_elementary"></a>: <code class="element">mstack</code>, <code class="element">mlongdiv</code>, <code class="element">msgroup</code>, <code class="element">msrow</code>, <code class="element">mscarries</code>, <code class="element">mscarry</code>, and <code class="element">msline</code>.</p>
-                  </li>
-               </ul>
-            
-            </li>
-         
-         
-         <li>
-            
-            <p>Changes to <a href="#contm"></a>.</p> 
-            
-            
-            <ul>
-               
-               <li>
-                  
-                  <p>Introduced new content elements <code class="element">bind</code>, <code class="element">share</code>, <code class="element">cerror</code>, <code class="element">cs</code> and  <code class="element">cbytes</code>.</p>
-                  </li>
-               
-               
-               <li>
-                  
-                  <p>Removed deprecated content elements <code class="element">reln</code> and <code class="element">fn</code>.</p>
-                  </li>
-               
-               
-               <li>
-                  
-                  <p>Removed content element <code class="element">declare</code>.</p>
-                  </li>
-               
-               
-               <li>
-                  
-                  <p>The concept of Strict Content MathML and the use of OpenMath Content Dictionaries
-                     has been introduced, and the whole chapter restructured.</p>
-                  </li>
-               </ul>
-            </li>
-         
-         
-         
-         
-         <li>
-            
-            <p>Changes to <a href="#mixing"></a>.</p> 
-            </li>
-         
-         
-         
-         <li>
-            
-            <p>New Chapter: <a href="#world-interactions"></a>.</p> 
-            </li>
-         
-         
-         
-         <li>
-            
-            <p>Changes to <a href="#chars"></a>.</p>
-            
-            <p>This chapter is much reduced from the corresponding chapter in previous releases of
-               MathML. All the tables and much of the other content of this chapter is now maintained
-               as a separate document [[Entities]]</p>
-            </li>
-         
-         
-         <li>
-            
-            <p>Changes to <a href="#parsing"></a>.</p>
-            
-            
-            <ul>
-               
-               <li>
-                  
-                  <p>The Normative version of the grammar is now expressed in Relax NG, with DTD and XSD
-                     versions being derived.</p>
-                  </li>
-               
-               <li>
-                  
-                  <p>Three MathML 1 attrbutes on <code class="element">math</code> that were deprecated and undocumented in MathML2 but retained in the MathML2 DTD
-                     have been removed. <code class="attribute">name</code> (use <code class="attribute">id</code> instead), <code class="attribute">baseline</code> and <code class="attribute">type</code> (These are not used by any known implementation, so can be removed.) See Chapter
-                     7 of [[MathML1]].</p>
-                  </li>
-               </ul>
-            </li>
-         
-         
-         
-         <li>
-            
-            <p>New Appendix: <a href="#media-types-reg"></a>.</p> 
-            </li>
-         
-         
-         
-         <li>
-            
-            <p>Changes to <a href="#oper-dict"></a>.</p>
-            
-            <p>The Operator Dictionary table has been updated and rationalised and presented in a
-               new format.</p>
-            </li>
-         
-         
-         <li>
-            
-            <p>MathML DOM</p>
-            
-            <p>The chapter and appendices relating to the MathML DOM have been removed from this
-               specification, with the intention of updating them and publishing them as a separate
-               document at a later time.</p>
-            </li>
-         </ul>
-      
-      </section>
-   </section>
\ No newline at end of file
+   </section>

From c6899b8012e911a8acfdeeb9536235cb06af29f6 Mon Sep 17 00:00:00 2001
From: David Carlisle <d.p.carlisle@gmail.com>
Date: Mon, 28 Feb 2022 20:13:42 +0000
Subject: [PATCH 6/6] remove 'naturally associated with' wording as suggested
 in PR #269

---
 src/parsing-1.html | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/parsing-1.html b/src/parsing-1.html
index c32838f4..6b02c448 100644
--- a/src/parsing-1.html
+++ b/src/parsing-1.html
@@ -1,23 +1,22 @@
 <section>
   <h3 id="parsing_wellformed">Validating MathML</h3>
       
- <p>Presented here are Relax NG schema for MathML.
- A Relax NG Schema is most naturally associated with the XML serialization
- of MathML, but may also form the basis of  validation in other
- formats such as HTML5.</p>
- <p>Even when using the XML serialization, some normalization of
- the input may be required before applying these schema, Notably,
- following HTML, [[MathML-Core]] allows attributes such as
- <code>onclick</code> to be specified in any case, eg
- <code>OnClick="..."</code>
- It is not practically feasible to specify that attribute names are
- case insensitive here so only the lowercase names are allowed.
- Similarly any attribute with name starting with the prefix
- <code>data-</code> should be considered valid. The schema here only
- allows a fixed attribute, <code>data-extra</code>, so input should be
- normalized to remove data attributes before validating, or the schema
- should be extended to support th attributes used in a particular
- application.</p>
-           
+  <p>The Relax NG schema may be used to check the XML serialization of
+  MathML and serves as a foundation for validaing other serializations
+  of MathML, such as the HTML serialization.</p>
+  <p>Even when using the XML serialization, some normalization of
+  the input may be required before applying these schema, Notably,
+  following HTML, [[MathML-Core]] allows attributes such as
+  <code>onclick</code> to be specified in any case, eg
+  <code>OnClick="..."</code>
+  It is not practically feasible to specify that attribute names are
+  case insensitive here so only the lowercase names are allowed.
+  Similarly any attribute with name starting with the prefix
+  <code>data-</code> should be considered valid. The schema here only
+  allows a fixed attribute, <code>data-extra</code>, so input should be
+  normalized to remove data attributes before validating, or the schema
+  should be extended to support the attributes used in a particular
+  application.</p>
+ 
 </section>