Skip to content

Commit

Permalink
Fixes for the following issues:
Browse files Browse the repository at this point in the history
#870 - clarify white space in epub:type
#866 - clarify hyperlinks outside container do no get listed in manifest
#855 - remove normative keyword from informative discouraged constructs
#853 - separate/clarify rdfa and microdata usage and support
#847 - improve media overlays purpose and scope description
#844 - remove "user" as a defined term
#842 - clarify meaning of element "value" as text content
#834 - remove html processing model from relationship description

Also include minor wording clarifications suggested as part of the content documents review in issues #880, #879, #878, #877, #876, #875, #874, #868, #867, #864, #863, #860, #857, #856, #852, #849 and a few issues reported by via the mailing list.
  • Loading branch information
mattgarrish committed Sep 14, 2016
1 parent da1b727 commit ec2c32b
Show file tree
Hide file tree
Showing 30 changed files with 765 additions and 741 deletions.
2 changes: 1 addition & 1 deletion build/31/spec/epub-changes.html
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
<section class="section" id="sec-cdoc-css-priority"><h2 class="title" style="clear: both"><span class="link-marker"><a class="hidden-reveal" href="#sec-cdoc-css-priority"> </a> </span>5.3 Prioritization of Author and User Styles</h2>


<p>EPUB 3.1 adds guidance that Reading Systems should prioritize the style choices of Authors and Users over
<p>EPUB 3.1 adds guidance that Reading Systems should prioritize the style choices of Authors and users over
its own user agent styles through the addition of <span class="phrase"><a class="ulink" href="epub-contentdocs.html#confreq-css-rs-html-default" target="_top">Reading System
conformance requirements</a></span> and a <span class="phrase"><a class="ulink" href="epub-contentdocs.html#sec-css-rs-overrides" target="_top">subsection on overriding styles</a></span>.</p>

Expand Down
187 changes: 97 additions & 90 deletions build/31/spec/epub-contentdocs.html

Large diffs are not rendered by default.

86 changes: 44 additions & 42 deletions build/31/spec/epub-mediaoverlays.html

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions build/31/spec/epub-ocf.html
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ <h4 id="sec-enc-compression">Order of Compression and Encryption</h4>
<p>to provide EPUB Publications from a publisher or conversion house to the distribution or sales
channel; and</p>
</li><li class="listitem">
<p>to deliver EPUB Publications to <span class="phrase"><a class="glossterm" href="epub-spec.html#gloss-epub-reading-system" target="_top">EPUB Reading Systems</a></span> or <span class="phrase"><a class="glossterm" href="epub-spec.html#gloss-user" target="_top">Users</a></span>.</p>
<p>to deliver EPUB Publications to <span class="phrase"><a class="glossterm" href="epub-spec.html#gloss-epub-reading-system" target="_top">EPUB Reading Systems</a></span> or users.</p>
</li></ul></div>

</section>
Expand Down Expand Up @@ -835,7 +835,7 @@ <h4 id="sec-enc-compression">Order of Compression and Encryption</h4>
<a class="biblioref" href="#refUSASCII" title="&#34;Coded Character Set - 7-bit American Standard Code for Information Interchange&#34;, ANSI X3.4, 1986.">[<abbr class="abbrev">US-ASCII</abbr>]</a>.</p>

<p>The contents of the <code class="filename">mimetype</code> file <span class="rfc2119">must not</span> contain
any leading padding or whitespace, <span class="rfc2119">must not</span> begin with the Unicode
any leading padding or white space, <span class="rfc2119">must not</span> begin with the Unicode
signature (or Byte Order Mark), and the case of the media type string <span class="rfc2119">must</span>
be exactly as presented above. The <code class="filename">mimetype</code> file additionally <span class="rfc2119">must not</span> be compressed or encrypted, and there <span class="rfc2119">must not</span> be
an extra field in its ZIP header.</p>
Expand Down Expand Up @@ -893,7 +893,7 @@ <h4 id="sec-enc-compression">Order of Compression and Encryption</h4>

<p>The key used in the obfuscation algorithm is derived from the <span class="phrase"><a class="glossterm" href="epub-spec.html#gloss-unique-identifier" target="_top">Unique Identifier</a></span> of the <span class="phrase"><a class="glossterm" href="epub-spec.html#gloss-rendition-default" target="_top">Default Rendition</a></span>.</p>

<p>All whitespace characters, as defined by the XML 1.0 specification <a class="biblioref" href="#refXML" title="Extensible Markup Language (XML) 1.0 (Fifth Edition)">[<abbr class="abbrev">XML</abbr>]</a>, section 2.3,
<p>All white space characters, as defined by the XML 1.0 specification <a class="biblioref" href="#refXML" title="Extensible Markup Language (XML) 1.0 (Fifth Edition)">[<abbr class="abbrev">XML</abbr>]</a>, section 2.3,
<span class="rfc2119">must</span> be removed from this identifier — specifically, the Unicode
code points <code class="codepoint">U+0020</code>, <code class="codepoint">U+0009</code>, <code class="codepoint">U+000D</code> and <code class="codepoint">U+000A</code>.</p>

Expand Down Expand Up @@ -1492,6 +1492,7 @@ <h3 class="title">Normative References</h3>






<div class="biblioentry" id="refCSS21"><p>[<abbr class="abbrev">CSS 2.1</abbr>]
Expand Down
21 changes: 11 additions & 10 deletions build/31/spec/epub-overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@

<p>The Navigation Document replaces the EPUB 2 NCX document <a class="biblioref" href="#refOPS2" title="Open Publication Structure 2.0.1">[<abbr class="abbrev">OPS2</abbr>]</a>. The Navigation
Document, while maintaining the baseline accessibility and navigation support and features of the NCX,
introduces new functionality and rendering features to enhance navigation for all Users. Prime among
introduces new functionality and rendering features to enhance navigation for all users. Prime among
these are better support for internationalization (as an XHTML document itself, the Navigation Document
natively supports ruby annotations) and support for embedded grammars (MathML and SVG can be included
within navigation links).</p>
Expand Down Expand Up @@ -197,14 +197,14 @@
<section class="section" id="sec-rendering"><h2 class="title" style="clear: both"><span class="link-marker"><a class="hidden-reveal" href="#sec-rendering"> </a> </span>2.6 Rendering and CSS</h2>


<p>A key concept of EPUB is that content presentation adapts to the User, rather than the User having to adapt
<p>A key concept of EPUB is that content presentation adapts to the user, rather than the user having to adapt
to a particular presentation of content. HTML was originally designed to support dynamic rendering of
structured content, but over time HTML as supported in Web browsers has become focused on the needs of Web
applications, and most popular Web sites now have fixed-format layouts.</p>

<p>EPUB Publications, however, are designed to maximize accessibility for the visually impaired, and Reading
Systems typically perform text line layout and pagination on the fly, adapting to the size of the display
area, the User's preferred font size, and other environmental factors. This behavior is not guaranteed in
area, the user's preferred font size, and other environmental factors. This behavior is not guaranteed in
EPUB; images, vector graphics, video and other non-reflowable content might be included, and some Reading
Systems might not paginate on the fly, or at all. Nevertheless, supporting dynamic adaptive layout and
accessibility has been a primary design consideration throughout the evolution of the EPUB standard.</p>
Expand Down Expand Up @@ -263,10 +263,10 @@

<p>Authors need to be aware that scripting in an EPUB Publication can create security considerations that are
different from scripting within a Web browser. For example, typical same-origin policies are not applicable
to content that has been downloaded to a User's local system. Therefore, it is strongly encouraged that
to content that has been downloaded to a user's local system. Therefore, it is strongly encouraged that
scripting be limited to container constrained contexts, as further described in <span class="phrase"><a class="ulink" href="epub-contentdocs.html#sec-scripted-content-content-reqs" target="_top">Scripted Content Documents — Content Conformance</a> <a class="biblioref" href="#refContentDocs3" title="EPUB Content Documents 3.1">[<abbr class="abbrev">Content Docs 3.1</abbr>]</a></span>.</p>

<p>In other words, consider limiting scripting to cases where it is essential to the User experience, since it
<p>In other words, consider limiting scripting to cases where it is essential to the user experience, since it
greatly increases the likelihood that content will not be portable across all Reading Systems and creates
barriers to accessibility and content reusability.</p>
</section>
Expand Down Expand Up @@ -367,7 +367,7 @@


<p>EPUB 3.1 does not require that Reading Systems come with any particular set of built-in system fonts. As
occurs in Web contexts, Users in a particular locale might have installed fonts that omit characters required
occurs in Web contexts, users in a particular locale might have installed fonts that omit characters required
for other locales, and Reading Systems might utilize intrinsic fonts or font engines that do not utilize
operating system installed fonts. As a result, the text content of an EPUB Publication might not natively
render as intended on all Reading Systems.</p>
Expand Down Expand Up @@ -424,7 +424,7 @@

<p>The Navigation Document can also be reused in the body of an EPUB Publication by including it in the
<code class="markup">spine</code>. To avoid the situation in highly structured documents where it might not be
desirable to display the complete table of contents to Users in the body, the display level can be modified
desirable to display the complete table of contents to users in the body, the display level can be modified
using the <a class="biblioref" href="#refHTML" title="HTML">[<abbr class="abbrev">HTML</abbr>]</a>
<span class="property">hidden</span> attribute. This attribute is ignored by Reading Systems when they render the
table of contents outside the <code class="markup">spine</code> (e.g., in their own specialized views), which avoids
Expand Down Expand Up @@ -474,7 +474,7 @@


<p>Aural renderings of content are important for accessibility and are a desirable feature for many other
Users. A baseline to facilitate aural rendering is to utilize semantic HTML designed for dynamic layout.
users. A baseline to facilitate aural rendering is to utilize semantic HTML designed for dynamic layout.
Refer to <a class="xref" href="#sec-tts" title="2.10 Text-to-speech">Text-to-speech</a> for more information on how to use the native facilities that EPUB XHTML
Documents include. </p>

Expand All @@ -486,7 +486,7 @@

<section class="section" id="sec-access-fallbacks"><h2 class="title" style="clear: both"><span class="link-marker"><a class="hidden-reveal" href="#sec-access-fallbacks"> </a> </span>4.5 Fallbacks</h2>

<p>Not all formats are accessible in their native format, and not all Users prefer to read in the default
<p>Not all formats are accessible in their native format, and not all users prefer to read in the default
format provided. EPUB defines a variety of means for providing fallbacks so that alternate renderings can be
made available in these cases.</p>

Expand All @@ -510,7 +510,7 @@

<p>Ensure that you always implement best practices for accessible scripting in Web documents, such as provided
in <a class="biblioref" href="#refARIA" title="Accessible Rich Internet Applications (WAI-ARIA) 1.0">[<abbr class="abbrev">WAI-ARIA</abbr>]</a>, and reserve the use of scripting for situations in which interactivity is
critical to the User experience.</p>
critical to the user experience.</p>
</section>
</section>

Expand Down Expand Up @@ -972,6 +972,7 @@ <h3 class="title">Normative References</h3>






<div class="biblioentry" id="refAlternateStyleTags"><p>[<abbr class="abbrev">Alt Style Tags</abbr>]
Expand Down
Loading

0 comments on commit ec2c32b

Please sign in to comment.