Allow formalpara after required para

Author: tomschr

geekodoc/rng/geekodoc5-flat.rnc

@@ -10514,11 +10514,14 @@ div {
   div {
     db.admonition.contentmodel =
       db._info.title.only,
+      db.remark*,
+      db.para,
       (db.list.blocks
+       | db.formalpara
        | db.verbatim.blocks
        | db.remark
        | db.para
-       | db.xi.include)+
+       | db.xi.include)*
     db.admonition.blocks =
       # Removed caution
       db.important

geekodoc/rng/geekodoc5.rnc

@@ -1177,12 +1177,15 @@ include "docbookxi.rnc"
   div {
     db.admonition.contentmodel =
       db._info.title.only,
+      db.remark*,
+      db.para,
       (db.list.blocks
+      | db.formalpara
       | db.verbatim.blocks
       | db.remark
       | db.para
       | db.xi.include
-      )+
+      )*
 
     db.admonition.blocks =
       # Removed caution

geekodoc/tests/good/article-admonitions.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../rng/geekodoc5-flat.rnc" type="application/relax-ng-compact-syntax"?>
+<article xmlns="http://docbook.org/ns/docbook"
+    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <title>Admonitions</title>
+  <important>
+   <title/>
+   <para/>
+   <formalpara>
+    <title/><para/>
+   </formalpara>
+  </important>
+  <tip>
+   <remark/>
+   <para/>
+  </tip>
+</article>