diff options
| -rw-r--r-- | devbook.rnc | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/devbook.rnc b/devbook.rnc index 1d24153..758d836 100644 --- a/devbook.rnc +++ b/devbook.rnc @@ -21,11 +21,9 @@ block.class = | ul | ol | dl - | list-group-u - | list-group-d -inline.class = sup | sub | b | c | d | e | path | uri +inline.class = b | c | e | d | uri all.class = block.class | inline.class -guide = element guide { guide.attlist, (\include | chapter)+ } +guide = element guide { guide.attlist, chapter, \include* } guide.attlist &= attribute root { "true" }?, attribute self { text }? @@ -107,36 +105,23 @@ ti.attlist &= [ a:defaultValue = "left" ] attribute align { "left" | "center" | "right" }? ul = element ul { ul.attlist, li+ } -ul.attlist &= empty +ul.attlist &= attribute class { text }? ol = element ol { ol.attlist, li+ } ol.attlist &= empty li = element li { li.attlist, (text | all.class)* } li.attlist &= empty -dl = element dl { dl.attlist, (dt, dd)+ } +dl = element dl { dl.attlist, (dt, dd+)+ } dl.attlist &= empty dt = element dt { dt.attlist, (text | inline.class)* } dt.attlist &= empty -# The following is strange, but devbook.xsl expects only p elements -dd = element dd { dd.attlist, p+ } +dd = element dd { dd.attlist, (text | inline.class)* } dd.attlist &= empty -list-group-u = - element list-group-u { list-group-u.attlist, (text | all.class)* } -list-group-u.attlist &= empty -list-group-d = - element list-group-d { list-group-d.attlist, (text | all.class)* } -list-group-d.attlist &= empty -sup = element sup { sup.attlist, (text | inline.class)* } -sup.attlist &= empty -sub = element sub { sub.attlist, (text | inline.class)* } -sub.attlist &= empty b = element b { b.attlist, (text | inline.class)* } b.attlist &= empty c = element c { c.attlist, (text | inline.class)* } c.attlist &= empty e = element e { e.attlist, (text | inline.class)* } e.attlist &= empty -path = element path { path.attlist, (text | inline.class)* } -path.attlist &= empty d = element d { d.attlist, empty } d.attlist &= empty uri = element uri { uri.attlist, (text | inline.class)* } |