Skip to content

Commit

Permalink
Fixes for the following issues:
Browse files Browse the repository at this point in the history 
#755 - change alt-script to alt-rep and clarify language
#761 - make image cmts required when there is a viewport
#773 - update roadmap and add diagram
#778 - clarify package conformance
#780 - generalize backwards compatibility statement
#800 - clarify svg handling for fxl documents
#808 - replace spaces with underscores in rootfile examples
#822 - fix obsolete feature labels/descriptions
#823 - add note about incomplete RS requirements for scrolled-continuous
#824 - add clearer content model for nav elements
#826 - note toc nav is required in intro
#828 - clarify ordering requirements for toc nav references
#829 - note optional use of pagebreak with page-list

adds a link to the informative a11y faq;
patches errata not applied to doi examples;
probably some other minor stuff, too
  • Loading branch information
@mattgarrish
mattgarrish committed Sep 1, 2016
1 parent ac36ffb commit f654355
Show file tree
Hide file tree
Showing 38 changed files with 838 additions and 574 deletions.
Binary file modified build/31/schema/epub-schemas.tar.gz
View file
Binary file not shown.
Binary file modified build/31/schema/epub-schemas.zip
View file
Binary file not shown.
12 changes: 6 additions & 6 deletions build/31/schema/package-31.rnc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
opf.metadata = element metadata { opf.id.attr? & opf.i18n.attrs & opf.metadata.content }
opf.metadata.content = opf.dc.elems & opf.meta* & opf.link*

opf.meta = element meta { opf.property.attr & opf.refines.attr? & opf.id.attr? & opf.scheme.attr? & opf.i18n.attrs & opf.alt-script.attrs? & opf.file-as.attr? & datatype.string.nonempty }
opf.meta = element meta { opf.property.attr & opf.refines.attr? & opf.id.attr? & opf.scheme.attr? & opf.i18n.attrs & opf.alt-rep.attrs? & opf.file-as.attr? & datatype.string.nonempty }

opf.link = element link { opf.href.attr & opf.rel.attr & opf.id.attr? & opf.refines.attr? & opf.properties.attr? & opf.media-type.attr? }

Expand All @@ -29,17 +29,17 @@
opf.refines.attr = attribute refines { datatype.URI }

opf.dc.identifier = element dc:identifier { opf.id.attr? & opf.id.scheme.attr? & datatype.string.nonempty }
opf.dc.title = element dc:title { opf.dc.attlist & opf.file-as.attr? & opf.alt-script.attrs? & datatype.string.nonempty }
opf.dc.title = element dc:title { opf.dc.attlist & opf.file-as.attr? & opf.alt-rep.attrs? & datatype.string.nonempty }
opf.dc.language = element dc:language { opf.id.attr? & datatype.languagecode }
opf.dc.date = element dc:date { opf.id.attr? & datatype.string.nonempty }
opf.dc.source = element dc:source { opf.id.attr? & opf.id.scheme.attr? & datatype.string.nonempty }
opf.dc.type = element dc:type { opf.id.attr? & datatype.string.nonempty }
opf.dc.format = element dc:format { opf.id.attr? & datatype.string.nonempty }
opf.dc.creator = element dc:creator { opf.dc.attlist & opf.role.attr? & opf.file-as.attr? & opf.alt-script.attrs? & datatype.string.nonempty }
opf.dc.creator = element dc:creator { opf.dc.attlist & opf.role.attr? & opf.file-as.attr? & opf.alt-rep.attrs? & datatype.string.nonempty }
opf.dc.subject = element dc:subject { opf.dc.attlist & (opf.authority.attr & opf.term.attr)? & datatype.string.nonempty }
opf.dc.description = element dc:description { opf.dc.attlist & datatype.string.nonempty }
opf.dc.publisher = element dc:publisher { opf.dc.attlist & opf.file-as.attr? & opf.alt-script.attrs? & datatype.string.nonempty }
opf.dc.contributor = element dc:contributor { opf.dc.attlist & opf.role.attr? & opf.file-as.attr? & opf.alt-script.attrs? & datatype.string.nonempty }
opf.dc.publisher = element dc:publisher { opf.dc.attlist & opf.file-as.attr? & opf.alt-rep.attrs? & datatype.string.nonempty }
opf.dc.contributor = element dc:contributor { opf.dc.attlist & opf.role.attr? & opf.file-as.attr? & opf.alt-rep.attrs? & datatype.string.nonempty }
opf.dc.relation = element dc:relation { opf.dc.attlist & datatype.string.nonempty }
opf.dc.coverage = element dc:coverage { opf.dc.attlist & datatype.string.nonempty }
opf.dc.rights = element dc:rights { opf.dc.attlist & datatype.string.nonempty }
Expand Down Expand Up @@ -116,7 +116,7 @@
opf.authority.attr = attribute opf:authority { datatype.URI.absolute }
opf.term.attr = attribute opf:term { datatype.string.nonempty }
opf.id.scheme.attr = attribute opf:scheme { datatype.string.nonempty }
opf.alt-script.attrs = (attribute opf:alt-script { datatype.string.nonempty }, attribute opf:alt-script-lang { datatype.languagecode })
opf.alt-rep.attrs = (attribute opf:alt-rep { datatype.string.nonempty }, attribute opf:alt-rep-lang { datatype.languagecode })
opf.file-as.attr = attribute opf:file-as { datatype.string.nonempty }
opf.role.attr = attribute opf:role { datatype.string.nonempty }
opf.i18n.attrs = opf.xml.lang.attr? & opf.dir.attr?
Expand Down
3 changes: 2 additions & 1 deletion build/31/spec/epub-changes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@

<p>Use of the <span class="phrase"><a class="ulink" href="epub-packages.html#attrdef-meta-refines" target="_top">refines
attribute</a> <a class="biblioref" href="#refPackages3" title="EPUB Packages 3.1">[<abbr class="abbrev">Packages 3.1</abbr>]</a></span> is now <span class="phrase"><a class="ulink" href="epub-spec.html#deprecated" target="_top">deprecated</a> <a class="biblioref" href="#refEPUB3" title="EPUB 3.1">[<abbr class="abbrev">EPUB 3.1</abbr>]</a></span>. The following attributes have been added to replace the functionality it provided to
Reading Systems: <code class="markup">opf:scheme</code>, <code class="markup">opf:role</code>, <code class="markup">opf:alt-script</code>,
Reading Systems: <code class="markup">opf:scheme</code>, <code class="markup">opf:role</code>, <code class="markup">opf:alt-rep</code>,
<code class="markup">opf:file-as</code>, <code class="markup">opf:authority</code> and <code class="markup">opf:term</code>.</p>
</section>

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






<div class="biblioentry" id="refEPUB3Overview"><p>[<abbr class="abbrev">EPUB3 Overview</abbr>]
Expand Down
138 changes: 79 additions & 59 deletions build/31/spec/epub-contentdocs.html
View file

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions build/31/spec/epub-mediaoverlays.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@
</dd><dt class="varlistentry"><span class="term">Content Model</span></dt><dd>
<p>In this order: <code class="markup">
<a class="xref" href="#elemdef-smil-head">head</a></code>
<code class="option">[optional]</code>, <code class="markup"><a class="xref" href="#elemdef-smil-body">body</a></code>
<code class="option">[required]</code></p>
<code class="option">[0 or 1]</code>, <code class="markup"><a class="xref" href="#elemdef-smil-body">body</a></code>
<code class="option">[exactly 1]</code></p>
</dd></dl></div>

</section>
Expand Down Expand Up @@ -436,8 +436,8 @@
</dd></dl></div>
</dd><dt class="varlistentry"><span class="term">Content Model</span></dt><dd>
<p>In any order: <code class="markup"><a class="xref" href="#elemdef-smil-text">text</a></code>
<code class="option">[required]</code> and <code class="markup"><a class="xref" href="#elemdef-smil-audio">audio</a></code>
<code class="option">[optional]</code></p>
<code class="option">[exactly 1]</code> and <code class="markup"><a class="xref" href="#elemdef-smil-audio">audio</a></code>
<code class="option">[0 or 1]</code></p>
<p>The <code class="markup"><a class="xref" href="#elemdef-smil-audio">audio</a></code> element is <span class="rfc2119">optional</span> only if its sibling <code class="markup"><a class="xref" href="#elemdef-smil-text">text</a></code> element refers to audio or video media (see
<a class="xref" href="#sec-audio-video" title="3.2.3 Embedded Media">Embedded Media</a>), or to textual content intended for rendering via
<span class="phrase"><a class="glossterm" href="epub-spec.html#gloss-tts" target="_top">Text-to-Speech
Expand Down Expand Up @@ -1307,7 +1307,7 @@
</li></ul></div>

<div class="note"><h3 class="title">note</h3>
<p>Specific implementation details are beyond the scope of this specification. The <a class="ulink" href="http://www.daisy.org/guidelines/epub/reading-systems-media-overlays-playback-functionality" target="_top">DAISY Reading Systems Media Overlays Playback Functionality</a> document describes best practices for
<p>Specific implementation details are beyond the scope of this specification. The <a class="ulink" href="http://www.daisy.org/guidelines/epub/media-overlays-playback-requirements" target="_top">DAISY Media Overlays Playback Requirements</a> document describes best practices for
Authors, and provides recommendations for Reading System developers.</p>
</div>
</section>
Expand Down Expand Up @@ -1654,6 +1654,7 @@ <h3 class="title">Informative References</h3>






<div class="biblioentry" id="refEPUB3Changes"><p>[<abbr class="abbrev">EPUB3 Changes</abbr>]
Expand Down
7 changes: 4 additions & 3 deletions build/31/spec/epub-ocf.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
&lt;?xml version="1.0"?&gt;&#xD;
&lt;container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container"&gt;&#xD;
&lt;rootfiles&gt;&#xD;
&lt;rootfile full-path="EPUB/Great Expectations.opf"&#xD;
&lt;rootfile full-path="EPUB/Great_Expectations.opf"&#xD;
media-type="application/oebps-package+xml" /&gt; &#xD;
&lt;/rootfiles&gt;&#xD;
&lt;/container&gt;
Expand Down Expand Up @@ -393,7 +393,7 @@
&lt;?xml version="1.0"?&gt;&#xD;
&lt;container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container"&gt;&#xD;
&lt;rootfiles&gt;&#xD;
&lt;rootfile full-path="EPUB/My Crazy Life.opf"&#xD;
&lt;rootfile full-path="EPUB/My_Crazy_Life.opf"&#xD;
media-type="application/oebps-package+xml" /&gt;&#xD;
&lt;/rootfiles&gt;&#xD;
&lt;/container&gt;
Expand Down Expand Up @@ -1052,7 +1052,7 @@ <h4 id="sec-enc-compression">Order of Compression and Encryption</h4>
<pre class="synopsis">&lt;?xml version="1.0"?&gt;&#xD;
&lt;container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container"&gt;&#xD;
&lt;rootfiles&gt;&#xD;
&lt;rootfile full-path="EPUB/As You Like It.opf"&#xD;
&lt;rootfile full-path="EPUB/As_You_Like_It.opf"&#xD;
media-type="application/oebps-package+xml" /&gt;&#xD;
&lt;/rootfiles&gt;&#xD;
&lt;/container&gt;</pre>
Expand Down Expand Up @@ -1658,6 +1658,7 @@ <h3 class="title">Informative References</h3>






<div class="biblioentry" id="refEPUB3Changes"><p>[<abbr class="abbrev">EPUB3 Changes</abbr>]
Expand Down
3 changes: 2 additions & 1 deletion build/31/spec/epub-overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@


<p>EPUB 3.1 supports alternate representations of all text metadata items in the package metadata section to
improve global distribution of EPUB Publications. The <span class="phrase"><a class="ulink" href="epub-packages.html#attrdef-opf-alt-script" target="_top">opf:alt-script</a> <a class="biblioref" href="#refPackages3" title="EPUB Packages 3.1">[<abbr class="abbrev">Packages 3.1</abbr>]</a></span> attribute provides the ability
improve global distribution of EPUB Publications. The <span class="phrase"><a class="ulink" href="epub-packages.html#attrdef-opf-alt-rep" target="_top">opf:alt-rep</a> <a class="biblioref" href="#refPackages3" title="EPUB Packages 3.1">[<abbr class="abbrev">Packages 3.1</abbr>]</a></span> attribute provides the ability
to include and identify alternate script renderings of language-specific metadata.</p>

<p>Using this attribute, a Japanese EPUB Publication could, for example, include an alternate Roman-script
Expand Down Expand Up @@ -1117,6 +1117,7 @@ <h3 class="title">Informative References</h3>






<div class="biblioentry" id="refEPUB3Changes"><p>[<abbr class="abbrev">EPUB3 Changes</abbr>]
Expand Down
Loading

0 comments on commit f654355

Please sign in to comment.