SF.net SVN: docbook:[8785] trunk/docbook/relaxng/docbook/src

[<nw...@us...>]

Revision: 8785
          http://docbook.svn.sourceforge.net/docbook/?rev=8785&view=rev
Author:   nwalsh
Date:     2010-07-28 13:53:25 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
Allow topic in chapter and appendix (as an alternative to narrative content) per May 2010 TC meeting

Modified Paths:
--------------
    trunk/docbook/relaxng/docbook/src/hier.rnc
    trunk/docbook/relaxng/docbook/src/topic.rnc

Modified: trunk/docbook/relaxng/docbook/src/hier.rnc
===================================================================
--- trunk/docbook/relaxng/docbook/src/hier.rnc	2010-07-28 12:32:54 UTC (rev 8784)
+++ trunk/docbook/relaxng/docbook/src/hier.rnc	2010-07-28 13:53:25 UTC (rev 8785)
@@ -235,6 +235,10 @@
 
 # ======================================================================
 
+db.appendix.contentmodel = db.component.contentmodel
+
+# ======================================================================
+
 [
    db:refname [ "appendix" ]
    db:refpurpose [ "An appendix in a book or article" ]
@@ -258,12 +262,16 @@
       element appendix {
          db.appendix.attlist,
          db.appendix.info,
-         db.component.contentmodel
+         db.appendix.contentmodel
       }
 }
 
 # ======================================================================
 
+db.chapter.contentmodel = db.component.contentmodel
+
+# ======================================================================
+
 [
    db:refname [ "chapter" ]
    db:refpurpose [ "A chapter, as of a book" ]
@@ -287,7 +295,7 @@
       element chapter {
          db.chapter.attlist,
          db.chapter.info,
-         db.component.contentmodel
+         db.chapter.contentmodel
       }
 }
 

Modified: trunk/docbook/relaxng/docbook/src/topic.rnc
===================================================================
--- trunk/docbook/relaxng/docbook/src/topic.rnc	2010-07-28 12:32:54 UTC (rev 8784)
+++ trunk/docbook/relaxng/docbook/src/topic.rnc	2010-07-28 13:53:25 UTC (rev 8785)
@@ -36,7 +36,11 @@
 start |= db.topic
 db.book.components |= db.topic*
 db.part.contentmodel |= db.topic+
+db.chapter.contentmodel |= db.topic+
+db.appendix.contentmodel |= db.topic+
 
+# ======================================================================
+
 [
    db:refname [ "topic" ]
    db:refpurpose [ "A modular unit of documentation not part of any particular narrative flow" ]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.