Adapt content model of step

openSUSE · Mar 7, 2019 · 390d930 · 390d930
1 parent 4bae90d
commit 390d930
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 27 deletions.
diff --git a/geekodoc/rng/geekodoc5-flat.rnc b/geekodoc/rng/geekodoc5-flat.rnc
@@ -162,7 +162,6 @@ div {
        | db.extension.blocks
        | db.admonition.blocks)*
   db.step.blocks =
-    (db.para.blocks & db.remark?),
     (db.para.blocks
      | db.remark
      | db.indexterm
@@ -10876,20 +10875,16 @@ div {
         ]
       ]
       element step {
-        (db.step.attlist,
-         # db.step.info?,
-         db.para,
-         db.step.blocks*,
-         ((db.substeps | db.stepalternatives)?, db.step.blocks*),
-         db.result?)
-        # ((# db.step.blocks?,
-        #  ((db.substeps | db.stepalternatives), db.step.blocks*)?,
-        #  db.result?)
-        # | ((db.substeps | db.stepalternatives),
-        #    db.step.blocks*,
-        #    db.result?)
-        # )
-
+        db.step.attlist,
+        # db.step.info?,
+        db.remark?,
+        db.para,
+        ((db.step.blocks?,
+          ((db.substeps | db.stepalternatives), db.step.blocks*)?,
+          db.result?)
+         | ((db.substeps | db.stepalternatives),
+            db.step.blocks*,
+            db.result?))
       }
   }
   # task* elements

diff --git a/geekodoc/rng/geekodoc5.rnc b/geekodoc/rng/geekodoc5.rnc
@@ -117,7 +117,6 @@ db.entry.model =
 
 
 db.step.blocks =
-  (db.para.blocks & db.remark?),
   ( db.para.blocks
    | db.remark
    | db.indexterm # TODO: Remove that (currently we have too much of that)
@@ -1510,18 +1509,17 @@ include "docbookxi.rnc"
     element step {
       db.step.attlist,
       # db.step.info?,
+      db.remark?,
       db.para,
-      db.step.blocks*,
-      ((db.substeps | db.stepalternatives)?,
-        db.step.blocks*),
-      db.result?
-      #((# db.step.blocks?,
-      #  ((db.substeps | db.stepalternatives), db.step.blocks*)?,
-      #  db.result?)
-      # | ((db.substeps | db.stepalternatives),
-      #    db.step.blocks*,
-      #    db.result?)
-      #)
+      (
+       (db.step.blocks?,
+        ((db.substeps | db.stepalternatives), db.step.blocks*)?,
+        db.result?)
+       |
+       ((db.substeps | db.stepalternatives),
+          db.step.blocks*,
+          db.result?)
+      )
     }
   }