Merge pull request #234 from robander/bookmodel

Update bookmeta models per oasis-tcs/dita#903
oasis-tcs · May 30, 2023 · 33b9c67 · 33b9c67
2 parents 548003b + 9d49c17
commit 33b9c67
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/doctypes/dtd/bookmap/bookmap.mod b/doctypes/dtd/bookmap/bookmap.mod
@@ -304,10 +304,11 @@
 <!ENTITY % bookid.content
                        "((%bookpartno;)*,
                          (%edition;)?,
-                         (%isbn;)?,
-                         (%booknumber;)?,
+                         (%isbn;)*,
+                         (%booknumber;)*,
                          (%volume;)*,
-                         (%maintainer;)?)"
+                         (%maintainer;)?,
+                         (%data;)*)"
 >
 <!ENTITY % bookid.attributes
               "%data-element-atts;"
@@ -597,7 +598,7 @@
 <!ENTITY % bookeventtype.attributes
               "name
                           CDATA
-                                    #REQUIRED
+                                    #IMPLIED
                datatype
                           CDATA
                                     #IMPLIED
@@ -708,7 +709,8 @@
                          (%copyrlast;)?,
                          (%bookowner;),
                          (%bookrestriction;)?,
-                         (%summary;)?)"
+                         (%summary;)?,
+                         (%data;)*)"
 >
 <!ENTITY % bookrights.attributes
               "%data-element-atts;"

diff --git a/doctypes/rng/bookmap/bookmapMod.rng b/doctypes/rng/bookmap/bookmapMod.rng
@@ -614,18 +614,21 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 BookMap//EN"
         <optional>
           <ref name="edition"/>
         </optional>
-        <optional>
+        <zeroOrMore>
           <ref name="isbn"/>
-        </optional>
-        <optional>
+        </zeroOrMore>
+        <zeroOrMore>
           <ref name="booknumber"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="volume"/>
         </zeroOrMore>
         <optional>
           <ref name="maintainer"/>
         </optional>
+        <zeroOrMore>
+          <ref name="data"/>
+        </zeroOrMore>
       </define>
       <define name="bookid.attributes">
         <ref name="data-element-atts"/>
@@ -1216,7 +1219,9 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 BookMap//EN"
         <empty/>
       </define>
       <define name="bookeventtype.attributes">
-        <attribute name="name"/>
+        <optional>
+          <attribute name="name"/>
+        </optional>
         <optional>
           <attribute name="datatype"/>
         </optional>
@@ -1428,6 +1433,9 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 BookMap//EN"
         <optional>
           <ref name="summary"/>
         </optional>
+        <zeroOrMore>
+          <ref name="data"/>
+        </zeroOrMore>
       </define>
       <define name="bookrights.attributes">
         <ref name="data-element-atts"/>

diff --git a/specification/langRef/technicalContent/bookeventtype.dita b/specification/langRef/technicalContent/bookeventtype.dita
@@ -16,18 +16,17 @@
    <refbody>
       <section id="usage-information">
          <title>Usage information</title>
-         <p>The <xmlatt>name</xmlatt> attribute is required to indicate the event type.</p>
+         <p rev="review-j">The <xmlatt>value</xmlatt> attribute is used to indicate the event
+            type.</p>
       </section>
       <section id="specialization-hierarchy"
             ><title>Specialization hierarchy</title>
          <p>The <xmlelement>bookeventtype</xmlelement> element is specialized from
                <xmlelement>data</xmlelement>. It is defined in the bookmap module.</p></section>
       <section id="attributes"><title>Attributes</title>
          <p conkeyref="reuse-attributes/data-link-universal-outputclass"/>
-         <p id="attr-exception" outputclass="attr-exception">For this element, the <xmlatt>name</xmlatt> attribute is
-            required.</p>
-         <draft-comment author="tammy">This seems redundant since it's also captured in the Usage
-            information section.</draft-comment>
+         <p id="attr-exception" outputclass="attr-exception" rev="review-j">For this element, the
+               <xmlatt>value</xmlatt> attribute specifies the type of book event.</p>
       </section>
       <example id="example" otherprops="examples">
          <title>Example</title>