Rearranged patterns for a little greater consistency

diff --git a/docbook/relaxng/docbook/src/math.rnc b/docbook/relaxng/docbook/src/math.rnc
index b410b678cb92d1d849798aaef1116764e5763068..8a029574ba7af0457bc8c6d7efe2851b7fee75d3 100644 (file)
--- a/docbook/relaxng/docbook/src/math.rnc
+++ b/docbook/relaxng/docbook/src/math.rnc
@@ -33,18 +33,12 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
-# TEI: formula
+db.formal.blocks |= db.equation
+db.informal.blocks |= db.informalequation
 
 db.math.inlines = db.inlineequation
-
-db.math.blocks =
-   db.equation
- | db.informalequation
-
 db.domain.inlines |= db.math.inlines
 
-db.nopara.blocks |= db.math.blocks
-
 # ======================================================================
 
 db.equation.content = db.mediaobject+ | db.mathphrase+