From: Norman Walsh <ndw@nwalsh.com>
Date: Fri, 1 Jan 2010 18:53:13 +0000 (+0000)
Subject: RFE 2907124 make personal name components avialable directly in bibliomixed and bibli... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=700b19abcc966d2a3c8500138fe3dc371f196d52;p=docbook-dsssl

RFE 2907124 make personal name components avialable directly in bibliomixed and bibliomset
---

diff --git a/docbook/relaxng/docbook/src/bibliography.rnc b/docbook/relaxng/docbook/src/bibliography.rnc
index 6a31eb702..e56482e2b 100644
--- a/docbook/relaxng/docbook/src/bibliography.rnc
+++ b/docbook/relaxng/docbook/src/bibliography.rnc
@@ -55,7 +55,7 @@ db.relation.attribute =
 
 [
    db:refname [ "biblioentry" ]
-   db:refpurpose [ "An entry in a Bibliography" ]
+   db:refpurpose [ "A raw entry in a Bibliography" ]
 ]
 div {
 
@@ -77,7 +77,7 @@ div {
 
 [
    db:refname [ "bibliomixed" ]
-   db:refpurpose [ "An entry in a Bibliography" ]
+   db:refpurpose [ "A cooked entry in a Bibliography" ]
 ]
 div {
 
@@ -91,7 +91,10 @@ div {
    db.bibliomixed =
       element bibliomixed {
          db.bibliomixed.attlist,
-         (text | db.bibliographic.elements)*
+         ((db._text | db.honorific | db.firstname | db.surname
+           | db.lineage | db.othername | db.bibliographic.elements)*
+         | (db._text | db.honorific | db.givenname | db.surname
+           | db.lineage | db.othername | db.bibliographic.elements)*)
       }
 }
 
@@ -141,7 +144,10 @@ div {
    db.bibliomset =
       element bibliomset {
          db.bibliomset.attlist,
-         (db._text | db.bibliographic.elements)*
+         ((db._text | db.honorific | db.firstname | db.surname
+           | db.lineage | db.othername | db.bibliographic.elements)*
+         | (db._text | db.honorific | db.givenname | db.surname
+           | db.lineage | db.othername | db.bibliographic.elements)*)
       }
 }