Permalink
Browse files

Fix content model of book and part to make topic an alternative, not …

…part of the component mixture
  • Loading branch information...
ndw committed Jul 1, 2010
1 parent fd58095 commit c2970817b99a3086d85930d3143e083f56b0c3a7
Showing with 9 additions and 3 deletions.
  1. +7 −2 relaxng/docbook/src/hier.rnc
  2. +2 −1 relaxng/docbook/src/topic.rnc
@@ -114,6 +114,10 @@ div {
# ======================================================================
db.book.components = (db.navigation.components | db.components | db.divisions)*
# ======================================================================
[
db:refname [ "book" ]
db:refpurpose [ "A book" ]
@@ -137,7 +141,7 @@ div {
element book {
db.book.attlist,
db.book.info,
(db.navigation.components | db.components | db.divisions)*
db.book.components
}
}
@@ -290,6 +294,7 @@ div {
# ======================================================================
db.part.components = db.navigation.components | db.components
db.part.contentmodel = db.part.components+
# ======================================================================
@@ -317,7 +322,7 @@ div {
db.part.attlist,
db.part.info,
db.partintro?,
db.part.components+
db.part.contentmodel
}
}
@@ -34,7 +34,8 @@ namespace dbx = "http://sourceforge.net/projects/docbook/defguide/schema/extra-m
default namespace = "http://docbook.org/ns/docbook"
start |= db.topic
db.components |= db.topic
db.book.components |= db.topic*
db.part.contentmodel |= db.topic+
[
db:refname [ "topic" ]

0 comments on commit c297081

Please sign in to comment.