--- a/ttml2/spec/ttml2.html Tue Sep 23 20:35:12 2014 -0600
+++ b/ttml2/spec/ttml2.html Tue Sep 23 20:35:48 2014 -0600
@@ -82,9 +82,9 @@
.obsoleted { background-color: #f26d7d }
.reqattr { font-weight: bold }
.optattr { font-style: italic }
-</style><link rel="stylesheet" type="text/css" href="https://www.w3.org/StyleSheets/TR/W3C-ED.css"></head><body>Last Modified: $Date: 2014/09/23 18:57:41 $<div id="revisions"></div><div class="head">
+</style><link rel="stylesheet" type="text/css" href="https://www.w3.org/StyleSheets/TR/W3C-ED.css"></head><body>Last Modified: $Date: 2014/09/24 02:35:12 $<div id="revisions"></div><div class="head">
<h1><a id="title"></a>Timed Text Markup Language 2 (TTML2)</h1>
-<h2><a id="w3c-doctype"></a>Editors' copy $Date: 2014/09/23 18:57:41 $ @@ @@@@ @@@@</h2><dl><dt>This version:</dt><dd>
+<h2><a id="w3c-doctype"></a>Editors' copy $Date: 2014/09/24 02:35:12 $ @@ @@@@ @@@@</h2><dl><dt>This version:</dt><dd>
<a href="ttml2.html">ttml2.html</a>
</dd><dt>Latest version:</dt><dd><a href="https://dvcs.w3.org/hg/ttml/raw-file/default/ttml2/spec/ttml2.html?content-type=text/html;charset=utf-8">https://dvcs.w3.org/hg/ttml/raw-file/default/ttml2/spec/ttml2.html?content-type=text/html;charset=utf-8</a></dd><dt>Previous version:</dt><dd>
<a href="http://www.w3.org/TR/2010/REC-ttaf1-dfxp-20101118/">http://www.w3.org/TR/2010/REC-ttaf1-dfxp-20101118/</a>
@@ -1802,6 +1802,7 @@
<div class="exampleInner"><pre>
ttp:cellResolution
: columns rows // <em>columns</em> != 0; <em>rows</em> != 0
+
columns | rows
: <a href="#style-value-digit"><digit></a>+
</pre></div>
@@ -1862,10 +1863,13 @@
: designators
| "all(" designators ")"
| "any(" designators ")"
+
designators
: designator (lwsp designator)*
+
designator
: xsd:anyURI
+
lwsp
: ( ' ' | '\t' | '\n' | '\r' )+
</pre></div>
@@ -1972,6 +1976,7 @@
<div class="exampleInner"><pre>
ttp:frameRateMultiplier
: numerator denominator // <em>numerator</em> != 0; <em>denominator</em> != 0
+
numerator | denominator
: <a href="#style-value-digit"><digit></a>+
</pre></div>
@@ -2112,6 +2117,7 @@
<div class="exampleInner"><pre>
ttp:mediaOffset
: sign? <a href="#timing-value-timeExpression"><timeExpression></a> // restricted to <em>offset-time</em> form
+
sign
: "+" | "-"
</pre></div>
@@ -2158,6 +2164,7 @@
<div class="exampleInner"><pre>
ttp:pixelAspectRatio
: width height // <em>width</em> != 0; <em>height</em> != 0
+
width | height
: <a href="#style-value-digit"><digit></a>+
</pre></div>
@@ -2180,6 +2187,7 @@
<div class="exampleInner"><pre>
<span class="deprecated">ttp:profile</span>
: designator
+
designator
: xsd:anyURI
</pre></div>
@@ -2202,10 +2210,13 @@
: designators
| "all(" designators ")"
| "any(" designators ")"
+
designators
: designator (lwsp designator)*
+
designator
: xsd:anyURI
+
lwsp
: ( ' ' | '\t' | '\n' | '\r' )+
</pre></div>
@@ -4192,14 +4203,19 @@
| "rgb" "(" r-value "," g-value "," b-value ")"
| "rgba" "(" r-value "," g-value "," b-value "," a-value ")"
| <a href="#style-value-namedColor"><namedColor></a>
+
rrggbb
: <a href="#style-value-hexDigit"><hexDigit></a>{6}
+
rrggbbaa
: <a href="#style-value-hexDigit"><hexDigit></a>{8}
+
r-value | g-value | b-value | a-value
: component-value
+
component-value
: non-negative-integer // valid range: [0,255]
+
non-negative-integer
: <a href="#style-value-digit"><digit></a>+
</pre></div>
@@ -4231,29 +4247,39 @@
<familyName>
: unquoted-string
| quoted-string
+
unquoted-string
: identifier ( lwsp identifier )*
+
lwsp
: ( ' ' | '\t' | '\n' | '\r' )+
+
identifier
: [-]? identifier-start identifier-following*
+
identifier-start
: [_a-zA-Z]
| non-ascii-or-c1
| escape
+
identifier-following
: [_a-zA-Z0-9-]
| non-ascii-or-c1
| escape
+
non-ascii-or-c1
: [^\0-\237]
+
escape
: '\\' <em>char</em>
+
quoted-string
: double-quoted-string
| single-quoted-string
+
double-quoted-string
: '"' ( [^"\\] | escape )+ '"'
+
single-quoted-string
: "'" ( [^'\\] | escape )+ "'"
</pre></div>
@@ -4328,21 +4354,29 @@
<length>
: scalar
| percentage
+
scalar
: number units
+
percentage
: number "%"
+
sign
: "+" | "-"
+
number
: sign? non-negative-number
+
non-negative-number
: non-negative-integer
| non-negative-real
+
non-negative-integer
: <a href="#style-value-digit"><digit></a>+
+
non-negative-real
: <a href="#style-value-digit"><digit></a>* "." <a href="#style-value-digit"><digit></a>+
+
units
: "px"
| "em"
@@ -5504,24 +5538,33 @@
<timeExpression>
: clock-time
| offset-time
+
clock-time
: hours ":" minutes ":" seconds ( fraction | ":" frames ( "." sub-frames )? )?
+
offset-time
: time-count fraction? metric?
+
hours
: <a href="#style-value-digit"><digit></a> <a href="#style-value-digit"><digit></a>
| <a href="#style-value-digit"><digit></a> <a href="#style-value-digit"><digit></a> <a href="#style-value-digit"><digit></a>+
+
minutes | seconds
: <a href="#style-value-digit"><digit></a> <a href="#style-value-digit"><digit></a>
+
frames
: <a href="#style-value-digit"><digit></a> <a href="#style-value-digit"><digit></a>
| <a href="#style-value-digit"><digit></a> <a href="#style-value-digit"><digit></a> <a href="#style-value-digit"><digit></a>+
+
sub-frames
: <a href="#style-value-digit"><digit></a>+
+
fraction
: "." <a href="#style-value-digit"><digit></a>+
+
time-count
: <a href="#style-value-digit"><digit></a>+
+
metric
: "h" // hours
| "m" // minutes
@@ -5547,7 +5590,7 @@
interval [0…<em>S-1</em>], where <em>S</em> is the
sub-frame rate determined by the <code>ttp:subFrameRate</code> parameter as defined by <a href="#parameter-attribute-subFrameRate"><b>6.2.19 ttp:subFrameRate</b></a>.
It is considered an error if a <em>sub-frames</em> term is specified
-when the <code>clock</code> time base applies.</p><p>If a <timeExpression> is expressed in terms of a
+when the <code>clock</code> time base applies.</p><p>If a <timeExpression> is expressed in terms of an
<em>offset-time</em> and no <em>metric</em> is specified, then it is to be treated as
if a metric of <code>s</code> (seconds) were specified.</p></div></div><div class="div2">
<h3><a id="timing-time-intervals"></a>10.4 Time Intervals</h3><p>The semantics of time containment, durations, and intervals defined by
@@ -5821,18 +5864,24 @@
<div class="exampleInner"><pre>
<keySplines>
: control [ lwsp? ";" lwsp? control ]*
+
control
: x1 comma? y1 comma? x2 comma? y2
+
x1, x2, y1, y2
: coordinate
+
coordinate // 0 ≥ <em>value</em> ≥ 1
: whole
| whole "." fraction
| "." fraction
+
whole, fraction
: <a href="#style-value-digit"><digit></a>+
+
comma
: ","
+
lwsp
: ( ' ' | '\t' | '\n' | '\r' )+
</pre></div>
@@ -5844,12 +5893,15 @@
<div class="exampleInner"><pre>
<keyTimes>
: time [ lwsp? ";" lwsp? time ]*
+
time // 0 ≥ <em>value</em> ≥ 1
: whole
| whole "." fraction
| "." fraction
+
whole, fraction
: <a href="#style-value-digit"><digit></a>+
+
lwsp
: ( ' ' | '\t' | '\n' | '\r' )+
</pre></div>
@@ -5860,6 +5912,7 @@
<repeatCount>
: count
| "indefinite"
+
count:
: <a href="#style-value-digit"><digit></a>+ // <em>value</em> > 0
</pre></div>
@@ -6103,6 +6156,7 @@
<div class="exampleInner"><pre>
ttm:role
role ( <em>S</em> role )*
+
role
: "action"
| "caption"
@@ -6122,8 +6176,10 @@
| "title"
| "transcription"
| extension-role
+
extension-role
: "x-" token-char+
+
token-char
: { XML NameChar } // XML 1.1 Production [4a]
</pre></div>
@@ -6332,10 +6388,13 @@
form:</p><div class="exampleInner"><pre>
feature-designation
: feature-namespace designation
+
feature-namespace
: <em>TT Feature Namespace</em> // http://www.w3.org/ns/ttml/feature/
+
designation
: "#" token-char+
+
token-char
: { XML NameChar } // XML 1.1 Production [4a]
</pre></div><p>All values of <code>feature-designation</code> not defined by this specification are reserved
@@ -7305,11 +7364,14 @@
form:</p><div class="exampleInner"><pre>
extension-designation
: extension-namespace designation
+
extension-namespace
: <em>TT Extension Namespace</em> // http://www.w3.org/ns/ttml/extension/
| <em>Other Extension Namespace</em> // expressed as an absolute URI
+
designation
: "#" token-char+
+
token-char
: { XML NameChar } // XML 1.1 Production [4a]
</pre></div><p>If the extension namespace of an extension designation is the TT