Fix #60: Consolidate admon content model

* Force admons to have at least one para as first child * Add informal{example,figure,table,equation} to admon content model * Add test cases
openSUSE · Oct 14, 2019 · 1928040 · 1928040
1 parent d5b8894
commit 1928040
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 21 deletions.
diff --git a/geekodoc/rng/geekodoc5-flat.rnc b/geekodoc/rng/geekodoc5-flat.rnc
@@ -10514,16 +10514,29 @@ 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.informalexample
-       | db.informalfigure)*
+      (db.remark*,
+       (db.para | db.xi.include),
+       # Removed patterns:
+       # db.sidebar | db.blockquote | db.address | db.epigraph
+       # db.mediaobject | db.screenshot
+       # db.procedure | db.task | db.productionset | db.constraintdef | db.msgset
+       # db.screen | db.literallayout  | db.programlistingco | db.screenco  | db.programlisting | db.synopsis
+       (db.list.blocks
+        | db.informalexample
+        | db.informalfigure
+        | db.informaltable
+        | db.informalequation
+        | db.informal.blocks
+        | db.publishing.blocks
+        | db.graphic.blocks
+        | db.technical.blocks
+        | db.verbatim.blocks
+        | db.remark
+        | db.para
+        | db.formalpara
+        | db.simpara
+        | db.extension.blocks
+        | db.xi.include)*)
     db.admonition.blocks =
       # Removed caution
       db.important

diff --git a/geekodoc/rng/geekodoc5.rnc b/geekodoc/rng/geekodoc5.rnc
@@ -1177,17 +1177,27 @@ 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.informalexample
-      | db.informalfigure
-      )*
+      (db.remark*,
+       (db.para | db.xi.include),
+       # Removed patterns:
+       # db.sidebar | db.blockquote | db.address | db.epigraph
+       # db.mediaobject | db.screenshot
+       # db.procedure | db.task | db.productionset | db.constraintdef | db.msgset
+       # db.screen | db.literallayout  | db.programlistingco | db.screenco  | db.programlisting | db.synopsis
+       (db.list.blocks
+       | db.informalexample
+       | db.informalfigure
+       | db.informaltable
+       | db.informalequation
+       | db.informal.blocks
+       | db.publishing.blocks
+       | db.graphic.blocks
+       | db.technical.blocks
+       | db.verbatim.blocks
+       | db.remark
+       | db.para | db.formalpara | db.simpara
+       | db.extension.blocks
+       | db.xi.include)*)
 
     db.admonition.blocks =
       # Removed caution

diff --git a/geekodoc/tests/good/article-admons.xml → geekodoc/tests/good/article-admonitions.xml b/geekodoc/tests/good/article-admons.xml → geekodoc/tests/good/article-admonitions.xml
@@ -41,4 +41,25 @@
  <warning>
   <para>bla</para>
  </warning>
+ <tip>
+  <remark/>
+  <para/>
+  <informalexample><screen/></informalexample>
+  <informalfigure>
+   <mediaobject>
+    <textobject>
+     <phrase/>
+    </textobject>
+   </mediaobject>
+  </informalfigure>
+  <informaltable>
+   <tgroup cols="1">
+    <tbody>
+     <row>
+      <entry/>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </tip>
 </article>