From: Norman Walsh <ndw@nwalsh.com>
Date: Wed, 26 Oct 2005 12:29:50 +0000 (+0000)
Subject: Refactor the content model of step to avoid UPA issues
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d8af9011220e3618307f68e69572aac45f18418;p=docbook-dsssl

Refactor the content model of step to avoid UPA issues
---

diff --git a/docbook/relaxng/docbook/src/pool.rnc b/docbook/relaxng/docbook/src/pool.rnc
index 670ae640f..5654e7469 100644
--- a/docbook/relaxng/docbook/src/pool.rnc
+++ b/docbook/relaxng/docbook/src/pool.rnc
@@ -1243,12 +1243,13 @@ div {
 
    db.step.info = db._info.title.only
 
+   # This content model is blocks*, step|stepalternatives, blocks* but
+   # expressed this way it avoids UPA issues in XSD and DTD versions
    db.step = element step {
       db.step.attlist,
       db.step.info,
-      db.all.blocks*,
-      (db.substeps|db.stepalternatives)?,
-      db.all.blocks*
+      ((db.all.blocks+, (((db.substeps|db.stepalternatives), db.all.blocks*))?)
+       | ((db.substeps|db.stepalternatives), db.all.blocks*))
    }
 }