Skip to content

Commit

Permalink
revert candidate/proposed change
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattgarrish
mattgarrish committed Oct 11, 2024
1 parent 669eda2 commit 0c3ffb6
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 34 deletions.
24 changes: 12 additions & 12 deletions epub33/core/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
major revision of the standard.</p>
</section>
<section id="sotd" class="updateable-rec">
<p><span hidden="hidden" class="proposed-correction"></span>This document includes Proposed Corrections to
<p><span hidden="hidden" class="candidate-correction"></span>This document includes Candidate Corrections to
the current <a href="https://www.w3.org/TR/2023/REC-epub-33-20230525/">W3C Recommendation dated 25 May
2023</a>.</p>
</section>
Expand Down Expand Up @@ -5972,8 +5972,8 @@ <h5>Embedded MathML</h5>
data-tests="https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-xhtml.feature_L910,https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-xhtml.feature_L923">
<h5>Embedded SVG</h5>

<div class="proposed correction" id="change_1">
<span class="marker">Proposed Correction 1</span>
<div class="candidate correction" id="change_1">
<span class="marker">Candidate Correction 1</span>
<p data-cite="svg2">The current section does not clearly indicate that an SVG embedded by
reference is already required to be a conforming SVG content document (not a document
fragment) or that its requirements are defined in section 6.2. The only unique case here
Expand Down Expand Up @@ -6094,13 +6094,13 @@ <h4>Introduction</h4>
data-tests="https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-svg.feature_L33,https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-svg.feature_L41,https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-svg.feature_L47,https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-xhtml.feature_L923">
<h4>SVG requirements</h4>

<div class="proposed correction" id="change_2">
<span class="marker">Proposed Correction 2</span>
<div class="candidate correction" id="change_2">
<span class="marker">Candidate Correction 2</span>
<p data-cite="svg2">SVG already allows foreign-namespaced attributes to be used anywhere. The
two "MAY" bullets in the current text that allow the <code>epub:</code> namespaced
attributes are consequently not real requirements and are removed. That the attributes are
allowed on SVGs is now a note in the next section on the content model restrictions (see <a
href="#change_3">proposed correction 3</a>), as that is where the restriction in the
href="#change_3">candidate correction 3</a>), as that is where the restriction in the
second bullet on what elements the <code>epub:type</code> attribute is allowed is moved. For
more information, refer to <a href="https://github.com/w3c/epub-specs/issues/2555">issue
2555</a>.</p>
Expand Down Expand Up @@ -6185,17 +6185,17 @@ <h4>Restrictions on SVG</h4>
</ins>
</li>
<li>
<div class="proposed correction" id="change_3">
<span class="marker">Proposed Correction 3</span>
<div class="candidate correction" id="change_3">
<span class="marker">Candidate Correction 3</span>
<p>This correction adds the restriction on where the <code>epub:type</code> attribute is
allowed (refer to <a href="#change_2">proposed correction 2</a> for its former
allowed (refer to <a href="#change_2">candidate correction 2</a> for its former
placement). Moving the restriction into this section also makes it applicable to
SVGs embedded by inclusion in HTML documents, a requirement that was not clearly
established when the restriction was in the preceding section. For more information,
refer to <a href="https://github.com/w3c/epub-specs/issues/2555">issue 2555</a>.</p>
<p data-cite="svg2">This correction also addresses the list of elements the
[^/epub:type^] attribute is allowed on. The current list (see <a href="#change_2"
>proposed correction 2</a>) does not allow the attribute on the SVG [^a^]
>candidate correction 2</a>) does not allow the attribute on the SVG [^a^]
element. The text is corrected to use the [[svg2]] definition of a renderable
element to avoid the problem of missing elements when selecting more granular
element classes. For more information, refer to <a
Expand Down Expand Up @@ -11001,8 +11001,8 @@ <h3>Syntax</h3>
href="#viewport.ebnf.sep-char">separator characters</a> or the <a href="#viewport.ebnf.assign"
>assignment character</a>.</p>

<div class="proposed correction" id="change_4">
<span class="marker">Proposed Correction 4</span>
<div class="candidate correction" id="change_4">
<span class="marker">Candidate Correction 4</span>
<p data-cite="svg2">The following paragraph mixed in a reference to the [[infra]] specification's
definition of whitespace characters, which is only valid for HTML documents. This would have
allowed the Form Feed character in <code>viewport meta</code> tags even though Form Feed is not
Expand Down
36 changes: 14 additions & 22 deletions epub33/update-20241017/epub-33/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -787,15 +787,15 @@ <h1 id="title" class="title">EPUB 3.3</h1>
publications and the latest revision of this technical report can be found
in the <a href="https://www.w3.org/TR/"><abbr title="World Wide Web Consortium">W3C</abbr> technical reports index</a> at
https://www.w3.org/TR/.</em></p>
<p><span hidden="hidden" class="proposed-correction"></span>This document includes Proposed Corrections to
<p><span hidden="hidden" class="candidate-correction"></span>This document includes Candidate Corrections to
the current <a href="https://www.w3.org/TR/2023/REC-epub-33-20230525/"><abbr title="World Wide Web Consortium">W3C</abbr> Recommendation dated 25 May
2023</a>.</p>
<p>
This document was published by the <a href="https://www.w3.org/groups/wg/pm">Publishing Maintenance Working Group</a> as
a Recommendation using the
<a href="https://www.w3.org/policies/process/20231103/#recs-and-notes">Recommendation track</a>. It includes
<a href="https://www.w3.org/policies/process/20231103/#proposed-correction">
proposed corrections</a>.
<a href="https://www.w3.org/policies/process/20231103/#candidate-correction">
candidate corrections</a>.
</p><p>
<abbr title="World Wide Web Consortium">W3C</abbr> recommends the wide deployment of this specification as a standard for
the Web.
Expand All @@ -810,14 +810,6 @@ <h1 id="title" class="title">EPUB 3.3</h1>
<a href="https://www.w3.org/policies/process/20231103/#allow-new-features">new features</a>.
</p><p class="correction">
Candidate corrections are marked in the document.
</p><p class="correction proposed">
Proposed corrections are marked in the document.
</p><p>
The <abbr title="World Wide Web Consortium">W3C</abbr> Membership and other interested parties are invited to review
the proposed corrections and send comments through
17 December 2024. Advisory Committee Representatives
should consult their
<a href="https://www.w3.org/2002/09/wbs/myQuestionnaires">WBS questionnaires</a>.
</p><p>

This document was produced by a group
Expand Down Expand Up @@ -6531,8 +6523,8 @@ <h1 id="title" class="title">EPUB 3.3</h1>
<section id="sec-xhtml-svg" data-epubcheck="true" data-tests="https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-xhtml.feature_L910,https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-xhtml.feature_L923"><div class="header-wrapper"><h5 id="x6-1-4-2-embedded-svg"><bdi class="secno">6.1.4.2 </bdi>Embedded SVG</h5><a class="self-link" href="#sec-xhtml-svg" aria-label="Permalink for Section 6.1.4.2"></a></div>


<div class="proposed correction" id="change_1">
<span class="marker">Proposed Correction 1</span>
<div class="candidate correction" id="change_1">
<span class="marker">Candidate Correction 1</span>
<p data-cite="svg2">The current section does not clearly indicate that an SVG embedded by
reference is already required to be a conforming SVG content document (not a document
fragment) or that its requirements are defined in section 6.2. The only unique case here
Expand Down Expand Up @@ -6646,12 +6638,12 @@ <h1 id="title" class="title">EPUB 3.3</h1>
<section id="sec-svg-req" data-epubcheck="true" data-tests="https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-svg.feature_L33,https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-svg.feature_L41,https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-svg.feature_L47,https://w3c.github.io/epub-structural-tests/#06-content-document_content-document-xhtml.feature_L923"><div class="header-wrapper"><h4 id="x6-2-2-svg-requirements"><bdi class="secno">6.2.2 </bdi>SVG requirements</h4><a class="self-link" href="#sec-svg-req" aria-label="Permalink for Section 6.2.2"></a></div>


<div class="proposed correction" id="change_2">
<span class="marker">Proposed Correction 2</span>
<div class="candidate correction" id="change_2">
<span class="marker">Candidate Correction 2</span>
<p data-cite="svg2">SVG already allows foreign-namespaced attributes to be used anywhere. The
two "<em class="rfc2119">MAY</em>" bullets in the current text that allow the <code>epub:</code> namespaced
attributes are consequently not real requirements and are removed. That the attributes are
allowed on SVGs is now a note in the next section on the content model restrictions (see <a href="#change_3">proposed correction 3</a>), as that is where the restriction in the
allowed on SVGs is now a note in the next section on the content model restrictions (see <a href="#change_3">candidate correction 3</a>), as that is where the restriction in the
second bullet on what elements the <code>epub:type</code> attribute is allowed is moved. For
more information, refer to <a href="https://github.com/w3c/epub-specs/issues/2555">issue
2555</a>.</p>
Expand Down Expand Up @@ -6717,16 +6709,16 @@ <h1 id="title" class="title">EPUB 3.3</h1>
</ins>
</li>
<li>
<div class="proposed correction" id="change_3">
<span class="marker">Proposed Correction 3</span>
<div class="candidate correction" id="change_3">
<span class="marker">Candidate Correction 3</span>
<p>This correction adds the restriction on where the <code>epub:type</code> attribute is
allowed (refer to <a href="#change_2">proposed correction 2</a> for its former
allowed (refer to <a href="#change_2">candidate correction 2</a> for its former
placement). Moving the restriction into this section also makes it applicable to
SVGs embedded by inclusion in HTML documents, a requirement that was not clearly
established when the restriction was in the preceding section. For more information,
refer to <a href="https://github.com/w3c/epub-specs/issues/2555">issue 2555</a>.</p>
<p data-cite="svg2">This correction also addresses the list of elements the
<code><a data-link-type="element-attr" href="#dfn-epub-type" class="internalDFN" id="ref-for-dfn-epub-type-3"><code>epub:type</code></a></code> attribute is allowed on. The current list (see <a href="#change_2">proposed correction 2</a>) does not allow the attribute on the SVG <code><a data-link-type="element" data-type="element" href="https://www.w3.org/TR/SVG2/linking.html#elementdef-a" id="ref-for-index-term-a-element-0-1">a</a></code>
<code><a data-link-type="element-attr" href="#dfn-epub-type" class="internalDFN" id="ref-for-dfn-epub-type-3"><code>epub:type</code></a></code> attribute is allowed on. The current list (see <a href="#change_2">candidate correction 2</a>) does not allow the attribute on the SVG <code><a data-link-type="element" data-type="element" href="https://www.w3.org/TR/SVG2/linking.html#elementdef-a" id="ref-for-index-term-a-element-0-1">a</a></code>
element. The text is corrected to use the [<cite><a class="bibref" data-link-type="biblio" href="#bib-svg2" title="Scalable Vector Graphics (SVG) 2">svg2</a></cite>] definition of a renderable
element to avoid the problem of missing elements when selecting more granular
element classes. For more information, refer to <a href="https://github.com/w3c/epub-specs/issues/2556">issue 2556</a>.</p>
Expand Down Expand Up @@ -13185,8 +13177,8 @@ <h1 id="title" class="title">EPUB 3.3</h1>

<p>The only restriction on property <a href="#viewport.ebnf.name">names</a> and <a href="#viewport.ebnf.value">values</a> is that they <em class="rfc2119">MUST NOT</em> contain <a href="#viewport.ebnf.sep-char">separator characters</a> or the <a href="#viewport.ebnf.assign">assignment character</a>.</p>

<div class="proposed correction" id="change_4">
<span class="marker">Proposed Correction 4</span>
<div class="candidate correction" id="change_4">
<span class="marker">Candidate Correction 4</span>
<p data-cite="svg2">The following paragraph mixed in a reference to the [<cite><a class="bibref" data-link-type="biblio" href="#bib-infra" title="Infra Standard">infra</a></cite>] specification's
definition of whitespace characters, which is only valid for HTML documents. This would have
allowed the Form Feed character in <code>viewport meta</code> tags even though Form Feed is not
Expand Down

0 comments on commit 0c3ffb6

Please sign in to comment.