Removed equation from db.formal.blocks; added some more exclusions for formal objects...

diff --git a/docbook/relaxng/src/pool.rnc b/docbook/relaxng/src/pool.rnc
index a098f3da1f0e16a861572123962f647bd4836fde..0a534982d64e6b8948a9df5d3e6823449cbc8d53 100644 (file)
--- a/docbook/relaxng/src/pool.rnc
+++ b/docbook/relaxng/src/pool.rnc
@@ -598,6 +598,7 @@ db.nopara.blocks =
    db.list.blocks
  | db.admonition.blocks
  | db.formal.blocks
+ | db.equation.blocks
  | db.informal.blocks
  | db.publishing.blocks
  | db.graphic.blocks
@@ -620,15 +621,20 @@ db.all.blocks =
  | db.para.blocks
  | db.extension.blocks
 
+ctrl:exclude [ from="db.formal.blocks" exclude="db.formal.blocks" ]
+ctrl:exclude [ from="db.formal.blocks" exclude="db.admonition.blocks" ]
+
 db.formal.blocks =
-   db.equation
- | db.example
+   db.example
  | db.figure
  | db.table
 
+db.equation.blocks =
+   db.equation
+ | db.informalequation
+
 db.informal.blocks =
-   db.informalequation
- | db.informalexample
+   db.informalexample
  | db.informalfigure
  | db.informaltable
 
@@ -644,6 +650,8 @@ db.graphic.blocks =
 
 db.technical.blocks = db.procedure
 
+ctrl:exclude [ from="db.admonition.blocks" exclude="db.admonition.blocks" ]
+
 db.admonition.blocks =
    db.caution
  | db.important
@@ -1323,6 +1331,12 @@ div {
 div {
 
    ctrl:exclude [ from="db.footnote" exclude="db.footnote" ]
+   ctrl:exclude [ from="db.footnote" exclude="db.formal.blocks" ]
+   ctrl:exclude [ from="db.footnote" exclude="db.admonition.blocks" ]
+   ctrl:exclude [ from="db.footnote" exclude="db.indexterm" ]
+   ctrl:exclude [ from="db.footnote" exclude="db.sidebar" ]
+   ctrl:exclude [ from="db.footnote" exclude="db.task" ]
+   ctrl:exclude [ from="db.footnote" exclude="db.epigraph" ]
 
    db.footnote.role.attribute = attribute role { text }
 
@@ -1439,8 +1453,6 @@ div {
 
 # ======================================================================
 
-ctrl:exclude [ from="db.admonition.blocks" exclude="db.admonition.blocks" ]
-
 db.admonition.contentmodel = db._info.title.only, db.all.blocks+
 
 # ======================================================================