Skip to content

Commit

Permalink
Merge pull request #1222 from w3c/issue-1220-cr2-publishing-package
Browse files Browse the repository at this point in the history
Create CR2 publishing package (#1220).
skynavga authored Mar 10, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 4b8eeae + bf0ad7c commit d89461f
Showing 8 changed files with 207 additions and 38 deletions.
12 changes: 6 additions & 6 deletions spec/entitiescr.dtd
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version='1.0' encoding='ISO-8859-1' ?>

<!-- Date parameters -->
<!ENTITY draft.year "2020">
<!ENTITY draft.month "January">
<!ENTITY draft.mm "01">
<!ENTITY draft.day "28">
<!ENTITY draft.dd "28">
<!ENTITY draft.year "2021">
<!ENTITY draft.month "March">
<!ENTITY draft.mm "03">
<!ENTITY draft.day "09">
<!ENTITY draft.dd "09">

<!ENTITY draft.date "&draft.year;&draft.mm;&draft.dd;">

@@ -22,7 +22,7 @@
<!ENTITY document.role "public">

<!-- The following is used for document .-->
<!ENTITY document.status "W3C Candidate Recommendation">
<!ENTITY document.status "W3C Candidate Recommendation Snapshot">
<!ENTITY w3c.status "CR">
<!ENTITY doctype "cr">

30 changes: 30 additions & 0 deletions spec/entitiescrd.dtd
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version='1.0' encoding='ISO-8859-1' ?>

<!-- Date parameters -->
<!ENTITY draft.year "2020">
<!ENTITY draft.month "January">
<!ENTITY draft.mm "01">
<!ENTITY draft.day "28">
<!ENTITY draft.dd "28">

<!ENTITY draft.date "&draft.year;&draft.mm;&draft.dd;">

<!ENTITY prefix "ttml2">

<!ENTITY w3c.tr.latest "https://www.w3.org/TR">

<!-- Latest version links. -->
<!ENTITY latest "&w3c.tr.latest;/&prefix;/">
<!ENTITY latestrec "&w3c.tr.latest;/ttml1/">

<!ENTITY w3c.tr "&w3c.tr.latest;/&draft.year;">

<!ENTITY document.role "public">

<!-- The following is used for document .-->
<!ENTITY document.status "W3C Candidate Recommendation Draft">
<!ENTITY w3c.status "CRD">
<!ENTITY doctype "crd">

<!ENTITY w3c-designation
"&w3c.tr.latest;/&draft.year;/&w3c.status;-&prefix;-&draft.date;/">
28 changes: 15 additions & 13 deletions spec/status.xml
Original file line number Diff line number Diff line change
@@ -6,41 +6,43 @@
document. A list of current W3C publications and the latest revision of this technical report can be found in
the <loc href="https://www.w3.org/TR/">W3C technical reports index</loc> at https://www.w3.org/TR/.</emph></p>

<p>This is the First <loc href="https://www.w3.org/2019/Process-20190301/#candidate-rec">Candidate Recommendation</loc> (CR1) of
<p>This is the Second <loc href="https://www.w3.org/2020/Process-20200915/#candidate-rec">Candidate Recommendation</loc> (CR2) of
the Second Edition of the Timed Text Markup Language &versionOfTT; (TTML&versionOfTT;), and is expected to advance to Proposed
Recommendation no earlier than 17 March 2020.</p>
Recommendation no earlier than 6 April 2021.
This Second <loc href="https://www.w3.org/2020/Process-20200915/#candidate-rec">Candidate Recommendation</loc> (CR2) makes no
technical changes to the previous, First <loc href="https://www.w3.org/2020/Process-20200915/#candidate-rec">Candidate
Recommendation</loc> (CR1); that is, only editorial (non-substantive) changes were applied.</p>

<p>For this specification to exit CR, the following criterion must be met: for each feature (extension) affected by a substantive
change introduced by this specification, at least two independent implementations must support the feature (extension) having been
so affected. No (underlying) feature (extension) has been added or removed by this revision, and, as such, no feature
(extension) is marked at risk.</p>

<p>An <loc href="https://www.w3.org/wiki/TimedText/TTML2SecondEditionImplementationReport">implementation report</loc>
will be provided. A summary of technical changes from TTML2, 1st Edition, is available
<p>An <loc href="https://www.w3.org/wiki/TimedText/TTML2SecondEditionImplementationReport">implementation report</loc> is provided.
A summary of technical changes from TTML2, 1st Edition, is available
at <loc href="ttml2-changes.html">Timed Text Markup Language 2 (TTML2) Change Summary</loc>.
Comments about this document are welcome by filing an <loc href="https://github.com/w3c/ttml2/issues">issue on GitHub</loc> or
sending email to <loc href="mailto:[email protected]">[email protected]</loc>
(<loc href="mailto:[email protected]?subject=subscribe">subscribe</loc>,
<loc href="http://lists.w3.org/Archives/Public/public-tt/">archives</loc>)
with a subject line starting with <code>[ttml2]</code>.</p>

<p>This document was produced by the <loc href="https://www.w3.org/AudioVideo/TT/">Timed Text (TT) Working Group</loc>, the
authors of which are listed in the header of this document. W3C publishes a Candidate Recommendation to indicate that the document
is believed to be stable and to encourage implementation by the developer community.</p>
<p>This document was published by the <loc href="https://www.w3.org/AudioVideo/TT/">Timed Text (TT) Working Group</loc>
as a Candidate Recommendation Snapshot.</p>

<p>Publication as a Candidate Recommendation does not imply endorsement by the W3C Membership. This is a draft document and may be
updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in
progress.</p>
<p>Publication as a Candidate Recommendation does not imply endorsement by the W3C Membership.
A Candidate Recommendation Snapshot has received <loc href="https://www.w3.org/2020/Process-20200915/#dfn-wide-review">wide review</loc>
and is intended to gather implementation experience.</p>

<p>This document was produced by a group operating under the <loc href="https://www.w3.org/Consortium/Patent-Policy/">W3C Patent
Policy</loc>. W3C maintains a <loc role="disclosure" href="https://www.w3.org/2004/01/pp-impl/34314/status#disclosures">public
list of any patent disclosures</loc> made in connection with the deliverables of the group; that page also includes instructions
for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes
contains <loc href="https://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</loc> must disclose
the information in accordance with <loc href="https://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of
contains <loc href="https://www.w3.org/Consortium/Patent-Policy/#def-essential">Essential Claim(s)</loc> must disclose
the information in accordance with <loc href="https://www.w3.org/Consortium/Patent-Policy/#sec-Disclosure">section 6 of
the W3C Patent Policy</loc>.</p>

<p>This document is governed by the <loc id="w3c_process_revision" href="https://www.w3.org/2019/Process-20190301/">1 March 2019
<p>This document is governed by the <loc id="w3c_process_revision" href="https://www.w3.org/2020/Process-20200915/">15 September 2020
W3C Process Document</loc>.</p>

</status>
Binary file added spec/ttml2-CR-20210309.tar
Binary file not shown.
72 changes: 65 additions & 7 deletions spec/ttml2-changes.html
Original file line number Diff line number Diff line change
@@ -31,18 +31,43 @@ <h2 class="introductory" id="table-of-contents">Table of Contents</h2>
</a>
<ul class="toc">
<li class="tocline">
<a class="tocxref" href="#change-history-ttml2-1e-to-ttml2-2e"><span class="secno">1.1</span>TTML2 1e to TTML 2e</a>
<a class="tocxref" href="#change-history-ttml2-1e-to-ttml2-2e-cr1"><span class="secno">1.1</span>TTML2 1e to TTML 2e CR1</a>
<ul class="toc">
<li class="tocline">
<a class="tocxref" href="#2e-syntax-changes">
<a class="tocxref" href="#2e-cr1-syntax-changes">
<span class="secno">1.1.1</span>Syntax Changes
</a>
</li>
<li class="tocline">
<a class="tocxref" href="#2e-semantic-changes">
<a class="tocxref" href="#2e-cr1-semantic-changes">
<span class="secno">1.1.2</span>Semantic (Only) Changes
</a>
</li>
<li class="tocline">
<a class="tocxref" href="#2e-cr1-editorial-changes">
<span class="secno">1.1.3</span>Editorial Changes
</a>
</li>
</ul>
</li>
<li class="tocline">
<a class="tocxref" href="#change-history-ttml2-2e-cr1-to-ttml2-2e-cr2"><span class="secno">1.2</span>TTML2 2e CR1 to TTML 2e CR2</a>
<ul class="toc">
<li class="tocline">
<a class="tocxref" href="#2e-cr2-syntax-changes">
<span class="secno">1.2.1</span>Syntax Changes
</a>
</li>
<li class="tocline">
<a class="tocxref" href="#2e-cr2-semantic-changes">
<span class="secno">1.2.2</span>Semantic (Only) Changes
</a>
</li>
<li class="tocline">
<a class="tocxref" href="#2e-cr2-editorial-changes">
<span class="secno">1.2.3</span>Editorial Changes
</a>
</li>
</ul>
</li>
</ul>
@@ -57,13 +82,13 @@ <h2><a id="change-history"></a>1 Change History (Non-Normative)</h2>
and further ordered by where they occur within the specification document.</p>

<div class="div2">
<h3><a id="change-history-ttml2-1e-to-ttml2-2e"></a>1.1 Technical Changes from
<h3><a id="change-history-ttml2-1e-to-ttml2-2e-cr1"></a>1.1 Technical Changes from
<a href="https://www.w3.org/TR/2018/REC-ttml2-20181108/">TTML2 First Edition</a> to
<a href="https://w3c.github.io/ttml2/index.html">TTML2 Second Edition (Editor's Draft)</a></h3>
<a href="https://www.w3.org/TR/2020/CR-ttml2-20200128/">TTML2 Second Edition 1st Candidate Recommendation (CR1)</a></h3>
<div class="exampleInner">
<pre>

<span class="strong" id="2e-syntax-changes">Syntax Changes</span>
<span class="strong" id="2e-cr1-syntax-changes">Syntax Changes</span>

* Improve non-negative-real interoperability (<a href="https://github.com/w3c/ttml2/pull/944">w3c/ttml2#944</a>).
* Remove xml:base and @condition from chunk (<a href="https://github.com/w3c/ttml2/pull/962">w3c/ttml2#962</a>).
@@ -79,7 +104,7 @@ <h3><a id="change-history-ttml2-1e-to-ttml2-2e"></a>1.1 Technical Changes from
* Add 'ignore' value to ttp:profile's @combine attribute, make default (<a href="https://github.com/w3c/ttml2/pull/1152">w3c/ttml2#1152</a>).
* Update content models w.r.t. permissible styling attributes (<a href="https://github.com/w3c/ttml2/pull/1157">w3c/ttml2#1157</a>).

<span class="strong" id="2e-semantic-changes">Semantic (Only) Changes</span>
<span class="strong" id="2e-cr1-semantic-changes">Semantic (Only) Changes</span>

* Define xlink:{type,actuate} semantics (<a href="https://github.com/w3c/ttml2/pull/1050">w3c/ttml2#1050</a>).
* Ignore text children of ruby container spans (<a href="https://github.com/w3c/ttml2/pull/1077">w3c/ttml2#1077</a>).
@@ -96,6 +121,39 @@ <h3><a id="change-history-ttml2-1e-to-ttml2-2e"></a>1.1 Technical Changes from
* Disallow fragment referencing nested profile (<a href="https://github.com/w3c/ttml2/pull/1165">w3c/ttml2#1165</a>).
* When speaking text, imply audio or audio source (<a href="https://github.com/w3c/ttml2/pull/1167">w3c/ttml2#1167</a>).

<span class="strong" id="2e-cr1-editorial-changes">Editorial Changes</span>

<i>Not Listed</i>

</pre>
</div> <!-- exampleInner -->
</div> <!-- div2 -->

<div class="div2">
<h3><a id="change-history-ttml2-2e-cr1-to-ttml2-2e-cr2"></a>1.2 Technical Changes from
<a href="https://www.w3.org/TR/2020/CR-ttml2-20200128/">TTML2 Second Edition 1st Candidate Recommendation (CR1)</a> to
<a href="https://www.w3.org/TR/2021/CR-ttml2-20210302/">TTML2 Second Edition 2nd Candidate Recommendation (CR2)</a></h3>
<div class="exampleInner">
<pre>

<span class="strong" id="2e-cr2-syntax-changes">Syntax Changes</span>

<i>None</i>

<span class="strong" id="2e-cr2-semantic-changes">Semantic (Only) Changes</span>

<i>None</i>

<span class="strong" id="2e-cr2-editorial-changes">Editorial Changes</span>

* Privacy considerations for font fingerprinting (<a href="https://github.com/w3c/ttml2/pull/1202">w3c/ttml2/#1202</a>).
* Privacy considerations for font fingerprinting (<a href="https://github.com/w3c/ttml2/pull/1203">w3c/ttml2/#1203</a>).
* Fix typo (<a href="https://github.com/w3c/ttml2/pull/1206">w3c/ttml2/#1206</a>).
* Add positioning examples (<a href="https://github.com/w3c/ttml2/pull/1207">w3c/ttml2/#1207</a>).
* Fix link (<a href="https://github.com/w3c/ttml2/pull/1209">w3c/ttml2/#1209</a>).
* Clarify application of font properties to tt:p element (<a href="https://github.com/w3c/ttml2/pull/1216">w3c/ttml2/#1216</a>).
* Fix link (<a href="https://github.com/w3c/ttml2/pull/1221">w3c/ttml2/#1221</a>).

</pre>
</div> <!-- exampleInner -->
</div> <!-- div2 -->
15 changes: 12 additions & 3 deletions spec/ttml2.xml
Original file line number Diff line number Diff line change
@@ -5,8 +5,11 @@
%entities;
<!ENTITY status SYSTEM "status.xml">
<!ENTITY title "&title;">
<!ENTITY prevloc "https://www.w3.org/TR/2018/REC-ttml2-20181108/">
<!ENTITY prevloc "https://www.w3.org/TR/2020/CR-ttml2-20200128/">
<!ENTITY latestedloc "https://w3c.github.io/ttml2/index.html">
<!ENTITY implreport "https://www.w3.org/wiki/TimedText/TTML2SecondEditionImplementationReport">
<!ENTITY ghrepo "w3c/ttml2">
<!ENTITY ghbranch "main">
<!ENTITY versionOfTT "2">
<!ENTITY tbd "<phrase role=&apos;tbd&apos;>To Be Defined</phrase>">
<!ENTITY sp "&#x0020;">
@@ -72,6 +75,12 @@
<loc href="&latestedloc;">&latestedloc;</loc>
</latestedloc>
-->
<implreploc>
<loc href="&implreport;">&implreport;</loc>
</implreploc>
<ghrepoloc>
<ghloc repo="&ghrepo;" branch="&ghbranch;" />
</ghrepoloc>
<latestloc>
<loc href="&latest;">&latest;</loc>
</latestloc>
@@ -88,7 +97,7 @@
<name>Glenn Adams</name>
<affiliation>Invited Expert</affiliation>
</author>
<author>
<author w3c-uid="36324">
<name>Cyril Concolato</name>
<affiliation>Netflix</affiliation>
</author>
@@ -98,7 +107,7 @@
<name>Glenn Adams</name>
<affiliation>Invited Expert</affiliation>
</author>
<author>
<author w3c-uid="36324">
<name>Cyril Concolato</name>
<affiliation>Netflix</affiliation>
</author>
38 changes: 37 additions & 1 deletion spec/xmlspec-ttml2.dtd
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ PURPOSE:
<!-- parameter entity overrides -->
<!ENTITY % header.mdl
"title, subtitle?, version?, w3c-designation, w3c-doctype,
pubdate, notice*, publoc, altlocs?, latestedloc?, latestloc?, latestrec?, prevlocs?,
pubdate, notice*, publoc, altlocs?, latestedloc?, implreploc?, ghrepoloc?, latestloc?, latestrec?, prevlocs?,
authlist+, errataloc?, preverrataloc?,
translationloc?, copyright?,
((status, abstract) | (abstract, status)), pubstmt?,
@@ -85,6 +85,42 @@ PURPOSE:
<!ATTLIST latestedloc %common.att;>
]]>

<!-- new elements -->
<!ENTITY % implreploc.element "INCLUDE">
<![%implreploc.element;[
<!ELEMENT implreploc (loc+)>
]]>
<!ENTITY % implreploc.attlist "INCLUDE">
<![%implreploc.attlist;[
<!ATTLIST implreploc %common.att;>
]]>

<!ENTITY % ghloc-req.att
'repo CDATA #REQUIRED
branch CDATA #REQUIRED '>
<!ENTITY % ghloc.element "INCLUDE">
<![%ghloc.element;[
<!ELEMENT ghloc (#PCDATA|phrase)*>
]]>
<!ENTITY % ghloc.attlist "INCLUDE">
<![%ghloc.attlist;[
<!ATTLIST ghloc
%common.att;
%simple-xlink.att;
%ghloc-req.att;
%user-replace.att;>
]]>

<!-- new elements -->
<!ENTITY % ghrepoloc.element "INCLUDE">
<![%ghrepoloc.element;[
<!ELEMENT ghrepoloc (ghloc+)>
]]>
<!ENTITY % ghrepoloc.attlist "INCLUDE">
<![%ghrepoloc.attlist;[
<!ATTLIST ghrepoloc %common.att;>
]]>

<!ENTITY % latestrec.element "INCLUDE">
<![%latestrec.element;[
<!ELEMENT latestrec (loc+)>
50 changes: 42 additions & 8 deletions spec/xmlspec-ttml2.xsl
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@
</dl>
</div>
</xsl:if>
<p role="navigation" id="back-to-top"><a href="#toc"><abbr title="Back to top">↑</abbr></a></p>
<p role="navigation" id="back-to-top"><a href="#title"><abbr title="Back to top">↑</abbr></a></p>
<script src="https://www.w3.org/scripts/TR/2016/fixup.js"></script>
</body>
</html>
@@ -477,13 +477,7 @@ width: 100%;
</p>
</xsl:if>
<xsl:text>&#10;</xsl:text>
<h1>
<xsl:call-template name="anchor">
<xsl:with-param name="node" select="title[1]"/>
<xsl:with-param name="conditional" select="0"/>
<xsl:with-param name="default.id" select="'title'"/>
</xsl:call-template>

<h1 id="title">
<xsl:apply-templates select="title"/>
<xsl:if test="version">
<xsl:text> </xsl:text>
@@ -532,7 +526,9 @@ width: 100%;
<xsl:apply-templates select="latestloc"/>
<xsl:apply-templates select="latestrec"/>
<xsl:apply-templates select="prevlocs"/>
<xsl:apply-templates select="implreploc"/>
<xsl:apply-templates select="authlist"/>
<xsl:apply-templates select="ghrepoloc"/>
</dl>

<!-- output the errataloc and altlocs -->
@@ -612,6 +608,44 @@ width: 100%;
</xsl:choose>
</xsl:template>

<!-- implreploc: implementation report for this spec -->
<!-- called in a <dl> context from header -->
<xsl:template match="implreploc">
<xsl:choose>
<xsl:when test="count(loc) &gt; 1">
<xsl:for-each select="loc">
<dt>
<xsl:apply-templates select="node()"/>
</dt>
<dd>
<a href="{@href}">
<xsl:value-of select="@href"/>
</a>
</dd>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<dt>Implementation report:</dt>
<dd>
<xsl:apply-templates/>
</dd>
</xsl:otherwise>
</xsl:choose>
</xsl:template>

<!-- ghrepoloc: participate section -->
<!-- called in a <dl> content from header -->
<xsl:template match="ghrepoloc">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="ghloc">
<dt>Participate:</dt>
<dd><a href="https://github.com/{@repo}/">GitHub <xsl:value-of select="@repo"/></a></dd>
<dd><a href="https://github.com/{@repo}/issues/">File a bug</a></dd>
<dd><a href="https://github.com/{@repo}/commits/{@branch}">Commit history</a></dd>
<dd><a href="https://github.com/{@repo}/pulls/">Pull requests</a></dd>
</xsl:template>

<!-- latestrec: latest location for this spec -->
<!-- called in a <dl> context from header -->
<xsl:template match="latestrec">

0 comments on commit d89461f

Please sign in to comment.