Fix #83: Allow personname related elements

In regards to personname:

* Allow givenname, othername, honorifc, and linage
* Restore content model of personname to not
  mix firstname with givenname

Author: tomschr

geekodoc/rng/2_5.2/geekodoc-v2.rnc

@@ -319,7 +319,7 @@ include "db52itsxi.rnc"
   db.guisubmenu = notAllowed
   db.hardware = notAllowed
   # db.holder = notAllowed
-  db.honorific = notAllowed
+  # db.honorific = notAllowed
   # db.imagedata = notAllowed
   # db.imageobject = notAllowed
   db.imageobjectco = notAllowed
@@ -349,7 +349,7 @@ include "db52itsxi.rnc"
   db.label = notAllowed
   # db.legalnotice = notAllowed
   db.lhs = notAllowed
-  db.lineage = notAllowed
+  # db.lineage = notAllowed
   db.lineannotation = notAllowed
   # db.link = notAllowed
   # db.listitem = notAllowed
@@ -1442,17 +1442,24 @@ include "db52itsxi.rnc"
   }
 
   # personname
+  # Issue #83: Allow givenname, lineage, and honorific
   div {
     # Removed text
     db.personname =
     ## The personal name of an individual
     element personname {
       db.personname.attlist,
-      (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)+
+        )
     }
     db.person.author.contentmodel =
       db.personname,

tests/v2/bad/personname-with-givenname.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="geekodoc-v2-flat.rnc" type="application/relax-ng-compact-syntax"?>
+<article xmlns="http://docbook.org/ns/docbook" version="5.2">
+  <title>Bad names</title>
+  <info>
+    <author>
+      <personname>
+        <firstname>Tux</firstname>
+        <givenname>Tix</givenname>
+        <surname>Penguin</surname>
+      </personname>
+    </author>
+    <author>
+      <personname>
+        <givenname>Geeko</givenname>
+        <givenname>Gecko</givenname>
+        <surname>Chamaeleon</surname>
+      </personname>
+    </author>
+  </info>
+  <para/>
+</article>

tests/v2/good/geekodoc-v2-flat.rnc

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="geekodoc-v2-flat.rnc" type="application/relax-ng-compact-syntax"?>
+<article xmlns="http://docbook.org/ns/docbook" version="5.2">
+  <title>Good names</title>
+  <info>
+    <author>
+      <personname>
+        <firstname>Tux</firstname>
+        <surname>Penguin</surname>
+      </personname>
+    </author>
+    <author>
+      <personname>
+        <givenname>Geeko</givenname>
+        <givenname>Gecko</givenname>
+        <surname>Chamaeleon</surname>
+        <lineage>Jr.</lineage>
+      </personname>
+    </author>
+  </info>
+  <para/>
+</article>