1. Bring into alignment with 20061116 CR.
2. Add editlist.txt to track edits (tbd or completed).
--- a/spec/acknowledgements.xml Sat Dec 13 16:37:44 2008 +0000
+++ b/spec/acknowledgements.xml Sun Dec 14 03:56:52 2008 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<inform-div1 id="acknowledgments">
-<head>Acknowledgements</head>
+<head>Acknowledgments</head>
<p>The editor acknowledges the members of the Timed Text Working
Group, the members of other W3C Working Groups, and industry experts
in other forums who have contributed directly or indirectly to the
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/spec/editlist.txt Sun Dec 14 03:56:52 2008 +0000
@@ -0,0 +1,12 @@
+********************************************************************************
+* EDIT LIST *
+********************************************************************************
+
+NOT YET IMPLEMENTED
+
+1. B.4 change typo "withing" to "within"
+2. 8.2.24 remove extra '"' at end of last line of wrap option example
+
+ALREADY IMPLEMENTED
+
+
--- a/spec/ttaf1-dfxp.html Sat Dec 13 16:37:44 2008 +0000
+++ b/spec/ttaf1-dfxp.html Sun Dec 14 03:56:52 2008 +0000
@@ -75,7 +75,7 @@
<a href="http://www.w3.org/TR/2006/CR-ttaf1-dfxp-20061116/">http://www.w3.org/TR/2006/CR-ttaf1-dfxp-20061116/</a>
</dd><dt>Latest version:</dt><dd><a href="http://www.w3.org/TR/ttaf1-dfxp/">http://www.w3.org/TR/ttaf1-dfxp/</a></dd><dt>Previous version:</dt><dd>
<a href="http://www.w3.org/TR/2006/WD-ttaf1-dfxp-20060427/">http://www.w3.org/TR/2006/WD-ttaf1-dfxp-20060427/</a>
-</dd><dt>Editor:</dt><dd><table style="margin: 0em 0em"><td>Glenn Adams, Extensible Formatting Systems, Inc. (XFSI)</td><td/></table></dd><dt>Editors:</dt><dd><table style="margin: 0em 0em"><td>Mike Dolan, Invited Expert</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>Geoff Freed, WGBH National Center for Accessible Media</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>Sean Hayes, Microsoft</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>Erik Hodge, RealNetworks</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>David Kirby, British Broadcasting Corporation (BBC)</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>Thierry Michel, W3C</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>Dave Singer, Apple Computer</td><td/></table></dd></dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © 2006 <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.org/"><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><table style="margin: 0em 0em"><td>Glenn Adams, Extensible Formatting Systems, Inc. (XFSI)</td><td/></table></dd><dt>Contributing Authors:</dt><dd><table style="margin: 0em 0em"><td>Mike Dolan, Invited Expert</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>Geoff Freed, WGBH National Center for Accessible Media</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>Sean Hayes, Microsoft</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>Erik Hodge, RealNetworks</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>David Kirby, British Broadcasting Corporation (BBC)</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>Thierry Michel, W3C</td><td/></table></dd><dd><table style="margin: 0em 0em"><td>Dave Singer, Apple Computer</td><td/></table></dd></dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © 2006 <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.org/"><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>
<h2><a name="abstract" id="abstract"/>Abstract</h2><p>This document specifies the distribution format exchange profile
(DFXP) of the timed text authoring format (TT AF) in terms of a
vocabulary and semantics thereof.</p><p>The timed text authoring format is a content type that represents
@@ -357,7 +357,7 @@
J.1 <a href="#d3e12855">Requirements</a><br/>
J.2 <a href="#d3e13019">Guidelines</a><br/>
K <a href="#streaming">Streaming DFXP Content</a> (Non-Normative)<br/>
-L <a href="#acknowledgments">Acknowledgements</a> (Non-Normative)<br/>
+L <a href="#acknowledgments">Acknowledgments</a> (Non-Normative)<br/>
M <a href="#change-history">Change History</a> (Non-Normative)<br/>
M.1 <a href="#change-history-lc1-to-lc2">Changes from First to Second Last Call Working Draft</a><br/>
M.2 <a href="#change-history-lc2-to-cr">Changes from Second Last Call Working Draft to Candidate
@@ -2502,7 +2502,7 @@
I'll tell thee everything I can:<br/>
There's little to relate.<br/>
I saw an aged aged man,<br/>
- A-sitting on a gate.
+ A-sitting on a gate."
</p>
</pre></div>
</td></tr></tbody></table><p/><table summary="HTML Table" id="style-attribute-wrapOption-example-1-images" class="example-images"><caption>Example Rendition – Wrap Option</caption><tbody><tr><td><img src="images/wrapOption.png" alt="DFXP wrapOption style property"/></td></tr></tbody></table><div class="note"><p class="prefix"><b>Note:</b></p><p>The semantics of the style property
@@ -3922,7 +3922,7 @@
present in the presentation region divided by the number of clear units
currently available in the presentation region.</p></li></ol></div></div><div class="div2">
<h3><a name="dynamicFlowOperations" id="dynamicFlowOperations"/>B.4 Flow Operations</h3><p>Flow operations perform the filling, reflowing, and clearing of
-formatted content into, within, and from a presentation undergoing dynamic flow processing.</p><div class="div3">
+formatted content into, withing, and from a presentation undergoing dynamic flow processing.</p><div class="div3">
<h4><a name="flowOperationFill" id="flowOperationFill"/>B.4.1 Fill Operation</h4><p>A <em>fill operation</em> causes the following ordered steps
to be performed:</p><ol class="enumar"><li><p>remove sufficient content from the beginning of the
<em>flow buffer</em> to constitute a <em>fill
@@ -7278,7 +7278,7 @@
fragments.</p><p>An example of such a fragmentation of a DFXP document instance is
shown in <a href="#fragment-streaming-graphic"><b>Figure 2 – Fragment Streaming</b></a>.</p><table summary="HTML Table" id="fragment-streaming-graphic" class="example-images"><caption>Figure 2 – Fragment Streaming</caption><tbody><tr><td><img src="images/streaming.png" alt="Fragment Streaming"/></td></tr></tbody></table><div class="note"><p class="prefix"><b>Note:</b></p><p>This specification does not define a transport buffer model or a decoder
capabilities model.</p></div></div><div class="div1">
-<h2><a name="acknowledgments" id="acknowledgments"/>L Acknowledgements (Non-Normative)</h2><p>The editor acknowledges the members of the Timed Text Working
+<h2><a name="acknowledgments" id="acknowledgments"/>L Acknowledgments (Non-Normative)</h2><p>The editor acknowledges the members of the Timed Text Working
Group, the members of other W3C Working Groups, and industry experts
in other forums who have contributed directly or indirectly to the
process or content of creating this document.</p><p>The current and former members of the Timed Text Working Group are:
--- a/spec/ttaf1-dfxp.xml Sat Dec 13 16:37:44 2008 +0000
+++ b/spec/ttaf1-dfxp.xml Sun Dec 14 03:56:52 2008 +0000
@@ -4872,7 +4872,7 @@
I'll tell thee everything I can:<br/>
There's little to relate.<br/>
I saw an aged aged man,<br/>
- A-sitting on a gate.
+ A-sitting on a gate."
</p>
</eg>
</td>
@@ -7187,7 +7187,7 @@
<div2 id="dynamicFlowOperations">
<head>Flow Operations</head>
<p>Flow operations perform the filling, reflowing, and clearing of
-formatted content into, within, and from a presentation undergoing dynamic flow processing.</p>
+formatted content into, withing, and from a presentation undergoing dynamic flow processing.</p>
<div3 id="flowOperationFill">
<head>Fill Operation</head>
<p>A <emph>fill operation</emph> causes the following ordered steps
--- a/spec/xmlspec-ttaf1-dfxp.xsl Sat Dec 13 16:37:44 2008 +0000
+++ b/spec/xmlspec-ttaf1-dfxp.xsl Sun Dec 14 03:56:52 2008 +0000
@@ -574,6 +574,29 @@
<xsl:template match="br">
<br xmlns="http://www.w3.org/1999/xhtml" />
</xsl:template>
+
+<!-- authlist -->
+<xsl:template match="authlist">
+ <dt xmlns="http://www.w3.org/1999/xhtml">
+ <xsl:choose>
+ <xsl:when test="@role='editor'">
+ <xsl:text>Editor</xsl:text>
+ </xsl:when>
+ <xsl:when test="@role='contributor'">
+ <xsl:text>Contributing Author</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>Author</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:if test="count(author) > 1">
+ <xsl:text>s</xsl:text>
+ </xsl:if>
+ <xsl:text>:</xsl:text>
+ </dt>
+ <xsl:apply-templates/>
+</xsl:template>
+
<!-- author -->
<xsl:template match="author">
<dd xmlns="http://www.w3.org/1999/xhtml">