RFE#1770787 Allow givenname as an alternative to firstname

diff --git a/docbook/relaxng/docbook/src/pool.rnc b/docbook/relaxng/docbook/src/pool.rnc
index 43d5888277e2f1c35edea978b6696068af599346..3f475497643a1396f55967c274303205015f3dc5 100644 (file)
--- a/docbook/relaxng/docbook/src/pool.rnc
+++ b/docbook/relaxng/docbook/src/pool.rnc
@@ -2974,11 +2974,9 @@ div {
       element personname {
          db.personname.attlist,
          (db._text
-          | (db.honorific
-           | db.firstname
-           | db.surname
-           | db.lineage
-           | db.othername)+)
+          | (db.honorific | db.firstname | db.surname | db.lineage | db.othername)+
+          | (db.honorific | db.givenname | db.surname | db.lineage | db.othername)+
+         )
       }
 }
 
@@ -3892,6 +3890,28 @@ div {
 
 # ======================================================================
 
+[
+   db:refname [ "givenname" ]
+   db:refpurpose [ "The given name of a person" ]
+]
+div {
+
+   db.givenname.role.attribute = attribute role { text }
+
+   db.givenname.attlist =
+      db.givenname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+
+   db.givenname =
+      element givenname {
+         db.givenname.attlist,
+         db._text
+      }
+}
+
+# ======================================================================
+
 [
    db:refname [ "surname" ]
    db:refpurpose [ "A family name; in western cultures the last name" ]