Skip to content

Commit

Permalink
Addresses issues #525, #526, #717 and #727
Browse files Browse the repository at this point in the history 
- updated glossterm and glossdef usage contexts
- update term names and definitions
- deprecated subchapter
  • Loading branch information
@mattgarrish
mattgarrish committed Jun 20, 2016
1 parent 3e7f00c commit b1633ff
Show file tree
Hide file tree
Showing 2 changed files with 155 additions and 38 deletions.
126 changes: 106 additions & 20 deletions build/epub/vocab/structure/epub-vocab-structure.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ <h2 id="h_divisions" about="#divisions" rev="dcterms:title">Document divisions</
<a href="http://www.w3.org/TR/html5/sections.html#the-body-element-0">body</a>
</p>
</dd>
<dt id="subchapter" about="#subchapter" typeof="rdf:Property">subchapter</dt>
<dt id="subchapter" about="#subchapter" typeof="rdf:Property">subchapter<span class="status deprecated" property="owl:deprecated" content="true"> [deprecated]</span>
</dt>
<dd about="#subchapter" property="rdfs:comment" datatype="xsd:string">
<p>A major sub-division of a chapter.</p>
</dd>
Expand Down Expand Up @@ -955,10 +956,10 @@ <h3 id="h_glossaries" about="#glossaries" rev="dcterms:title">Glossaries</h3>
</dd>
<dd>
<p>
<span class="subproplabel">HTML usage context: </span>When the element on which the property appears is a
<a href="http://www.w3.org/TR/html5/grouping-content.html#the-dt-element">dt</a> element within a
<span class="subproplabel">HTML usage context: </span>The glossterm property is implied on
<a href="http://www.w3.org/TR/html5/grouping-content.html#the-dt-element">dt</a> elements within a
<a href="http://www.w3.org/TR/html5/grouping-content.html#the-dl-element">dl</a> element marked with the
<a href="#glossary">glossary</a> property, then the glossterm property on the given dt element is implied.</p>
<a href="#glossary">glossary</a> property.</p>
</dd>
<dt id="glossdef" about="#glossdef" typeof="rdf:Property">glossdef</dt>
<dd about="#glossdef" property="rdfs:comment" datatype="xsd:string">
Expand All @@ -975,12 +976,10 @@ <h3 id="h_glossaries" about="#glossaries" rev="dcterms:title">Glossaries</h3>
</dd>
<dd>
<p>
<span class="subproplabel">HTML usage context: </span>When the element on which the property appears a
<a href="http://www.w3.org/TR/html5/grouping-content.html#the-dd-element">dd</a> element within a
<span class="subproplabel">HTML usage context: </span>The glossdef property is implied on
<a href="http://www.w3.org/TR/html5/grouping-content.html#the-dd-element">dd</a> elements within a
<a href="http://www.w3.org/TR/html5/grouping-content.html#the-dl-element">dl</a> element marked with the
<a href="#glossary">glossary</a> property, then the glossdef property on the given dd element is implied. When the element context is a
<a href="http://www.w3.org/TR/html5/sections.html#the-dt-element">dd</a> element and no explicit glossterm link is provided, then the term that this glossdef participates in defining is located in the nearest preceding
<a href="http://www.w3.org/TR/html5/sections.html#the-dt-element">dt</a> element sibling.</p>
<a href="#glossary">glossary</a> property.</p>
</dd>
</dl>
</div>
Expand Down Expand Up @@ -1183,7 +1182,8 @@ <h2 id="h_asides" about="#asides" rev="dcterms:title">Complementary content</h2>
<a href="http://www.w3.org/TR/html5/dom.html#sectioning-content-0">sectioning content</a>
</p>
</dd>
<dt id="help" about="#help" typeof="rdf:Property">help</dt>
<dt id="help" about="#help" typeof="rdf:Property">help<span class="status deprecated" property="owl:deprecated" content="true"> [deprecated]</span>
</dt>
<dd about="#help" property="rdfs:comment" datatype="xsd:string">
<p>Helpful information that clarifies some aspect of the content or assists in its comprehension.</p>
</dd>
Expand All @@ -1203,6 +1203,14 @@ <h2 id="h_asides" about="#asides" rev="dcterms:title">Complementary content</h2>
<a href="http://www.w3.org/TR/html5/dom.html#phrasing-content">phrasing content</a>
</p>
</dd>
<dd>
<p>
<span class="subproplabel">Replaced by:</span>
<span class="subpropref" about="#help" rel="dcterms:isReplacedBy">
<a href="#tip">tip</a>
</span>
</p>
</dd>
<dt id="marginalia" about="#marginalia" typeof="rdf:Property">marginalia<span class="status deprecated" property="owl:deprecated" content="true"> [deprecated]</span>
</dt>
<dd about="#marginalia" property="rdfs:comment" datatype="xsd:string">
Expand Down Expand Up @@ -1291,6 +1299,26 @@ <h2 id="h_asides" about="#asides" rev="dcterms:title">Complementary content</h2>
</span>
</p>
</dd>
<dt id="tip" about="#tip" typeof="rdf:Property">tip</dt>
<dd about="#tip" property="rdfs:comment" datatype="xsd:string">
<p>Helpful information that clarifies some aspect of the content or assists in its comprehension.</p>
</dd>
<dd>
<p>
<span class="subproplabel">Inherits from:</span>
<span class="subpropref" about="#tip" rel="rdfs:subPropertyOf"
resource="http://www.w3.org/1999/xhtml/vocab/#complementary">
<a href="http://www.w3.org/1999/xhtml/vocab/#complementary">xhv:complementary</a>
</span>
</p>
</dd>
<dd>
<p>
<span class="subproplabel">HTML usage context: </span>
<a href="http://www.w3.org/TR/html5/sections.html#the-aside-element">aside</a>,
<a href="http://www.w3.org/TR/html5/dom.html#phrasing-content">phrasing content</a>
</p>
</dd>
<dt id="warning" about="#warning" typeof="rdf:Property">warning<span class="status deprecated" property="owl:deprecated" content="true"> [deprecated]</span>
</dt>
<dd about="#warning" property="rdfs:comment" datatype="xsd:string">
Expand Down Expand Up @@ -1884,21 +1912,21 @@ <h2 id="h_notes" about="#notes" rev="dcterms:title">Notes and annotations</h2>
<dd about="#note" property="rdfs:comment" datatype="xsd:string">
<p>A note. This property does not carry spatial positioning semantics, as do the
<a href="#footnote">footnote</a> and
<a href="#rearnote">rearnote</a> properties. It can be used to identify footnotes, rear notes, marginal notes, inline notes, and similar when legacy naming conventions are not desired.</p>
<a href="#endnote">endnote</a> properties. It can be used to identify footnotes, endnotes, marginal notes, inline notes, and similar when legacy naming conventions are not desired.</p>
</dd>
<dd>
<p>
<span class="subproplabel">HTML usage context: </span>On the
<a href="http://www.w3.org/TR/html5/sections.html#the-aside-element">aside</a> element when identifying a single note, or on descendants of sectioning content when identifying individual notes in a group (refer to
<a href="#footnotes">footnotes</a> and
<a href="#rearnotes">rearnotes</a>).</p>
<a href="#endnotes">endnotes</a>).</p>
</dd>
<dd>
<p>
<span class="subproplabel">Replaced by:</span>
<span class="subpropref" about="#note" rel="dcterms:isReplacedBy">
<a href="#footnote">footnote</a>,
<a href="#rearnote">rearnote</a>
<a href="#endnote">endnote</a>
</span>
</p>
</dd>
Expand All @@ -1919,9 +1947,29 @@ <h2 id="h_notes" about="#notes" rev="dcterms:title">Notes and annotations</h2>
<span class="subproplabel">HTML usage context: </span>On the
<a href="http://www.w3.org/TR/html5/sections.html#the-aside-element">aside</a> element when identifying a single footnote, or on descendants of sectioning content when identifying individual footnotes in a group (refer to
<a href="#footnotes">footnotes</a> and
<a href="#rearnotes">rearnotes</a>).</p>
<a href="#endnotes">endnotes</a>).</p>
</dd>
<dt id="endnote" about="#endnote" typeof="rdf:Property">endnote</dt>
<dd about="#endnote" property="rdfs:comment" datatype="xsd:string">
<p>One of a collection of notes that occur at the end of a work, or a section within it, that provides additional context to a referenced passage of text.</p>
</dd>
<dd>
<p>
<span class="subproplabel">See also:</span>
<span class="subpropref" about="#endnote" rel="rdfs:seeAlso" resource="#endnotes">
<a href="#endnotes">endnotes</a>
</span>
</p>
</dd>
<dt id="rearnote" about="#rearnote" typeof="rdf:Property">rearnote</dt>
<dd>
<p>
<span class="subproplabel">HTML usage context: </span>On the
<a href="http://www.w3.org/TR/html5/sections.html#the-aside-element">aside</a> element when identifying a single endnote, or on descendants of sectioning content when identifying individual endnotes in a group (refer to
<a href="#footnotes">footnotes</a> and
<a href="#endnotes">endnotes</a>).</p>
</dd>
<dt id="rearnote" about="#rearnote" typeof="rdf:Property">rearnote<span class="status deprecated" property="owl:deprecated" content="true"> [deprecated]</span>
</dt>
<dd about="#rearnote" property="rdfs:comment" datatype="xsd:string">
<p>A note appearing in the rear (backmatter) of the work, or at the end of a section.</p>
</dd>
Expand All @@ -1940,6 +1988,14 @@ <h2 id="h_notes" about="#notes" rev="dcterms:title">Notes and annotations</h2>
<a href="#footnotes">footnotes</a> and
<a href="#rearnotes">rearnotes</a>).</p>
</dd>
<dd>
<p>
<span class="subproplabel">Replaced by:</span>
<span class="subpropref" about="#rearnote" rel="dcterms:isReplacedBy">
<a href="#endnote">endnote</a>
</span>
</p>
</dd>
<dt id="footnotes" about="#footnotes" typeof="rdf:Property">footnotes</dt>
<dd about="#footnotes" property="rdfs:comment" datatype="xsd:string">
<p>A collection of
Expand All @@ -1959,7 +2015,26 @@ <h2 id="h_notes" about="#notes" rev="dcterms:title">Notes and annotations</h2>
<a href="http://www.w3.org/TR/html5/dom.html#sectioning-content-0">sectioning content</a>
</p>
</dd>
<dt id="rearnotes" about="#rearnotes" typeof="rdf:Property">rearnotes</dt>
<dt id="endnotes" about="#endnotes" typeof="rdf:Property">endnotes</dt>
<dd about="#endnotes" property="rdfs:comment" datatype="xsd:string">
<p>A collection of notes at the end of a work or a section within it.</p>
</dd>
<dd>
<p>
<span class="subproplabel">See also:</span>
<span class="subpropref" about="#endnotes" rel="rdfs:seeAlso" resource="#endnote">
<a href="#endnote">endnote</a>
</span>
</p>
</dd>
<dd>
<p>
<span class="subproplabel">HTML usage context: </span>
<a href="http://www.w3.org/TR/html5/dom.html#sectioning-content-0">sectioning content</a>
</p>
</dd>
<dt id="rearnotes" about="#rearnotes" typeof="rdf:Property">rearnotes<span class="status deprecated" property="owl:deprecated" content="true"> [deprecated]</span>
</dt>
<dd about="#rearnotes" property="rdfs:comment" datatype="xsd:string">
<p>A collection of notes appearing at the rear (backmatter) of the work, or at the end of a section.</p>
</dd>
Expand All @@ -1977,6 +2052,14 @@ <h2 id="h_notes" about="#notes" rev="dcterms:title">Notes and annotations</h2>
<a href="http://www.w3.org/TR/html5/dom.html#sectioning-content-0">sectioning content</a>
</p>
</dd>
<dd>
<p>
<span class="subproplabel">Replaced by:</span>
<span class="subpropref" about="#rearnotes" rel="dcterms:isReplacedBy">
<a href="#endnotes">endnotes</a>
</span>
</p>
</dd>
</dl>
</div>
<div id="links" about="#links" typeof="rdf:Bag">
Expand Down Expand Up @@ -2087,15 +2170,18 @@ <h2 id="h_links" about="#links" rev="dcterms:title">References</h2>
<a href="http://www.w3.org/TR/html5/text-level-semantics.html#the-a-element">a</a>
</p>
</dd>
<dt id="referrer" about="#referrer" typeof="rdf:Property">referrer<span class="status draft"> [draft]</span>
<dt id="backlink" about="#backlink" typeof="rdf:Property">backlink<span class="status draft"> [draft]</span>
</dt>
<dd about="#referrer" property="rdfs:comment" datatype="xsd:string">
<p>A link that allows the user to jump to a related location in the content (e.g., from a footnote to its reference, from an index entry to where the topic is discussed, or from a glossary definition to where the term is used).</p>
<dd about="#backlink" property="rdfs:comment" datatype="xsd:string">
<p>A link that allows the user to return to a related location in the content (e.g., from a
<a href="#footnote">footnote</a> to its reference or from a
<a href="#glossdef">glossary definition</a> to where a
<a href="#glossterm">term</a> is used).</p>
</dd>
<dd>
<p>
<span class="subproplabel">Inherits from:</span>
<span class="subpropref" about="#referrer" rel="rdfs:subPropertyOf"
<span class="subpropref" about="#backlink" rel="rdfs:subPropertyOf"
resource="http://www.w3.org/1999/xhtml/vocab/#link">
<a href="http://www.w3.org/1999/xhtml/vocab/#link">xhv:link</a>
</span>
Expand Down
Loading

0 comments on commit b1633ff

Please sign in to comment.