Skip to content

Commit

Permalink
Merge pull request #1670 from w3c/fix/issue-808
Browse files Browse the repository at this point in the history
Change to using URL standard
  • Loading branch information
mattgarrish authored May 14, 2021
2 parents 0f951c6 + 039d181 commit defe6bb
Show file tree
Hide file tree
Showing 10 changed files with 259 additions and 179 deletions.
203 changes: 113 additions & 90 deletions epub33/core/index.html

Large diffs are not rendered by default.

13 changes: 2 additions & 11 deletions epub33/core/vocab/item-properties.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ <h3>Manifest Properties Vocabulary</h3>
appear within the Package Document scope, and the <strong>Usage</strong> field indicates usage
conditions.</p>

<p>Properties without a prefix are referenceable using the base IRI
<code>http://idpf.org/epub/vocab/package/item/#</code>.</p>
<p>The prefix URL for <a href="#sec-default-vocab">referencing these properties</a> is
<code>http://idpf.org/epub/vocab/package/item/#</code>.</p>

<section id="sec-cover-image">
<h4>cover-image</h4>
Expand Down Expand Up @@ -45,7 +45,6 @@ <h4>cover-image</h4>
</tbody>
</table>
</section>

<section id="sec-mathml">
<h4>mathml</h4>
<table id="mathml">
Expand Down Expand Up @@ -80,7 +79,6 @@ <h4>mathml</h4>
</tbody>
</table>
</section>

<section id="sec-nav-prop">
<h4>nav</h4>
<table id="nav">
Expand Down Expand Up @@ -114,7 +112,6 @@ <h4>nav</h4>
</tbody>
</table>
</section>

<section id="sec-remote-resources">
<h4>remote-resources</h4>
<table id="remote-resources">
Expand Down Expand Up @@ -153,7 +150,6 @@ <h4>remote-resources</h4>
</tbody>
</table>
</section>

<section id="sec-scripted">
<h4>scripted</h4>
<table id="scripted">
Expand Down Expand Up @@ -189,7 +185,6 @@ <h4>scripted</h4>
</tbody>
</table>
</section>

<section id="sec-svg-prop">
<h4>svg</h4>
<table id="svg">
Expand Down Expand Up @@ -228,7 +223,6 @@ <h4>svg</h4>
</tbody>
</table>
</section>

<section id="sec-switch">
<h4>switch</h4>
<table id="switch">
Expand Down Expand Up @@ -264,10 +258,8 @@ <h4>switch</h4>
</tbody>
</table>
</section>

<section id="manifest-item-properties-recursive">
<h4>Usage</h4>

<p>The <code>mathml</code>, <code>remote-resources</code>, <code>scripted</code> and <code>switch</code>
properties MUST be specified whenever the resource referenced by an <code>item</code> matches their
respective definitions. These properties do not apply recursively to content included into a
Expand All @@ -276,7 +268,6 @@ <h4>Usage</h4>
<code>item</code>
<code>properties</code> attribute will have the <code>scripted</code> value. </p>
</section>

<section id="examples-item-properties">
<h4>Examples</h4>
<figure class="example" id="example-item-properties-nav">
Expand Down
4 changes: 2 additions & 2 deletions epub33/core/vocab/itemref-properties.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ <h3>Spine Properties Vocabulary</h3>
><code>itemref</code> element's</a>
<a href="#attrdef-itemref-properties"><code>properties</code> attribute</a>.</p>

<p>Properties are referenceable using the base IRI
<code>http://idpf.org/epub/vocab/package/itemref/#</code>.</p>
<p>The prefix URL for <a href="#sec-default-vocab">referencing these properties</a> is
<code>http://idpf.org/epub/vocab/package/itemref/#</code>.</p>

<section id="sec-page-spread-left">
<h4>page-spread-left</h4>
Expand Down
6 changes: 4 additions & 2 deletions epub33/core/vocab/link.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ <h3>Metadata Link Vocabulary</h3>
><code>link</code> element's</a>
<code>rel</code> and <code>properties</code> attributes.</p>

<p><a href="#sec-link-properties">Link properties</a> without a prefix are referenceable using the
base IRI <code>http://idpf.org/epub/vocab/package/link/#</code>.</p>
<p>The prefix URL for <a href="#sec-default-vocab">referencing these properties</a> is
<code>http://idpf.org/epub/vocab/package/link/#</code>.</p>

<section id="sec-link-rel">
<h4>Link Relationships</h4>

<p>The following values can be used in the <code>link</code> element <a href="#attrdef-link-rel"
><code>rel</code> attribute</a> to establish the relationship of the resource referenced in
the <a href="#attrdef-href"><code>href</code> attribute</a>.</p>

<section id="sec-acquire">
<h5>acquire</h5>
<table id="acquire">
Expand Down
87 changes: 55 additions & 32 deletions epub33/core/vocab/meta-property.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
<section id="app-meta-property-vocab" class="vocab">
<h3>Meta Properties Vocabulary</h3>

<p>The properties in this vocabulary are usable in the <a href="#sec-meta-elem"><code>meta</code>
element's</a>
<code>property</code> attribute.</p>

<p>Unless indicated otherwise in its "Extends" field, the properties defined in this section are used to
define <a href="#subexpression">subexpressions</a>: in other words, a <code><a href="#elemdef-meta"
>meta</a></code> element carrying a property defined in this section MUST have a <code><a
href="#attrdef-refines">refines</a></code> attribute referencing a resource or expression being
augmented.</p>

<p>In each property definition, the <strong>Allowed values</strong> field indicates the expected type of
value (using [[!XMLSCHEMA-2]] datatypes), the <strong>Cardinality</strong> field indicates the number of
times the property MAY be attached to another property, and the <strong>Extends</strong> field
identifies the properties it MAY be attached to.</p>
<p>Properties without a prefix are referenceable using the base IRI
<code>http://idpf.org/epub/vocab/package/meta/#</code>.</p>

<p>The prefix URL for <a href="#sec-default-vocab">referencing these properties</a> is
<code>http://idpf.org/epub/vocab/package/meta/#</code>.</p>

<section id="sec-property-alternate-script">
<h5>alternate-script</h5>
<table id="alternate-script">
Expand Down Expand Up @@ -85,78 +90,96 @@ <h5>authority</h5>
<ul>
<li>
<p>one of the following case-insensitive reserved authority values:</p>

<dl id="authorities">
<dt id="aat"><a href="http://www.getty.edu/research/tools/vocabularies/aat/index.html">AAT</a></dt>
<dt id="aat">
<a
href="http://www.getty.edu/research/tools/vocabularies/aat/index.html"
>AAT</a>
</dt>
<dd>
<p>The Getty Art and Architecture Taxonomy.</p>
</dd>

<dt id="bic"><a href="http://www.bic.org.uk/7/BIC-Standard-Subject-Categories/">BIC</a></dt>
<dt id="bic">
<a href="http://www.bic.org.uk/7/BIC-Standard-Subject-Categories/"
>BIC</a>
</dt>
<dd>
<p>The main UK subject scheme for the book supply chain.</p>
</dd>

<dt id="bisac"><a href="http://bisg.org/page/BISACSubjectCodes">BISAC</a></dt>
<dt id="bisac">
<a href="http://bisg.org/page/BISACSubjectCodes">BISAC</a>
</dt>
<dd>
<p>The main US subject scheme for the book supply chain.</p>
</dd>

<dt id="clc"><a href="http://clc.nlc.gov.cn/">CLC</a></dt>
<dt id="clc">
<a href="http://clc.nlc.gov.cn/">CLC</a>
</dt>
<dd>
<p>The main subject classification scheme used in China.</p>
</dd>

<dt id="ddc"><a href="https://www.oclc.org/dewey/features/summaries.en.html">DDC</a></dt>
<dt id="ddc">
<a href="https://www.oclc.org/dewey/features/summaries.en.html">DDC</a>
</dt>
<dd>
<p>The Dewey Decimal Classification system.</p>
</dd>

<dt id="clil"><a href="http://clil.centprod.com/information/detailDoc.html?docId=34">CLIL</a></dt>
<dt id="clil">
<a href="http://clil.centprod.com/information/detailDoc.html?docId=34"
>CLIL</a>
</dt>
<dd>
<p>The main French subject scheme for the book supply chain.</p>
</dd>

<dt id="eurovoc"><a href="http://eurovoc.europa.eu/">EuroVoc</a></dt>
<dt id="eurovoc">
<a href="http://eurovoc.europa.eu/">EuroVoc</a>
</dt>
<dd>
<p>The European multilingual thesaurus.</p>
</dd>

<dt id="medtop"><a href="https://iptc.org/standards/media-topics/">MEDTOP</a></dt>
<dt id="medtop">
<a href="https://iptc.org/standards/media-topics/">MEDTOP</a>
</dt>
<dd>
<p>IPTC Media Topics classification scheme for the news industry.</p>
</dd>

<dt id="lcsh"><a href="http://id.loc.gov/authorities/subjects.html">LCSH</a></dt>
<dt id="lcsh">
<a href="http://id.loc.gov/authorities/subjects.html">LCSH</a>
</dt>
<dd>
<p>Library of Congress Subject Headings.</p>
</dd>

<dt id="ndc"><a href="http://www.jla.or.jp/">NDC</a></dt>
<dt id="ndc">
<a href="http://www.jla.or.jp/">NDC</a>
</dt>
<dd>
<p>The main Japanese subject scheme.</p>
</dd>

<dt id="thema"><a href="http://www.editeur.org/151/thema/">Thema</a></dt>
<dt id="thema">
<a href="http://www.editeur.org/151/thema/">Thema</a>
</dt>
<dd>
<p>The international subject scheme for the book supply chain, providing codes that work across many
languages.</p>
<p>The international subject scheme for the book supply chain, providing
codes that work across many languages.</p>
</dd>

<dt id="udc"><a href="http://www.udcc.org/">UDC</a></dt>
<dt id="udc">
<a href="http://www.udcc.org/">UDC</a>
</dt>
<dd>
<p>The Universal Decimal Classification system.</p>
</dd>

<dt id="wgs"><a href="http://info.vlb.de/files/wgsneuversion2_0.pdf">WGS</a></dt>
<dt id="wgs">
<a href="http://info.vlb.de/files/wgsneuversion2_0.pdf">WGS</a>
</dt>
<dd>
<p>The main German subject scheme for the book supply chain.</p>
</dd>
</dl>
</li>
<li>
<p>an absolute IRI [[!RFC3987]] that identifies the scheme. The IRI SHOULD refer
to a resource that provides more information about the scheme.</p>
<p>an <a href="https://url.spec.whatwg.org/#absolute-url-string">absolute-URL
string</a> [[URL]] that identifies the scheme. The URL SHOULD refer to a
resource that provides more information about the scheme.</p>
</li>
</ul>
</td>
Expand Down
2 changes: 1 addition & 1 deletion epub33/core/vocab/overlays.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h3>Media Overlays Vocabulary</h3>
element's</a>
<code>property</code> attribute.</p>

<p>The base IRI for referencing this vocabulary is
<p>The prefix URL for <a href="#sec-default-vocab">referencing these properties</a> is
<code>http://www.idpf.org/epub/vocab/overlays/#</code>.</p>

<p>The prefix "<code>media:</code>" is <a href="#sec-metadata-reserved-prefixes">reserved for use</a> with
Expand Down
2 changes: 1 addition & 1 deletion epub33/core/vocab/rendering.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h3>Package Rendering Vocabulary</h3>
System</a>). If a Reading System supports the desired rendering, these properties enable the
user to be presented the content as the EPUB Creator optimally designed it.</p>

<p>The base IRI for referencing these properties is
<p>The prefix URL for <a href="#sec-default-vocab">referencing these properties</a> is
<code>http://www.idpf.org/vocab/rendition/#</code>.</p>

<p>The "<code>rendition:</code>" prefix is <a href="#sec-metadata-reserved-prefixes">reserved for
Expand Down
6 changes: 6 additions & 0 deletions epub33/core/vocab/structure.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
<section id="structure-vocab">
<h3>Structural Semantics Vocabulary</h3>

<section id="about" class="informative">
<h4>About this Vocabulary</h4>

<p>While the EPUB Structural Semantics vocabulary is generally host language agnostic, it has been
constructed primarily to enable semantic inflection of elements in the HTML vocabulary.</p>

<p>The <i>HTML usage context</i> fields indicate contexts in HTML documents where the given property is
considered relevant. EPUB Creators may use the properties on HTML markup elements not specifically listed,
but must ensure that the semantics they express represent a subset of the carrying element's
semantics and do not attach an existing element's meaning to a semantically neutral element.</p>

<p>The <i>DPUB-ARIA role</i> fields indicate the [[DPUB-ARIA-1.0]] roles that can alternatively be used
with the [[HTML]] <code>role</code> attribute to improve accessibility. These roles may have more
restrictive usage contexts, however, so may not be valid wherever the <code>epub:type</code>
attribute is used. Refer to [[HTML-ARIA]] for more information about where the roles are
allowed.</p>

<p>When processing HTML documents, Reading Systems may ignore such non-compliant properties, unless
their usage context is explicitly overridden or extended by the host specification.</p>

<p>The <i>Usage Details</i> sections identify IDPF specifications that define or utilize the specified
properties.</p>
</section>
Expand Down
2 changes: 1 addition & 1 deletion epub33/multi-rend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ <h4>Rendition Mappings</h4>
Package Document for the Rendition as the value of an <code>epub:rendition</code> attribute.</p>

<p>If the <code>epub:rendition</code> attribute is used to specify the target Rendition, any
fragment identifier scheme MAY be used within the URI value of the <code>href</code> attribute
fragment identifier scheme MAY be used within the URL value of the <code>href</code> attribute
of <code>a</code> elements (e.g., unique identifier, or W3C Media Fragment).</p>

<div class="note">
Expand Down
Loading

0 comments on commit defe6bb

Please sign in to comment.