SF.net SVN: docbook: [8063] trunk/docbook/relaxng/publishers/publishers/ publishers.rnc

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

Revision: 8063
          http://docbook.svn.sourceforge.net/docbook/?rev=8063&view=rev
Author:   nwalsh
Date:     2008-06-28 06:31:41 -0700 (Sat, 28 Jun 2008)

Log Message:
-----------
Reorganize patterns to make valid RELAX NG

Modified Paths:
--------------
    trunk/docbook/relaxng/publishers/publishers/publishers.rnc

Modified: trunk/docbook/relaxng/publishers/publishers/publishers.rnc
===================================================================
--- trunk/docbook/relaxng/publishers/publishers/publishers.rnc	2008-06-26 01:07:55 UTC (rev 8062)
+++ trunk/docbook/relaxng/publishers/publishers/publishers.rnc	2008-06-28 13:31:41 UTC (rev 8063)
@@ -34,31 +34,35 @@
 namespace db = "http://docbook.org/ns/docbook"
 default namespace = "http://docbook.org/ns/docbook"
 
-start = db.set
-        | db.book
-	| db.divisions
-	| db.components
-	| db.navigation.components
-	| db.section
-	| db.para
-
 include "../../docbook/src/core.rnc" {
-  start |= notAllowed
-  db.sidebar |= notAllowed
-  db.person |= notAllowed
-  db.org |= notAllowed
+  start = db.set
+   | db.book
+   | db.divisions
+   | db.components
+   | db.navigation.components
+   | db.section
+   | db.para
+   db.sidebar =
+      element sidebar {
+         db.sidebar.attlist,
+         db.sidebar.info,
+         db.all.blocks+, db.recursive.sections*
+      }
+db.person =
+      element person {
+         db.person.attlist,
+         db.personname,
+         (db.address|db.affiliation|db.email|db.uri|db.personblurb|db.mediaobject)*
+      }
+      
+db.org =
+      element org {
+         db.org.attlist,
+         db.orgname,
+         (db.address|db.affiliation|db.email|db.uri|db.orgdiv|db.mediaobject)*
+      }
+
   db.parameter = notAllowed
-  db.info |= notAllowed
-  db.titleforbidden.info |= notAllowed
-  db.titleonly.info |= notAllowed
-  db.titleonlyreq.info |= notAllowed
-  db.titlereq.info |= notAllowed
-  db.bibliographic.elements |= notAllowed
-  db.extension.blocks |= notAllowed
-}
-include "dc.rnc" {start |= notAllowed}
-include "dcterms.rnc" {start |= notAllowed}
-include "dcmitype.rnc"
 
 db.info =
 element info
@@ -120,6 +124,13 @@
 | db.title
 | db.titleabbrev
 
+  db.extension.blocks = db.dialogue | db.poetry
+}
+include "dc.rnc" {start |= notAllowed}
+include "dcterms.rnc" {start |= notAllowed}
+include "dcmitype.rnc"
+
+
 db.dublincore.elements = 
 dc.title
 | dc.creator 
@@ -177,29 +188,6 @@
 | dcterms.license
 | dcterms.bibliographicCitation
 
-db.extension.blocks = db.dialogue | db.poetry
-
-   db.sidebar =
-      element sidebar {
-         db.sidebar.attlist,
-         db.sidebar.info,
-         db.all.blocks+, db.recursive.sections*
-      }
-
-db.person =
-      element person {
-         db.person.attlist,
-         db.personname,
-         (db.address|db.affiliation|db.email|db.uri|db.personblurb|db.mediaobject)*
-      }
-      
-db.org =
-      element org {
-         db.org.attlist,
-         db.orgname,
-         (db.address|db.affiliation|db.email|db.uri|db.orgdiv|db.mediaobject)*
-      }
-   
  db.speaker.role.attribute = attribute role { text }
  
    db.speaker.attlist =


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