Skip to content

Attempt to consolidate admon content model #60 #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Attempt to consolidate admon content model #60 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d40b060
Attempt to consolidate admon content model #60
tomschr Mar 7, 2019
53c44d4
Allow formalpara after required para
tomschr Mar 7, 2019
6f1638a
Fix validation issues (again)
tomschr Mar 7, 2019
290d137
Add informalexample & informalfigure to admons
tomschr Mar 7, 2019
d5b8894
Add additional tests for admons
tomschr Aug 16, 2019
127f256
Fix #60: Consolidate admon content model
tomschr Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion geekodoc/rng/geekodoc5-flat.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions geekodoc/rng/geekodoc5.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 25 additions & 0 deletions geekodoc/tests/bad/article-admonitions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?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/>
<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>
33 changes: 33 additions & 0 deletions geekodoc/tests/good/article-admons.xml → geekodoc/tests/good/article-admonitions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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</title>
<important>
<title/>
<para/>
<formalpara>
<title/><para/>
</formalpara>
</important>
<tip>
<remark/>
<para/>
</tip>
<note>
<title>Note Title</title>
<para>bla</para>
Expand Down Expand Up @@ -30,4 +41,26 @@
<warning>
<para>bla</para>
</warning>
<tip>
<remark/>
<para/>
<screen/>
<informalexample><screen/></informalexample>
<informalfigure>
<mediaobject>
<textobject>
<phrase/>
</textobject>
</mediaobject>
</informalfigure>
<informaltable>
<tgroup cols="1">
<tbody>
<row>
<entry/>
</row>
</tbody>
</tgroup>
</informaltable>
</tip>
</article>
3 changes: 3 additions & 0 deletions geekodoc/tests/good/book.storage.admin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12306,6 +12306,7 @@ c70c032a-6e88-4962-8376-4aa119cb52ee</screen>
</para>

<important>
<para/>
<itemizedlist mark="bullet" spacing="normal">
<listitem>
<para>
Expand Down Expand Up @@ -13007,6 +13008,7 @@ created = bucket.creation_date,
<title>Adding Disks</title>

<important>
<para/>
<itemizedlist mark="bullet" spacing="normal">
<listitem>
<para>
Expand Down Expand Up @@ -13122,6 +13124,7 @@ created = bucket.creation_date,
<title>Deleting disks</title>

<important>
<para/>
<itemizedlist mark="bullet" spacing="normal">
<listitem>
<para>
Expand Down
13 changes: 1 addition & 12 deletions geekodoc/tests/good/book.suma.reference.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
<?xml version="1.0"?>
<book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xml:base="book_suma_reference_manual.xml" version="5.0" xml:lang="en" xml:id="book.suma.reference.manual">
<?dbjsp dir="reference/en-US" ?>

<?dbjsp filename="index.jsp"?>







<info>
<title>Reference Manual</title>


<productname><phrase>SUSE Manager</phrase></productname>
<productnumber><phrase>3</phrase></productnumber>

<date><?dbtimestamp format="Y-m-d"?>
</date>
<?xml-stylesheet href="urn:x-suse:xslt:profiling:docbook50-profile.xsl"
Expand Down Expand Up @@ -2791,8 +2780,8 @@ GATEWAY=192.168.0.1</screen>
each snapshot. </para>
<note>
<title>Technical Details</title>
<para/>
<itemizedlist mark="bullet" spacing="normal">

<listitem>
<para> A snapshots is always done <emphasis>after</emphasis> a successful operation and not
before, as you might expect. One consequence of the fact that snapshots are taken after the
Expand Down