(1) remove references to #metadata-foreign and #overflow-scroll features in profile definitions; (2) fix XSL-FO and SMIL clause references; (3) add '(Second Edition)' to title; (4) fix TTML generator XSL to reference correct CSS style sheet for editor drafts
authorGlenn Adams <glenn@skynav.com>
Wed, 07 Mar 2012 22:48:01 -0700
changeset 228d5caeadc62e3
parent 227 5b9abdec7634
child 229 c387b99f17e0
(1) remove references to #metadata-foreign and #overflow-scroll features in profile definitions; (2) fix XSL-FO and SMIL clause references; (3) add '(Second Edition)' to title; (4) fix TTML generator XSL to reference correct CSS style sheet for editor drafts
ttml10/spec/entities.dtd
ttml10/spec/profiles/dfxp-full.xml
ttml10/spec/profiles/dfxp-presentation.xml
ttml10/spec/profiles/dfxp-transformation.xml
ttml10/spec/ttaf1-dfxp.html
ttml10/spec/ttaf1-dfxp.xml
ttml10/spec/xmlspec.xsl
     1.1 --- a/ttml10/spec/entities.dtd	Thu Mar 01 01:47:03 2012 -0700
     1.2 +++ b/ttml10/spec/entities.dtd	Wed Mar 07 22:48:01 2012 -0700
     1.3 @@ -6,7 +6,7 @@
     1.4  %sub.entities;
     1.5  
     1.6  <!-- Titles -->
     1.7 -<!ENTITY title "Timed Text Markup Language (TTML) 1.0">
     1.8 +<!ENTITY title "Timed Text Markup Language (TTML) 1.0 (Second Edition)" >
     1.9  
    1.10  <!-- XML Namespaces used in the drafts -->
    1.11  <!ENTITY nsuri "http://www.w3.org/ns/ttml" >
     2.1 --- a/ttml10/spec/profiles/dfxp-full.xml	Thu Mar 01 01:47:03 2012 -0700
     2.2 +++ b/ttml10/spec/profiles/dfxp-full.xml	Wed Mar 07 22:48:01 2012 -0700
     2.3 @@ -46,6 +46,7 @@
     2.4      <feature value="required">#layout</feature>
     2.5      <feature value="required">#length-cell</feature>
     2.6      <feature value="required">#length-em</feature>
     2.7 +    <feature value="required">#length-integer</feature>
     2.8      <feature value="required">#length-negative</feature>
     2.9      <feature value="required">#length-percentage</feature>
    2.10      <feature value="required">#length-pixel</feature>
    2.11 @@ -57,13 +58,11 @@
    2.12      <feature value="required">#markerMode-continuous</feature>
    2.13      <feature value="required">#markerMode-discontinuous</feature>
    2.14      <feature value="required">#markerMode</feature>
    2.15 -    <feature value="required">#metadata-foreign</feature>
    2.16      <feature value="required">#metadata</feature>
    2.17      <feature value="required">#nested-div</feature>
    2.18      <feature value="required">#nested-span</feature>
    2.19      <feature value="required">#opacity</feature>
    2.20      <feature value="required">#origin</feature>
    2.21 -    <feature value="required">#overflow-scroll</feature>
    2.22      <feature value="required">#overflow-visible</feature>
    2.23      <feature value="required">#overflow</feature>
    2.24      <feature value="required">#padding-1</feature>
     3.1 --- a/ttml10/spec/profiles/dfxp-presentation.xml	Thu Mar 01 01:47:03 2012 -0700
     3.2 +++ b/ttml10/spec/profiles/dfxp-presentation.xml	Wed Mar 07 22:48:01 2012 -0700
     3.3 @@ -52,6 +52,7 @@
     3.4      <feature value="optional">#layout</feature>
     3.5      <feature value="optional">#length-cell</feature>
     3.6      <feature value="optional">#length-em</feature>
     3.7 +    <feature value="optional">#length-integer</feature>
     3.8      <feature value="optional">#length-negative</feature>
     3.9      <feature value="optional">#length-percentage</feature>
    3.10      <feature value="optional">#length-pixel</feature>
    3.11 @@ -63,13 +64,11 @@
    3.12      <feature value="optional">#markerMode-continuous</feature>
    3.13      <feature value="optional">#markerMode-discontinuous</feature>
    3.14      <feature value="optional">#markerMode</feature>
    3.15 -    <feature value="optional">#metadata-foreign</feature>
    3.16      <feature value="optional">#metadata</feature>
    3.17      <feature value="optional">#nested-div</feature>
    3.18      <feature value="optional">#nested-span</feature>
    3.19      <feature value="optional">#opacity</feature>
    3.20      <feature value="optional">#origin</feature>
    3.21 -    <feature value="optional">#overflow-scroll</feature>
    3.22      <feature value="optional">#overflow-visible</feature>
    3.23      <feature value="optional">#overflow</feature>
    3.24      <feature value="optional">#padding-1</feature>
     4.1 --- a/ttml10/spec/profiles/dfxp-transformation.xml	Thu Mar 01 01:47:03 2012 -0700
     4.2 +++ b/ttml10/spec/profiles/dfxp-transformation.xml	Wed Mar 07 22:48:01 2012 -0700
     4.3 @@ -52,6 +52,7 @@
     4.4      <feature value="optional">#layout</feature>
     4.5      <feature value="optional">#length-cell</feature>
     4.6      <feature value="optional">#length-em</feature>
     4.7 +    <feature value="optional">#length-integer</feature>
     4.8      <feature value="optional">#length-negative</feature>
     4.9      <feature value="optional">#length-percentage</feature>
    4.10      <feature value="optional">#length-pixel</feature>
    4.11 @@ -63,13 +64,11 @@
    4.12      <feature value="optional">#markerMode-continuous</feature>
    4.13      <feature value="optional">#markerMode-discontinuous</feature>
    4.14      <feature value="optional">#markerMode</feature>
    4.15 -    <feature value="optional">#metadata-foreign</feature>
    4.16      <feature value="optional">#metadata</feature>
    4.17      <feature value="optional">#nested-div</feature>
    4.18      <feature value="optional">#nested-span</feature>
    4.19      <feature value="optional">#opacity</feature>
    4.20      <feature value="optional">#origin</feature>
    4.21 -    <feature value="optional">#overflow-scroll</feature>
    4.22      <feature value="optional">#overflow-visible</feature>
    4.23      <feature value="optional">#overflow</feature>
    4.24      <feature value="optional">#padding-1</feature>
     5.1 --- a/ttml10/spec/ttaf1-dfxp.html	Thu Mar 01 01:47:03 2012 -0700
     5.2 +++ b/ttml10/spec/ttaf1-dfxp.html	Wed Mar 07 22:48:01 2012 -0700
     5.3 @@ -1,7 +1,7 @@
     5.4  <?xml version="1.0" encoding="utf-8"?>
     5.5  <!DOCTYPE html
     5.6    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     5.7 -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us"><head><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8"/><title>Timed Text Markup Language (TTML) 1.0 -- (Editors' copy)</title><style type="text/css">
     5.8 +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us"><head><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8"/><title>Timed Text Markup Language (TTML) 1.0 (Second Edition) -- (Editors' copy)</title><style type="text/css">
     5.9  code           { font-family: monospace; }
    5.10  
    5.11  div.constraint,
    5.12 @@ -70,8 +70,8 @@
    5.13  .diff-del  { color: red; text-decoration: line-through; background-color: #99FF99; }
    5.14  .diff-chg  { background-color: #99FF99; }
    5.15  q.diff-off  {}
    5.16 -</style><link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/base.css"/></head><body>Last Modified: $Date$<div id="revisions"/><div class="head">
    5.17 -<h1><a name="title" id="title"/>Timed Text Markup Language (TTML) 1.0</h1>
    5.18 +</style><link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/W3C-ED.css"/></head><body>Last Modified: $Date$<div id="revisions"/><div class="head">
    5.19 +<h1><a name="title" id="title"/>Timed Text Markup Language (TTML) 1.0 (Second Edition)</h1>
    5.20  <h2><a name="w3c-doctype" id="w3c-doctype"/>Editors' copy $Date$ @@ @@@@ @@@@</h2><dl><dt>This version:</dt><dd>
    5.21  <a href="ttaf1-dfxp.html">ttaf1-dfxp.html</a>
    5.22  </dd><dt>Latest version:</dt><dd><a href="http://dvcs.w3.org/hg/ttml/raw-file/tip/ttml10/spec/ttaf1-dfxp.html?content-type=text/html;charset=utf-8">http://dvcs.w3.org/hg/ttml/raw-file/tip/ttml10/spec/ttaf1-dfxp.html?content-type=text/html;charset=utf-8</a></dd><dt>Previous version:</dt><dd>
    5.23 @@ -3052,7 +3052,7 @@
    5.24  rendered over area(s) generated by lexically prior elements, where lexical
    5.25  order is defined as the postorder traversal of a document
    5.26  instance.</p><p>The semantics of the value <code>auto</code> are those defined by
    5.27 -<a href="#xsl11">[XSL 1.1]</a>, § 7.28.9, where the <code>tt</code> element
    5.28 +<a href="#xsl11">[XSL 1.1]</a>, § 7.30.18, where the <code>tt</code> element
    5.29  is considered to establish the root stacking context.</p><p>If a specified value of this attribute is not supported,
    5.30  then a presentation processor must interpret the attribute as if the
    5.31  value <code>auto</code> were specified.</p><p>The <code>tts:zIndex</code> style is illustrated by the following example.</p><table summary="HTML Table" id="style-attribute-zIndex-example-1" class="example"><caption>Example Fragment – Z Index</caption><tbody><tr><td>
    5.32 @@ -4243,7 +4243,7 @@
    5.33  element instance.</p><p>Each time container is considered to constitute an independent time base, i.e.,
    5.34  time coordinate system.</p><p>If a <code>timeContainer</code> attribute is not specified on an element that
    5.35  has time container semantics, then <code>par</code> time container semantics must apply.</p><p>Time container semantics applies only to the following element types:</p><ul><li><p><a href="#document-structure-vocabulary-body"><code>body</code></a></p></li><li><p><a href="#content-vocabulary-div"><code>div</code></a></p></li><li><p><a href="#content-vocabulary-p"><code>p</code></a></p></li><li><p><a href="#layout-vocabulary-region"><code>region</code></a></p></li><li><p><a href="#content-vocabulary-span"><code>span</code></a></p></li></ul><p>The semantics of parallel and sequential time
    5.36 -containment are those defined by <a href="#smil21">[SMIL 2.1]</a>, § 10.3.2,
    5.37 +containment are those defined by <a href="#smil21">[SMIL 2.1]</a>, § 10.4.2,
    5.38  while taking into account any overriding semantics defined by this specification.</p></div></div><div class="div2">
    5.39  <h3><a name="timing-time-value-expressions" id="timing-time-value-expressions"/>10.3 Time Value Expressions</h3><p>Timing attribute values include the use of the following expressions:</p><ul><li><p><a href="#timing-value-timeExpression"><b>10.3.1 &lt;timeExpression&gt;</b></a></p></li></ul><div class="div3">
    5.40  <h4><a name="timing-value-timeExpression" id="timing-value-timeExpression"/>10.3.1 &lt;timeExpression&gt;</h4><p>A &lt;timeExpression&gt; is used to specify a coordinate along
    5.41 @@ -4411,7 +4411,7 @@
    5.42  create an effect of moving the region, which may be desirable so as
    5.43  to avoid obscuring characters in an underlying video with captions.</p></div><div class="note"><p class="prefix"><b>Note:</b></p><p>The semantics of the <code>set</code> element
    5.44  are based upon that defined by <a href="#smil21">[SMIL 2.1]</a>,
    5.45 -§ 3.5.2.</p></div></div></div><div class="div2">
    5.46 +§ 3.6.2.</p></div></div></div><div class="div2">
    5.47  <h3><a name="animation-attribute-vocabulary" id="animation-attribute-vocabulary"/>11.2 Animation Attribute Vocabulary</h3><p>No animation related attribute vocabulary is defined for use in the
    5.48  core vocabulary catalog.</p></div></div><div class="div1">
    5.49  <h2><a name="metadata" id="metadata"/>12 Metadata</h2><p>This section specifies the <em>metadata</em> matter of the core
    5.50 @@ -7815,6 +7815,7 @@
    5.51      &lt;feature value="optional"&gt;#layout&lt;/feature&gt;
    5.52      &lt;feature value="optional"&gt;#length-cell&lt;/feature&gt;
    5.53      &lt;feature value="optional"&gt;#length-em&lt;/feature&gt;
    5.54 +    &lt;feature value="optional"&gt;#length-integer&lt;/feature&gt;
    5.55      &lt;feature value="optional"&gt;#length-negative&lt;/feature&gt;
    5.56      &lt;feature value="optional"&gt;#length-percentage&lt;/feature&gt;
    5.57      &lt;feature value="optional"&gt;#length-pixel&lt;/feature&gt;
    5.58 @@ -7826,13 +7827,11 @@
    5.59      &lt;feature value="optional"&gt;#markerMode-continuous&lt;/feature&gt;
    5.60      &lt;feature value="optional"&gt;#markerMode-discontinuous&lt;/feature&gt;
    5.61      &lt;feature value="optional"&gt;#markerMode&lt;/feature&gt;
    5.62 -    &lt;feature value="optional"&gt;#metadata-foreign&lt;/feature&gt;
    5.63      &lt;feature value="optional"&gt;#metadata&lt;/feature&gt;
    5.64      &lt;feature value="optional"&gt;#nested-div&lt;/feature&gt;
    5.65      &lt;feature value="optional"&gt;#nested-span&lt;/feature&gt;
    5.66      &lt;feature value="optional"&gt;#opacity&lt;/feature&gt;
    5.67      &lt;feature value="optional"&gt;#origin&lt;/feature&gt;
    5.68 -    &lt;feature value="optional"&gt;#overflow-scroll&lt;/feature&gt;
    5.69      &lt;feature value="optional"&gt;#overflow-visible&lt;/feature&gt;
    5.70      &lt;feature value="optional"&gt;#overflow&lt;/feature&gt;
    5.71      &lt;feature value="optional"&gt;#padding-1&lt;/feature&gt;
    5.72 @@ -7945,6 +7944,7 @@
    5.73      &lt;feature value="optional"&gt;#layout&lt;/feature&gt;
    5.74      &lt;feature value="optional"&gt;#length-cell&lt;/feature&gt;
    5.75      &lt;feature value="optional"&gt;#length-em&lt;/feature&gt;
    5.76 +    &lt;feature value="optional"&gt;#length-integer&lt;/feature&gt;
    5.77      &lt;feature value="optional"&gt;#length-negative&lt;/feature&gt;
    5.78      &lt;feature value="optional"&gt;#length-percentage&lt;/feature&gt;
    5.79      &lt;feature value="optional"&gt;#length-pixel&lt;/feature&gt;
    5.80 @@ -7956,13 +7956,11 @@
    5.81      &lt;feature value="optional"&gt;#markerMode-continuous&lt;/feature&gt;
    5.82      &lt;feature value="optional"&gt;#markerMode-discontinuous&lt;/feature&gt;
    5.83      &lt;feature value="optional"&gt;#markerMode&lt;/feature&gt;
    5.84 -    &lt;feature value="optional"&gt;#metadata-foreign&lt;/feature&gt;
    5.85      &lt;feature value="optional"&gt;#metadata&lt;/feature&gt;
    5.86      &lt;feature value="optional"&gt;#nested-div&lt;/feature&gt;
    5.87      &lt;feature value="optional"&gt;#nested-span&lt;/feature&gt;
    5.88      &lt;feature value="optional"&gt;#opacity&lt;/feature&gt;
    5.89      &lt;feature value="optional"&gt;#origin&lt;/feature&gt;
    5.90 -    &lt;feature value="optional"&gt;#overflow-scroll&lt;/feature&gt;
    5.91      &lt;feature value="optional"&gt;#overflow-visible&lt;/feature&gt;
    5.92      &lt;feature value="optional"&gt;#overflow&lt;/feature&gt;
    5.93      &lt;feature value="optional"&gt;#padding-1&lt;/feature&gt;
    5.94 @@ -8069,6 +8067,7 @@
    5.95      &lt;feature value="required"&gt;#layout&lt;/feature&gt;
    5.96      &lt;feature value="required"&gt;#length-cell&lt;/feature&gt;
    5.97      &lt;feature value="required"&gt;#length-em&lt;/feature&gt;
    5.98 +    &lt;feature value="required"&gt;#length-integer&lt;/feature&gt;
    5.99      &lt;feature value="required"&gt;#length-negative&lt;/feature&gt;
   5.100      &lt;feature value="required"&gt;#length-percentage&lt;/feature&gt;
   5.101      &lt;feature value="required"&gt;#length-pixel&lt;/feature&gt;
   5.102 @@ -8080,13 +8079,11 @@
   5.103      &lt;feature value="required"&gt;#markerMode-continuous&lt;/feature&gt;
   5.104      &lt;feature value="required"&gt;#markerMode-discontinuous&lt;/feature&gt;
   5.105      &lt;feature value="required"&gt;#markerMode&lt;/feature&gt;
   5.106 -    &lt;feature value="required"&gt;#metadata-foreign&lt;/feature&gt;
   5.107      &lt;feature value="required"&gt;#metadata&lt;/feature&gt;
   5.108      &lt;feature value="required"&gt;#nested-div&lt;/feature&gt;
   5.109      &lt;feature value="required"&gt;#nested-span&lt;/feature&gt;
   5.110      &lt;feature value="required"&gt;#opacity&lt;/feature&gt;
   5.111      &lt;feature value="required"&gt;#origin&lt;/feature&gt;
   5.112 -    &lt;feature value="required"&gt;#overflow-scroll&lt;/feature&gt;
   5.113      &lt;feature value="required"&gt;#overflow-visible&lt;/feature&gt;
   5.114      &lt;feature value="required"&gt;#overflow&lt;/feature&gt;
   5.115      &lt;feature value="required"&gt;#padding-1&lt;/feature&gt;
     6.1 --- a/ttml10/spec/ttaf1-dfxp.xml	Thu Mar 01 01:47:03 2012 -0700
     6.2 +++ b/ttml10/spec/ttaf1-dfxp.xml	Wed Mar 07 22:48:01 2012 -0700
     6.3 @@ -5732,7 +5732,7 @@
     6.4  order is defined as the postorder traversal of a document
     6.5  instance.</p>
     6.6  <p>The semantics of the value <code>auto</code> are those defined by
     6.7 -<bibref ref="xsl11"/>, &sect; 7.28.9, where the <el>tt</el> element
     6.8 +<bibref ref="xsl11"/>, &sect; 7.30.18, where the <el>tt</el> element
     6.9  is considered to establish the root stacking context.</p>
    6.10  <p>If a specified value of this attribute is not supported,
    6.11  then a presentation processor must interpret the attribute as if the
    6.12 @@ -7570,7 +7570,7 @@
    6.13  <item><p><loc href="#content-vocabulary-span"><el>span</el></loc></p></item>
    6.14  </ulist>
    6.15  <p>The semantics of parallel and sequential time
    6.16 -containment are those defined by <bibref ref="smil21"/>, &sect; 10.3.2,
    6.17 +containment are those defined by <bibref ref="smil21"/>, &sect; 10.4.2,
    6.18  while taking into account any overriding semantics defined by this specification.</p>
    6.19  </div3>
    6.20  </div2>
    6.21 @@ -7847,7 +7847,7 @@
    6.22  <note role="derivation">
    6.23  <p>The semantics of the <el>set</el> element
    6.24  are based upon that defined by <bibref ref="smil21"/>,
    6.25 -&sect; 3.5.2.</p>
    6.26 +&sect; 3.6.2.</p>
    6.27  </note>
    6.28  </div3>
    6.29  </div2>
     7.1 --- a/ttml10/spec/xmlspec.xsl	Thu Mar 01 01:47:03 2012 -0700
     7.2 +++ b/ttml10/spec/xmlspec.xsl	Wed Mar 07 22:48:01 2012 -0700
     7.3 @@ -2681,11 +2681,11 @@
     7.4        <xsl:attribute name="href">
     7.5          <xsl:text>http://www.w3.org/StyleSheets/TR/</xsl:text>
     7.6          <xsl:choose>
     7.7 -          <xsl:when test="/spec/@role='editors-copy'">base</xsl:when>
     7.8 +          <xsl:when test="/spec/@role='editors-copy'">W3C-ED</xsl:when>
     7.9            <xsl:otherwise>
    7.10              <xsl:choose>
    7.11  	      <!-- Editor's review drafts are a special case. -->
    7.12 -              <xsl:when test="/spec/@w3c-doctype='review'          or contains(/spec/header/w3c-doctype, 'Editor')">base</xsl:when>
    7.13 +              <xsl:when test="/spec/@w3c-doctype='review'          or contains(/spec/header/w3c-doctype, 'Editor')">W3C-ED</xsl:when>
    7.14                <xsl:when test="/spec/@w3c-doctype='wd'">W3C-WD</xsl:when>
    7.15                <xsl:when test="/spec/@w3c-doctype='rec'">W3C-REC</xsl:when>
    7.16                <xsl:when test="/spec/@w3c-doctype='pr'">W3C-PR</xsl:when>