Merge branch 'master' into issue-0330-deprecate-pixels-sans-extent

w3c · Jan 29, 2018 · b0eaf74 · b0eaf74
2 parents e1db003 + c129dc3
commit b0eaf74
Show file tree

Hide file tree

Showing 18 changed files with 621 additions and 710 deletions.
diff --git a/diffs b/diffs
diff --git a/spec/build.xml b/spec/build.xml
@@ -267,15 +267,15 @@
     </target>
 
     <target name="generate" description="Generate the specification without updating escaped entities."
-	    depends="generate-schema-archives,validate-tt-specs,html,kwexpand">
+	    depends="generate-schema-archives,validate,html,kwexpand">
     </target>
 
     <target name="sg" description="Shortened generation of the specification without updating changelog and acknowledgments sections, but without rebuilding escapes."
 	    depends="generate-schema-archives,validate-tt-specs-dont-build-escapes,html">
     </target>
 
     <target name="rg" description="Regenerate using shortened generation and expands keywords."
-            depends="sg, kwexpand">
+      depends="sg, kwexpand">
     </target>
 
     <target name="build" description="Build the specification for publication" depends="generate">
@@ -287,6 +287,8 @@
       <mkdir dir="${build.dir}/rnc"/>
       <mkdir dir="${build.dir}/xsd"/>
       <copy file="${html.dir}/${html.name}" tofile="${build.dir}/index.html"/>
+      <copy file="${html.dir}/ttml2-changes.html" tofile="${build.dir}/ttml2-changes.html"/>
+      <copy file="${html.dir}/ttml2-errata.html" tofile="${build.dir}/ttml2-errata.html"/>
       <copy todir="${build.dir}/images">
         <fileset dir="${basedir}/images" includes="*.png"/>
         <fileset dir="${basedir}/images" includes="*.svg"/>

diff --git a/spec/examples/ex2-roll-up.xml b/spec/examples/ex2-roll-up.xml
@@ -2,16 +2,19 @@
   xmlns:ttp="http://www.w3.org/ns/ttml#parameter" xmlns:tts="http://www.w3.org/ns/ttml#styling">
   <head>
     <layout>
-      <region xml:id="r1" tts:color="white" tts:origin="10c 4c" tts:extent="40c 2c"/>
+      <region xml:id="r1" tts:color="white" tts:origin="10c 4c" tts:extent="40c 2c"
+              tts:displayAlign="after"/>
     </layout>
   </head>
   <body>
     <div region="r1">
-      <p begin="0s" end="8s">Lorem ipsum dolor sit</p>
-      <p begin="4s" end="12s">Amet consectetur adipiscing elit</p>
-      <p begin="8s" end="18s">Sed do eiusmod tempor incididunt labore</p>
-      <p begin="14s" end="25s">et dolore magna aliqua</p>
-      <p begin="18s" end="29s">Ut enim ad minim veniam quis, nostrud</p>
+      <p>
+        <span begin="0s" end="8s">Lorem ipsum dolor sit</span>
+        <span begin="4s" end="12s"><br/>Amet consectetur adipiscing elit</span>
+        <span begin="8s" end="18s"><br/>Sed do eiusmod tempor incididunt labore</span>
+        <span begin="14s" end="25s"><br/>et dolore magna aliqua</span>
+        <span begin="18s" end="29s"><br/>Ut enim ad minim veniam quis, nostrud</span>
+      </p>
     </div>
   </body>
 </tt>
diff --git a/spec/profiles/ttml2-full.xml b/spec/profiles/ttml2-full.xml
@@ -119,6 +119,8 @@
     <feature value="required">#markerMode-continuous</feature>
     <feature value="required">#markerMode-discontinuous</feature>
     <feature value="required">#metadata</feature>
+    <feature value="required">#metadata-item</feature>
+    <feature value="required">#metadata-version-2</feature>
     <feature value="required">#nested-div</feature>
     <feature value="required">#nested-span</feature>
     <feature value="required">#opacity</feature>

diff --git a/spec/profiles/ttml2-presentation.xml b/spec/profiles/ttml2-presentation.xml
@@ -129,6 +129,8 @@
     <feature value="optional">#markerMode-continuous</feature>
     <feature value="optional">#markerMode-discontinuous</feature>
     <feature value="optional">#metadata</feature>
+    <feature value="optional">#metadata-item</feature>
+    <feature value="optional">#metadata-version-2</feature>
     <feature value="optional">#nested-div</feature>
     <feature value="optional">#nested-span</feature>
     <feature value="optional">#opacity</feature>

diff --git a/spec/profiles/ttml2-transformation.xml b/spec/profiles/ttml2-transformation.xml
@@ -129,6 +129,8 @@
     <feature value="optional">#markerMode-continuous</feature>
     <feature value="optional">#markerMode-discontinuous</feature>
     <feature value="optional">#metadata</feature>
+    <feature value="optional">#metadata-item</feature>
+    <feature value="optional">#metadata-version-2</feature>
     <feature value="optional">#nested-div</feature>
     <feature value="optional">#nested-span</feature>
     <feature value="optional">#opacity</feature>

diff --git a/spec/rnc/ttml2-datatypes.rnc b/spec/rnc/ttml2-datatypes.rnc
@@ -215,13 +215,6 @@ TTAF.MarkerMode.datatype =
 TTAF.Measure.datatype =
   string
 
-TTAF.MediaDuration.datatype =
-  TTAF.TimeDuration.datatype |
-  "indefinite"
-
-TTAF.MediaOffset.datatype =
-  string
-
 TTAF.MetadataAgentType.datatype =
   "person" |
   "character" |

diff --git a/spec/rnc/ttml2-isd.rnc b/spec/rnc/ttml2-isd.rnc
@@ -11,7 +11,6 @@ TTAF.isd.parameter.attrib.class &=
   TTAF.cellResolution.attrib,
   TTAF.frameRate.attrib,
   TTAF.frameRateMultiplier.attrib,
-  TTAF.mediaOffset.attrib,
   TTAF.pixelAspectRatio.attrib,
   TTAF.storageAspectRatio.attrib,
   TTAF.subFrameRate.attrib,

diff --git a/spec/rnc/ttml2-parameter-attribs.rnc b/spec/rnc/ttml2-parameter-attribs.rnc
@@ -28,10 +28,6 @@ TTAF.inferProcessorProfileSource.attrib
   = attribute ttp:inferProcessorProfileSource { TTAF.InferProcessorProfileSource.datatype }?
 TTAF.markerMode.attrib
   = attribute ttp:markerMode { TTAF.MarkerMode.datatype }?
-TTAF.mediaDuration.attrib
-  = attribute ttp:mediaDuration { TTAF.MediaDuration.datatype }?
-TTAF.mediaOffset.attrib
-  = attribute ttp:mediaOffset { TTAF.MediaOffset.datatype }?
 TTAF.permitFeatureNarrowing.attrib
   = attribute ttp:permitFeatureNarrowing { TTAF.PermitFeatureNarrowingOrWidening.datatype }?
 TTAF.permitFeatureWidening.attrib

diff --git a/spec/status.xml b/spec/status.xml
@@ -13,6 +13,10 @@ A cumulative summary of all changes applied to this version since the current
 (TTML1, 2nd Edition) Recommendation was published is available at
 <loc  href="ttml2-changes.html">Changes from TTML1 (2nd Ed.) to TTML2 Working Draft (Latest Revision)</loc>.
 An abbreviated list of changes affecting language syntax can be found at <specref ref="changes-from-ttml1-vocabulary"/>.</p>
+<!-- Placeholder for At Risk Status
+     The following items are slated to be marked at risk when publishing the first CR of TTML2
+     * tts:rubyAlign='withBase'
+-->
 <p>This document has been produced by the <loc
 href="https://www.w3.org/AudioVideo/TT/">Timed Text (TT) Working Group</loc> as
 part of the W3C <loc href="http://www.w3.org/2008/WebVideo/">Video

diff --git a/spec/ttml2-changes.html b/spec/ttml2-changes.html
@@ -104,10 +104,8 @@ <h3><a id="change-history-ttml1-rec-2e-to-ttml2-ed"></a>1.1 Changes from TTML1 (
 
 * In 5.3.1, add new parameter attribute vocabulary
   'ttp:activeArea',
-  'ttp:displayAspectRatio',
-  'ttp:mediaDuration',
   and
-  'ttp:mediaOffset',
+  'ttp:displayAspectRatio'
   to Table 5-5.
 
 * In 5.3.1, add new animation vocabulary, 'animate', to Animation.class in
@@ -217,10 +215,6 @@ <h3><a id="change-history-ttml1-rec-2e-to-ttml2-ed"></a>1.1 Changes from TTML1 (
 * In 6.2.7, deprecate 'ttp:profile' parameter attribute, replacing it with
   'ttp:processorProfiles' parameter attribute.
 
-* In 7.2, add 'ttp:mediaDuration' parameter attribute.
-
-* In 7.2, add 'ttp:mediaOffset' parameter attribute.
-
 * In 8.1.1, add {any attribute in TT Style Namespace} to definition of 'tt'
   element in order to support a common ancestor of 'region' elements from
   which styles may be inherited.

diff --git a/spec/ttml2-errata.html b/spec/ttml2-errata.html
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html
+  xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>TTML2 - Errata</title>
+    <link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/base.css"/>
+  </head>
+  <body>
+    <h1>Errata for Timed Text Markup Language 2 (TTML2)</h1>
+    <p>None</p>
+  </body>
+</html>
diff --git a/spec/ttml2-issues.html b/spec/ttml2-issues.html