diff --git a/geekodoc/rng/geekodoc5-flat.rnc b/geekodoc/rng/geekodoc5-flat.rnc index 4010ee6..d740378 100644 --- a/geekodoc/rng/geekodoc5-flat.rnc +++ b/geekodoc/rng/geekodoc5-flat.rnc @@ -8806,7 +8806,6 @@ div { db.programlisting.attlist, db.verbatim.contentmodel } } - db.admonition.contentmodel = db._info.title.only, db.all.blocks+ div { db.caution.role.attribute = attribute role { text } db.caution = @@ -10513,6 +10512,26 @@ div { # Admonitions div { + db.admonition.contentmodel = + db._info.title.only, + (db.remark*, + (db.para | db.xi.include), + (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 index 8c5718e..36710d4 100644 --- a/geekodoc/rng/geekodoc5.rnc +++ b/geekodoc/rng/geekodoc5.rnc @@ -1175,6 +1175,25 @@ include "docbookxi.rnc" # Admonitions div { + db.admonition.contentmodel = + db._info.title.only, + (db.remark*, + (db.para | db.xi.include), + (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 | db.note | db.tip | db.warning diff --git a/geekodoc/tests/bad/article-admonitions.xml b/geekodoc/tests/bad/article-admonitions.xml new file mode 100644 index 0000000..16b88a1 --- /dev/null +++ b/geekodoc/tests/bad/article-admonitions.xml @@ -0,0 +1,25 @@ + + +
+ Admonitions + + + <formalpara><title/><para/></formalpara> + </important> + <tip> + <title/> + <mediaobject> + <imageobject> + <imagedata fileref="unknown.png"/> + </imageobject> + </mediaobject> + </tip> + <warning> + <title/> + <blockquote><para/></blockquote> + </warning> + <important> + <example><screen/></example> + </important> +</article> diff --git a/geekodoc/tests/good/article-admons.xml b/geekodoc/tests/good/article-admonitions.xml similarity index 58% rename from geekodoc/tests/good/article-admons.xml rename to geekodoc/tests/good/article-admonitions.xml index 3cc0aa9..fded331 100644 --- a/geekodoc/tests/good/article-admons.xml +++ b/geekodoc/tests/good/article-admonitions.xml @@ -2,6 +2,17 @@ <?xml-model href="../../rng/geekodoc5-flat.rnc" type="application/relax-ng-compact-syntax"?> <article xmlns="http://docbook.org/ns/docbook" xml:lang="en" xml:id="article-admons"> <title>Test Article for Admonitions + + + <para/> + <formalpara> + <title/><para/> + </formalpara> + </important> + <tip> + <remark/> + <para/> + </tip> <note> <title>Note Title bla @@ -30,4 +41,26 @@ bla + + + + + + + + + + + + + + + + + + + + + +
diff --git a/geekodoc/tests/good/book.storage.admin.xml b/geekodoc/tests/good/book.storage.admin.xml index 5b94980..ab7c139 100644 --- a/geekodoc/tests/good/book.storage.admin.xml +++ b/geekodoc/tests/good/book.storage.admin.xml @@ -12306,6 +12306,7 @@ c70c032a-6e88-4962-8376-4aa119cb52ee + @@ -13007,6 +13008,7 @@ created = bucket.creation_date, Adding Disks + @@ -13122,6 +13124,7 @@ created = bucket.creation_date, Deleting disks + diff --git a/geekodoc/tests/good/book.suma.reference.xml b/geekodoc/tests/good/book.suma.reference.xml index 36b821b..9a488e4 100644 --- a/geekodoc/tests/good/book.suma.reference.xml +++ b/geekodoc/tests/good/book.suma.reference.xml @@ -1,22 +1,11 @@ - - - - - - - - Reference Manual - - SUSE Manager 3 - each snapshot. Technical Details + - A snapshots is always done after a successful operation and not before, as you might expect. One consequence of the fact that snapshots are taken after the