Mercurial > hg > ttml / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset
Merge from tip
authorGlenn Adams <glenn@skynav.com>
Thu, 31 Jan 2013 01:58:50 -0700
changeset 342 70fd404afa09
parent 341 cd93ced33b19 (current diff)
parent 340 83230ecfbf46 (diff)
child 343 5f5cbbe336f3
Merge from tip 
--- a/ttml10/spec/ttaf1-dfxp.html	Thu Jan 31 01:57:15 2013 -0700
+++ b/ttml10/spec/ttaf1-dfxp.html	Thu Jan 31 01:58:50 2013 -0700
@@ -70,13 +70,13 @@
 .diff-del  { color: red; text-decoration: line-through; background-color: #99FF99; }
 .diff-chg  { background-color: #99FF99; }
 q.diff-off  {}
-</style><link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/W3C-ED.css"/></head><body>Last Modified: $Date: 2012/12/06 14:51:06 $<div id="revisions"/><div class="head">
+</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">
 <h1><a name="title" id="title"/>Timed Text Markup Language (TTML) 1.0 (Second Edition)</h1>
-<h2><a name="w3c-doctype" id="w3c-doctype"/>Editors' copy $Date: 2012/12/06 14:51:06 $ @@ @@@@ @@@@</h2><dl><dt>This version:</dt><dd>
+<h2><a name="w3c-doctype" id="w3c-doctype"/>Editors' copy $Date$ @@ @@@@ @@@@</h2><dl><dt>This version:</dt><dd>
 <a href="ttaf1-dfxp.html">ttaf1-dfxp.html</a>
 </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>
 <a href="http://www.w3.org/TR/2010/REC-ttaf1-dfxp-20101118/">http://www.w3.org/TR/2010/REC-ttaf1-dfxp-20101118/</a>
-</dd><dt>Editor:</dt><dd>Glenn Adams, Cox Communications, Inc.</dd><dt>Contributing Authors:</dt><dd>Mike Dolan, Invited Expert</dd><dd>Geoff Freed, WGBH National Center for Accessible Media</dd><dd>Sean Hayes, Microsoft</dd><dd>Erik Hodge, RealNetworks</dd><dd>David Kirby, British Broadcasting Corporation (BBC)</dd><dd>Thierry Michel, W3C</dd><dd>Dave Singer, Apple Computer</dd></dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © @@@@ <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.eu/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p></div><hr/><div>
+</dd><dt>Editor:</dt><dd>Glenn Adams, Cox Communications, Inc.</dd><dt>Contributing Authors:</dt><dd>Mike Dolan, Invited Expert</dd><dd>Geoff Freed, WGBH National Center for Accessible Media</dd><dd>Sean Hayes, Microsoft</dd><dd>Erik Hodge, RealNetworks</dd><dd>David Kirby, British Broadcasting Corporation (BBC)</dd><dd>Thierry Michel, W3C</dd><dd>Dave Singer, Apple Computer</dd></dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © @@@@ <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.eu/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p></div><hr/><div>
 <h2><a name="abstract" id="abstract"/>Abstract</h2><p>This document specifies the Timed Text Markup Language (TTML) in terms of a
 vocabulary and semantics thereof.</p><p>The Timed Text Markup Language is a content type that represents
 timed text media for the purpose of interchange among authoring
@@ -4285,7 +4285,7 @@
 <h3><a name="semantics-line-layout" id="semantics-line-layout"/>9.4 Line Layout</h3><p>If a profile that applies to a document instance
 requires use of the <a href="#feature-lineBreak-uax14">#lineBreak-uax14</a> feature
 (i.e., the value attribute for the feature is specified as <code>use</code>), then
-the recommendations defined by <a href="http://www.unicode.org/unicode/reports/tr14/#Algorithm">Line
+the recommendations defined by <a href="http://www.unicode.org/reports/tr14/#Algorithm">Line
 Breaking Algorithm</a> <a href="#uax14">[UAX14]</a> apply when performing
 line layout on the content of the document instance.</p></div></div><div class="div1">
 <h2><a name="timing" id="timing"/>10 Timing</h2><p>This section specifies the <em>timing</em> matter of the core
@@ -5872,8 +5872,7 @@
 
 # .......................................................................
 # .......................................................................
-# .......................................................................
-</pre></div></div><div class="div4">
+# .......................................................................</pre></div></div><div class="div4">
 <h5><a name="rnc-dfxp-timing-attribs-module" id="rnc-dfxp-timing-attribs-module"/>B.1.2.17 Timing Attributes Module</h5><div class="exampleInner"><pre># .......................................................................
 # TT-AF 1.0 DFXP Timing Attributes Module ...............................
 # .......................................................................
@@ -8285,7 +8284,7 @@
 W3C Recommendation, 13 December 2005. (See
 <a href="http://www.w3.org/TR/2005/REC-SMIL2-20051213/">http://www.w3.org/TR/2005/REC-SMIL2-20051213/</a>.)
 </dd><dt class="label"><a name="smpte12m" id="smpte12m"/>SMPTE 12M</dt><dd>ANSI/SMPTE 12M,
-<a href="http://www.smpte.org/"><cite>Television, Audio and Film –
+<a href="https://www.smpte.org/"><cite>Television, Audio and Film –
 Time and Control Code</cite></a>, SMPTE Standard.
 </dd><dt class="label"><a name="srgb" id="srgb"/>SRGB</dt><dd>IEC 61966-2-1,
 <a href="http://www.iec.ch/"><cite>Multimedia
@@ -8356,10 +8355,10 @@
 W3C Recommendation, 05 December 2006. (See
 <a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/">http://www.w3.org/TR/2006/REC-xsl11-20061205/</a>.)
 </dd></dl></div><div class="div1">
-<h2><a name="other-references" id="other-references"/>I Other References (Non-Normative)</h2><dl><dt class="label"><a name="ccreq" id="ccreq"/>CC-DECODER-REQ</dt><dd><a href="http://edocket.access.gpo.gov/cfr_2005/octqtr/47cfr15.119.htm"><cite>Closed Caption Decoder
+<h2><a name="other-references" id="other-references"/>I Other References (Non-Normative)</h2><dl><dt class="label"><a name="ccreq" id="ccreq"/>CC-DECODER-REQ</dt><dd><a href="http://www.gpo.gov/fdsys/pkg/CFR-2005-title47-vol1/xml/CFR-2005-title47-vol1-sec15-119.xml"><cite>Closed Caption Decoder
 Requirements for Analog Television</cite></a>,
 United States Code of Federal Regulations, Title 47, Volume 1, Part 15, § 15.119. (See
-<a href="http://edocket.access.gpo.gov/cfr_2005/octqtr/47cfr15.119.htm">http://edocket.access.gpo.gov/cfr_2005/octqtr/47cfr15.119.htm</a>.)
+<a href="http://www.gpo.gov/fdsys/pkg/CFR-2005-title47-vol1/xml/CFR-2005-title47-vol1-sec15-119.xml">http://www.gpo.gov/fdsys/pkg/CFR-2005-title47-vol1/xml/CFR-2005-title47-vol1-sec15-119.xml</a>.)
 </dd><dt class="label"><a name="cea608c" id="cea608c"/>CEA-608-C</dt><dd>
 EIA/CEA-608-C,
 <a href="http://www.ce.org/"><cite>Line 21 Data
--- a/ttml10/spec/ttaf1-dfxp.xml	Thu Jan 31 01:57:15 2013 -0700
+++ b/ttml10/spec/ttaf1-dfxp.xml	Thu Jan 31 01:58:50 2013 -0700
@@ -7611,7 +7611,7 @@
 href="#feature-lineBreak-uax14">#lineBreak-uax14</loc> feature
 (i.e., the value attribute for the feature is specified as <code>use</code>), then
 the recommendations defined by <loc
-href="http://www.unicode.org/unicode/reports/tr14/#Algorithm">Line
+href="http://www.unicode.org/reports/tr14/#Algorithm">Line
 Breaking Algorithm</loc> <bibref ref="uax14"/> apply when performing
 line layout on the content of the document instance.</p>
 </div2>
@@ -11415,7 +11415,7 @@
 <xspecref href="http://www.w3.org/TR/2005/REC-SMIL2-20051213/">http://www.w3.org/TR/2005/REC-SMIL2-20051213/</xspecref>.)
 </bibl>
 <bibl id="smpte12m" key="SMPTE 12M">ANSI/SMPTE 12M,
-<titleref href="http://www.smpte.org/">Television, Audio and Film &ndash;
+<titleref href="https://www.smpte.org/">Television, Audio and Film &ndash;
 Time and Control Code</titleref>, SMPTE Standard.
 </bibl>
 <bibl id="srgb" key="SRGB">IEC 61966-2-1,
@@ -11516,10 +11516,10 @@
 <head>Other References</head>
 <blist>
 <bibl id="ccreq" key="CC-DECODER-REQ"><titleref
-href="http://edocket.access.gpo.gov/cfr_2005/octqtr/47cfr15.119.htm">Closed Caption Decoder
+href="http://www.gpo.gov/fdsys/pkg/CFR-2005-title47-vol1/xml/CFR-2005-title47-vol1-sec15-119.xml">Closed Caption Decoder
 Requirements for Analog Television</titleref>,
 United States Code of Federal Regulations, Title 47, Volume 1, Part 15, &sect; 15.119. (See
-<xspecref href="http://edocket.access.gpo.gov/cfr_2005/octqtr/47cfr15.119.htm">http://edocket.access.gpo.gov/cfr_2005/octqtr/47cfr15.119.htm</xspecref>.)
+<xspecref href="http://www.gpo.gov/fdsys/pkg/CFR-2005-title47-vol1/xml/CFR-2005-title47-vol1-sec15-119.xml">http://www.gpo.gov/fdsys/pkg/CFR-2005-title47-vol1/xml/CFR-2005-title47-vol1-sec15-119.xml</xspecref>.)
 </bibl>
 <bibl id="cea608c" key="CEA-608-C">
 EIA/CEA-608-C,
--- a/ttml10/spec/xmlspec.xsl	Thu Jan 31 01:57:15 2013 -0700
+++ b/ttml10/spec/xmlspec.xsl	Thu Jan 31 01:58:50 2013 -0700
@@ -1117,6 +1117,8 @@
             </a>
             <xsl:text>, </xsl:text>
             <a href="http://www.keio.ac.jp/">Keio</a>
+            <xsl:text>, </xsl:text>
+	    <a href="http://ev.buaa.edu.cn/">Beihang</a>
             <xsl:text>), All Rights Reserved. W3C </xsl:text>
             <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>
             <xsl:text>, </xsl:text>
--- a/ttml11/spec/ttml11.html	Thu Jan 31 01:57:15 2013 -0700
+++ b/ttml11/spec/ttml11.html	Thu Jan 31 01:58:50 2013 -0700
@@ -70,13 +70,13 @@
 .diff-del  { color: red; text-decoration: line-through; background-color: #99FF99; }
 .diff-chg  { background-color: #99FF99; }
 q.diff-off  {}
-</style><link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/W3C-ED.css"/></head><body>Last Modified: $Date: 2012/04/12 05:50:28 $<div id="revisions"/><div class="head">
+</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">
 <h1><a name="title" id="title"/>Timed Text Markup Language (TTML) 1.1</h1>
-<h2><a name="w3c-doctype" id="w3c-doctype"/>Editors' copy $Date: 2012/04/12 05:50:28 $ @@ @@@@ @@@@</h2><dl><dt>This version:</dt><dd>
+<h2><a name="w3c-doctype" id="w3c-doctype"/>Editors' copy $Date$ @@ @@@@ @@@@</h2><dl><dt>This version:</dt><dd>
 <a href="ttml11.html">ttml11.html</a>
 </dd><dt>Latest version:</dt><dd><a href="http://dvcs.w3.org/hg/ttml/raw-file/tip/ttml11/spec/ttml11.html?content-type=text/html;charset=utf-8">http://dvcs.w3.org/hg/ttml/raw-file/tip/ttml11/spec/ttml11.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>
-</dd><dt>Editor:</dt><dd>Glenn Adams, Cox Communications, Inc.</dd><dt>Contributing Authors:</dt><dd>Mike Dolan, Invited Expert</dd><dd>Geoff Freed, WGBH National Center for Accessible Media</dd><dd>Sean Hayes, Microsoft</dd><dd>Erik Hodge, RealNetworks</dd><dd>David Kirby, British Broadcasting Corporation (BBC)</dd><dd>Thierry Michel, W3C</dd><dd>Dave Singer, Apple Computer</dd></dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © @@@@ <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.eu/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p></div><hr/><div>
+</dd><dt>Editor:</dt><dd>Glenn Adams, Cox Communications, Inc.</dd><dt>Contributing Authors:</dt><dd>Mike Dolan, Invited Expert</dd><dd>Geoff Freed, WGBH National Center for Accessible Media</dd><dd>Sean Hayes, Microsoft</dd><dd>Erik Hodge, RealNetworks</dd><dd>David Kirby, British Broadcasting Corporation (BBC)</dd><dd>Thierry Michel, W3C</dd><dd>Dave Singer, Apple Computer</dd></dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © @@@@ <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.eu/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p></div><hr/><div>
 <h2><a name="abstract" id="abstract"/>Abstract</h2><p>This document specifies the Timed Text Markup Language (TTML) in terms of a
 vocabulary and semantics thereof.</p><p>The Timed Text Markup Language is a content type that represents
 timed text media for the purpose of interchange among authoring
@@ -5765,8 +5765,7 @@
 
 # .......................................................................
 # .......................................................................
-# .......................................................................
-</pre></div></div><div class="div4">
+# .......................................................................</pre></div></div><div class="div4">
 <h5><a name="rnc-dfxp-timing-attribs-module" id="rnc-dfxp-timing-attribs-module"/>B.1.2.17 Timing Attributes Module</h5><div class="exampleInner"><pre># .......................................................................
 # TT-AF 1.0 DFXP Timing Attributes Module ...............................
 # .......................................................................
--- a/ttml11/spec/xmlspec.xsl	Thu Jan 31 01:57:15 2013 -0700
+++ b/ttml11/spec/xmlspec.xsl	Thu Jan 31 01:58:50 2013 -0700
@@ -1117,6 +1117,8 @@
             </a>
             <xsl:text>, </xsl:text>
             <a href="http://www.keio.ac.jp/">Keio</a>
+            <xsl:text>, </xsl:text>
+	    <a href="http://ev.buaa.edu.cn/">Beihang</a>
             <xsl:text>), All Rights Reserved. W3C </xsl:text>
             <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>
             <xsl:text>, </xsl:text>
ttml

Hosted by W3C Systems Team, please report bugs to sysreq@w3.org