Fix pattern typos, allow info in more places, replace association wit…

…h an info that requires a title (association being essentially a title)
docbook · Jul 1, 2010 · fd58095 · fd58095
1 parent 2373fbf
commit fd58095
Showing 1 changed file with 12 additions and 25 deletions.
diff --git a/relaxng/docbook/src/assembly-core.rnc b/relaxng/docbook/src/assembly-core.rnc
@@ -36,7 +36,7 @@ default namespace = "http://docbook.org/ns/docbook"
 
 db.grammar.attribute =
    [
-      db:refpurpose [ "Identifies the default markup grammar for resources in this collection" ]
+      db:refpurpose [ "Identifies the markup grammar of a resource" ]
    ]
    attribute grammar { text }
 
@@ -114,7 +114,7 @@ div {
 
    db.resource.attlist =
       db.resource.role.attribute?
-    & db.grammar.attribute?
+    & db.resource.grammar.attribute?
     & db.common.attributes
 
    db.resource = db.file.resource | db.container.resource
@@ -383,9 +383,12 @@ div {
       db.relationships.role.attribute?
     & db.common.attributes
 
+   db.relationships.info = db._info
+
    db.relationships =
       element relationships {
          db.relationships.attlist,
+         db.relationships.info,
          db.relationship+
       }
 }
@@ -411,37 +414,18 @@ div {
     & db.linkend.attribute?
     & db.common.attributes
 
+   db.relationship.info = db._info.title.req
+
    db.relationship =
       element relationship {
          db.relationship.attlist,
-         db.association,
+         db.relationship.info,
          db.instance+
       }
 }
 
 # ======================================================================
 
-[
-   db:refname [ "association" ]
-   db:refpurpose [ "Identifies the type of relationship between one or more resources" ]
-]
-div {
-   db.association.role.attribute = attribute role { text }
-
-   db.association.attlist =
-      db.association.role.attribute?
-    & db.linkend.attribute?
-    & db.common.attributes
-
-   db.association =
-      element association {
-         db.association.attlist,
-         text?
-      }
-}
-
-# ======================================================================
-
 [
    db:refname [ "instance" ]
    db:refpurpose [ "Identifies a resource that is part of a relationship" ]
@@ -474,9 +458,12 @@ div {
       db.transforms.role.attribute?
     & db.common.attributes
 
+   db.transforms.info = db._info
+
    db.transforms =
       element transforms {
          db.transforms.attlist,
+         db.transforms.info,
          db.transform+
       }
 }
@@ -507,7 +494,7 @@ div {
 
    db.transform.attlist =
       db.transform.role.attribute?
-    & (db.grammar.attribute | db.transform.name.attribute)
+    & (db.transform.grammar.attribute | db.transform.name.attribute)
     & db.transform.fileref.attribute
     & db.common.attributes