Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update bookmeta models per oasis-tcs/dita#903 #234

Merged
merged 1 commit into from
May 30, 2023
Merged

Update bookmeta models per oasis-tcs/dita#903 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions doctypes/dtd/bookmap/bookmap.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,11 @@
<!ENTITY % bookid.content
"((%bookpartno;)*,
(%edition;)?,
(%isbn;)?,
(%booknumber;)?,
(%isbn;)*,
(%booknumber;)*,
(%volume;)*,
(%maintainer;)?)"
(%maintainer;)?,
(%data;)*)"
>
<!ENTITY % bookid.attributes
"%data-element-atts;"
Expand Down Expand Up @@ -597,7 +598,7 @@
<!ENTITY % bookeventtype.attributes
"name
CDATA
#REQUIRED
#IMPLIED
datatype
CDATA
#IMPLIED
Expand Down Expand Up @@ -708,7 +709,8 @@
(%copyrlast;)?,
(%bookowner;),
(%bookrestriction;)?,
(%summary;)?)"
(%summary;)?,
(%data;)*)"
>
<!ENTITY % bookrights.attributes
"%data-element-atts;"
Expand Down
18 changes: 13 additions & 5 deletions doctypes/rng/bookmap/bookmapMod.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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"/>
Expand Down
9 changes: 4 additions & 5 deletions specification/langRef/technicalContent/bookeventtype.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down