--- a/spec/ttaf1-dfxp.xml Sat May 09 00:27:31 2009 +0000
+++ b/spec/ttaf1-dfxp.xml Wed May 20 09:56:02 2009 +0000
@@ -251,7 +251,7 @@
<tr>
<td>
<eg xml:space="preserve">
-<styling xmlns:tts="http://www.w3.org/2006/10/ttaf1#<phrase diff="chg">styling</phrase>">
+<styling xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling">
<!-- s1 specifies default color, font, and text alignment -->
<style xml:id="s1"
tts:color="white"
@@ -286,7 +286,7 @@
<tr>
<td>
<eg xml:space="preserve">
-<layout xmlns:tts="http://www.w3.org/2006/10/ttaf1#<phrase diff="chg">styling</phrase>">
+<layout xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling">
<region xml:id="subtitleArea"
style="s1"
tts:extent="560px 62px"
@@ -365,9 +365,7 @@
</table>
<p>The first subtitle <specref ref="dfxp-example-subtitle-1"/> is
presented during the time interval 0.76 to 3.45 seconds.
-<phrase diff="del">In this
-example, the default metric for time expressions is seconds since no
-metric is specified in the expressions. </phrase>This
+This
subtitle inherits its font family, font size,
foreground color, and text alignment from the region into which it is
presented. Since no region is explicitly specified on the paragraph,
@@ -562,14 +560,14 @@
item as defined by <bibref ref="infoset"/>, §2.6.</p>
</def>
</gitem>
-<gitem diff="add">
+<gitem>
<label>Content Processor</label>
<def>
<p>A processing system capable of importing (receiving) timed text authoring format
content for the purpose of transforming, presenting, or otherwise processing the content.</p>
</def>
</gitem>
-<gitem diff="add">
+<gitem>
<label>Content Profile</label>
<def>
<p>A collection of features and extensions that are (or may be) employed by
@@ -593,12 +591,11 @@
<gitem>
<label>Exchange Profile</label>
<def>
-<p>A<phrase diff="add"> content</phrase> profile<phrase
-diff="del">(subset) of the TT AF</phrase> that serves a set of needs
-for content <phrase diff="chg">inter</phrase>change.</p>
+<p>A content profile that serves a set of needs
+for content interchange.</p>
</def>
</gitem>
-<gitem diff="add">
+<gitem>
<label>Extension</label>
<def>
<p>A syntactic or semantic expression or capability that is defined and
@@ -606,7 +603,7 @@
specification.</p>
</def>
</gitem>
-<gitem diff="add">
+<gitem>
<label>Feature</label>
<def>
<p>A syntactic or semantic expression or capability that is defined and
@@ -614,20 +611,20 @@
future revision of this specification).</p>
</def>
</gitem>
-<gitem diff="add">
+<gitem>
<label>Processor</label>
<def>
<p>See <emph>Content Processor</emph>.</p>
</def>
</gitem>
-<gitem diff="add">
+<gitem>
<label>Processor Profile</label>
<def>
<p>A collection of features and extensions that must or may be implemented (supported) by
by a content processor.</p>
</def>
</gitem>
-<gitem diff="add">
+<gitem>
<label>Profile Definition Document</label>
<def>
<p>A document that defines a specific collection of features and extensions
@@ -788,7 +785,7 @@
ref="rfc3023"/> § 7, with which an optional
<code>profile</code> parameter may appear, the value of which
conforms to
-<phrase diff="del">the values</phrase><phrase diff="add">a profile designator as</phrase>
+a profile designator as
defined by
<specref ref="vocabulary-profiles"/>.</p>
</item>
@@ -819,9 +816,9 @@
<div2 id="conformance-processor">
<head>Processor Conformance</head>
<div3 id="conformance-generic-processor">
-<head><phrase diff="add">Generic Processor Conformance</phrase></head>
+<head>Generic Processor Conformance</head>
<p>A TT AF processor conforms to this specification if the following
-<phrase diff="add">generic processor </phrase>criteria are
+generic processor criteria are
satisfied:</p>
<olist>
<item>
@@ -842,30 +839,20 @@
<item>
<p>The processor does not <emph>a priori</emph> reject or abort the
processing of a conformant TT AF document instance
-<phrase diff="add">unless the processor does not support some required
+unless the processor does not support some required
(mandatory) feature specified or implied by a TT AF content profile
-declared to apply to the document instance</phrase>.</p>
+declared to apply to the document instance.</p>
</item>
<item>
<p>The processor supports all mandatory processing semantics defined by this specification.</p>
</item>
-<item diff="del">
-<p>If the processor claims to support presentation processing in order
-to produce a rendition of TT AF content on a visual medium, then it
-must implement the region and line layout
-semantics defined by <specref ref="semantics-region-layout"/> and
-<specref ref="semantics-line-layout"/>, respectively. In addition, the
-processor should satisfy the user agent accessibility guidelines specified by
-<bibref ref="uaag"/>.
-</p>
-</item>
<item>
<p>If the processor supports some optional processing semantics defined by this specification,
then it does so in a manner consistent with the defined semantics.</p>
</item>
</olist>
</div3>
-<div3 id="conformance-transformation-processor" diff="add">
+<div3 id="conformance-transformation-processor">
<head>Transformation Processor Conformance</head>
<p>A TT AF processor is a conformant TT AF transformation processor if
the following criteria are satisfied:</p>
@@ -880,7 +867,7 @@
</item>
</olist>
</div3>
-<div3 id="conformance-presentation-processor" diff="add">
+<div3 id="conformance-presentation-processor">
<head>Presentation Processor Conformance</head>
<olist>
<item>
@@ -916,15 +903,15 @@
or included in the subset or superset profile.</p>
<p>A TT AF document instance for which a compliance claim is made
must specify
-<phrase diff="add">either (1)</phrase>
+either (1)
a <att>ttp:profile</att> attribute on its root
-<phrase diff="add"><el>tt</el></phrase>
+<el>tt</el>
element
as defined by <specref ref="parameter-attribute-profile"/>
-<phrase diff="add">or (2)
+or (2)
a <el>ttp:profile</el> element as a child of the
<el>head</el> element as defined by
-<specref ref="parameter-vocabulary-profile"/></phrase>.</p>
+<specref ref="parameter-vocabulary-profile"/>.</p>
</div2>
</div1>
<div1 id="doctypes">
@@ -970,8 +957,8 @@
associated abstract document type.</p>
<note>
<p>While a conformant processor may not <emph>a priori</emph> reject a
-conformant document instance <phrase diff="add">that adheres to a
-supported content profile</phrase>, a given document instance may be
+conformant document instance that adheres to a
+supported content profile, a given document instance may be
constrained by the author or authoring tool to satisfy a more
restrictive definition of validity.</p>
</note>
@@ -991,7 +978,7 @@
<p>The (root) document element of a DFXP document instance must be a
<el>tt</el> element, as defined by <specref
ref="document-structure-vocabulary-tt"/>.</p>
-<note role="clarification" diff="add">
+<note role="clarification">
<p>The schemas included in this specification do not validate all syntactic constraints
defined by this specification. In particular, performing validation with one of the above
referenced schemas may result in a <emph>false positive</emph> indication of validity.
@@ -1042,19 +1029,19 @@
<td><code>http://www.w3.org/2006/10/ttaf1#parameter</code></td>
</tr>
<tr>
-<td><phrase diff="add">TT Parameter Extension</phrase></td>
-<td><phrase diff="add"><code>ttpx:</code></phrase></td>
-<td><phrase diff="add"><code>http://www.w3.org/2006/10/ttaf1#parameter-extension</code></phrase></td>
+<td>TT Parameter Extension</td>
+<td><code>ttpx:</code></td>
+<td><code>http://www.w3.org/2006/10/ttaf1#parameter-extension</code></td>
</tr>
<tr>
<td>TT Style</td>
<td><code>tts:</code></td>
-<td><code>http://www.w3.org/2006/10/ttaf1#<phrase diff="chg">styling</phrase></code></td>
-</tr>
-<tr>
-<td>TT Style Extension<phrase diff="del">s</phrase></td>
+<td><code>http://www.w3.org/2006/10/ttaf1#styling</code></td>
+</tr>
+<tr>
+<td>TT Style Extension</td>
<td><code>ttsx:</code></td>
-<td><code>http://www.w3.org/2006/10/ttaf1#<phrase diff="chg">styling</phrase>-extension</code></td>
+<td><code>http://www.w3.org/2006/10/ttaf1#styling-extension</code></td>
</tr>
<tr>
<td>TT Metadata</td>
@@ -1062,31 +1049,31 @@
<td><code>http://www.w3.org/2006/10/ttaf1#metadata</code></td>
</tr>
<tr>
-<td>TT Metadata Extension<phrase diff="del">s</phrase></td>
+<td>TT Metadata Extension</td>
<td><code>ttmx:</code></td>
<td><code>http://www.w3.org/2006/10/ttaf1#metadata-extension</code></td>
</tr>
<tr>
-<td><phrase diff="add">TT Profile</phrase></td>
-<td><phrase diff="add"><emph>none</emph></phrase></td>
-<td><phrase diff="add"><code>http://www.w3.org/2006/10/ttaf1/profile</code></phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add">TT Feature</phrase></td>
-<td><phrase diff="add"><emph>none</emph></phrase></td>
-<td><phrase diff="add"><code>http://www.w3.org/2006/10/ttaf1/feature</code></phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add">TT Extension</phrase></td>
-<td><phrase diff="add"><emph>none</emph></phrase></td>
-<td><phrase diff="add"><code>http://www.w3.org/2006/10/ttaf1/extension</code></phrase></td>
+<td>TT Profile</td>
+<td><emph>none</emph></td>
+<td><code>http://www.w3.org/2006/10/ttaf1/profile</code></td>
+</tr>
+<tr>
+<td>TT Feature</td>
+<td><emph>none</emph></td>
+<td><code>http://www.w3.org/2006/10/ttaf1/feature</code></td>
+</tr>
+<tr>
+<td>TT Extension</td>
+<td><emph>none</emph></td>
+<td><code>http://www.w3.org/2006/10/ttaf1/extension</code></td>
</tr>
</tbody>
</table>
<note role="clarification">
<p>If a reference to an element type is used in this specification and the name
of the element type is not namespace qualified, then the TT Namespace applies.</p>
-<p diff="add">For certain namespaces defined above, the default prefix
+<p>For certain namespaces defined above, the default prefix
is specified as <emph>none</emph> if no XML vocabulary is defined in
the namespace by this specification (nor expected to be defined in a
future version of this specification). In such cases, the use of the
@@ -1098,67 +1085,56 @@
<div2 id="vocabulary-profiles">
<head>Profiles</head>
<p>The Timed Text Authoring Format (TT AF) employs a number of
-<phrase diff="add">standard, predefined </phrase>profiles of its
+standard, predefined profiles of its
vocabulary and associated semantics.
The following table specifies this set of
-profiles<phrase diff="chg">, indicating</phrase>
+profiles, indicating
a normative name
-<phrase diff="add">and designator </phrase>for each
-<phrase diff="add">predefined </phrase>profile<phrase diff="add">,
+and designator for each
+predefined profile,
and where each of these profiles is formally elaborated in
-<specref ref="profiles"/></phrase>.</p>
+<specref ref="profiles"/>.</p>
<table id="profile-vocab-table" role="common">
<caption>Table 2 – Profiles</caption>
<col width="25%"/>
<tbody>
<tr>
<th>Name</th>
-<th><phrase diff="del">Value</phrase><phrase diff="add">Designator</phrase></th>
-</tr>
-<tr>
-<td>DFXP<phrase diff="add"> Transformation</phrase></td>
-<td><phrase diff="chg"><code>http://www.w3.org/2006/10/ttaf1/profile/dfxp-transformation</code></phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add">DFXP Presentation</phrase></td>
-<td><phrase diff="add"><code>http://www.w3.org/2006/10/ttaf1/profile/dfxp-presentation</code></phrase></td>
+<th>Designator</th>
+</tr>
+<tr>
+<td>DFXP Transformation</td>
+<td><code>http://www.w3.org/2006/10/ttaf1/profile/dfxp-transformation</code></td>
+</tr>
+<tr>
+<td>DFXP Presentation</td>
+<td><code>http://www.w3.org/2006/10/ttaf1/profile/dfxp-presentation</code></td>
</tr>
</tbody>
</table>
<p/>
-<p diff="add">A profile designator must adhere to the
+<p>A profile designator must adhere to the
<code>xsd:anyURI</code> data type defined by <bibref ref="xsd-2"/>,
§3.2.17. If the profile designator is expressed as a relative URI,
then it must be absolutized by using the TT Profile Namespace value as
the base URI.</p>
-<p diff="add">A profile designator is not restricted to the set of designators enumerated
+<p>A profile designator is not restricted to the set of designators enumerated
in <specref ref="profile-vocab-table"/>, but may be any URI that
feasibly dereferences a TT AF Profile Definition Document.</p>
-<note role="example" diff="add">
+<note role="example">
<p>For example, if a profile designator were expressed as
<code>dfxp-presentation</code>, then the absolutized profile designator
would be
<code>http://www.w3.org/2006/10/ttaf1/profile/dfxp-presentation</code>.</p>
</note>
-<p diff="del">A convention is defined for use by content authors to indicate use of a
-subtractive or additive delta to a predefined profile by using an
-optional <emph>sub-profile</emph> suffix of a profile URI: if a sub-profile
-is subtractive (results in a proper subset), then the <emph>sub-profile</emph>
-is expressed as "-token"; if additive (results in a proper superset), then it is
-expressed as "+token", where <emph>token</emph> expresses an author determined
-sub-profile that adheres to the <code>xsd:NCName</code> data type
-defined in <bibref ref="xsd-2"/>, §3.3.7.</p>
-<p diff="del">All tokens used in a sub-profile suffix that do not start with the
-prefix <code>x-</code> are reserved for future standardization.</p>
-<p>The profile of a document instance is specified<phrase diff="add">
-either (1) by specifying</phrase> <phrase diff="del">using </phrase>a
-<att>ttp:profile</att> attribute<phrase
-diff="add"> on the root <el>tt</el> element,</phrase> as defined by
-<specref ref="parameter-attribute-profile"/><phrase diff="add">, or
+<p>The profile of a document instance is specified
+either (1) by specifying a
+<att>ttp:profile</att> attribute on the root <el>tt</el> element, as defined by
+<specref ref="parameter-attribute-profile"/>, or
(2) by including a <el>ttp:profile</el> element in the <el>head</el>
element, in accordance with <specref
-ref="parameter-vocabulary-profile"/></phrase>.</p>
-<p diff="add">If neither
+ref="parameter-vocabulary-profile"/>.</p>
+<p>If neither
<loc href="#parameter-attribute-profile"><att>ttp:profile</att></loc>
attribute nor
<loc href="#parameter-vocabulary-profile"><el>ttp:profile</el></loc>
@@ -1166,7 +1142,7 @@
interchange context does not specify a profile,
then the DFXP Transformation
profile applies.</p>
-<note role="elaboration" diff="add">
+<note role="elaboration">
<p>It is intended that the <att>ttp:profile</att> attribute be used when
the author wishes to reference one of the standard, predefined profiles of
TT AF content, and does not wish to modify (by supersetting or subsetting)
@@ -1191,15 +1167,7 @@
It is also possible to define a derived profile that is simultaneously subtractive
and additive.</p>
</note>
-<note role="explanation" diff="del">
-<p>A TT AF authoring system may indicate the profile of TT AF used in
-a document instance by specifying a <loc
-href="#parameter-attribute-profile"><att>ttp:profile</att></loc>
-attribute. A TT AF content processor may make use of this profile
-value to associate a document instance with a schema or processing
-functions.</p>
-</note>
-<p diff="add">If a TT AF document instance makes use of a feature defined by
+<p>If a TT AF document instance makes use of a feature defined by
<specref ref="feature-designations"/> and if the intended use of the
document requires the recognition and processing of that feature, then
the document must include a <emph>required feature</emph>
@@ -1209,7 +1177,7 @@
document requires the recognition and processing of that extension,
then the document must include a <emph>required extension</emph>
specification in one of its declared profiles.</p>
-<note role="elaboration" diff="add">
+<note role="elaboration">
<p>A required feature specification is expressed directly (or
indirectly by referring to a profile) by means of a <loc
href="#parameter-vocabulary-feature"><el>ttp:feature</el></loc>
@@ -1222,8 +1190,8 @@
<code>required</code>.</p>
</note>
<p>An example of an author defined
-<phrase diff="chg">subtractive, derived profile of the DFXP Presentation
-profile</phrase> is shown
+subtractive, derived profile of the DFXP Presentation
+profile is shown
below in <specref ref="dfxp-example-sub-profile"/>.</p>
<table id="dfxp-example-sub-profile" role="example">
<caption>Example Fragment – DFXP Subtractive Profile</caption>
@@ -1246,14 +1214,11 @@
</tbody>
</table>
<note role="explanation">
-<p diff="add">In the above example, the baseline profile is declared to be
+<p>In the above example, the baseline profile is declared to be
the DFXP Presentation profile, which is then subtractively modified by making the
<code>#fontStyle-italic</code> feature optional (rather than required as it is defined
in <specref ref="profile-dfxp-presentation"/>). Note also the resetting of the
default XMLNS binding on the <el>profile</el> element to the TT Parameter Namespace.</p>
-<p diff="del">Because the above example is an author defined sub-profile (as
-opposed to a future W3C defined profile), the sub-profile token
-contains the prefix <code>x-</code>.</p>
</note>
</div2>
<div2 id="vocabulary-overview">
@@ -1361,12 +1326,12 @@
</td>
</tr>
<tr>
-<td><phrase diff="add">Parameter Items</phrase></td>
-<td><phrase diff="add"><loc href="#parameter-vocabulary-profile">ttp:profile</loc>,
+<td>Parameter Items</td>
+<td><loc href="#parameter-vocabulary-profile">ttp:profile</loc>,
<loc href="#parameter-vocabulary-features">ttp:features</loc>,
<loc href="#parameter-vocabulary-feature">ttp:feature</loc>,
<loc href="#parameter-vocabulary-extensions">ttp:extensions</loc>,
-<loc href="#parameter-vocabulary-extension">ttp:extension</loc></phrase>
+<loc href="#parameter-vocabulary-extension">ttp:extension</loc>
</td>
</tr>
<tr>
@@ -1431,9 +1396,9 @@
</td>
</tr>
<tr>
-<td><phrase diff="add">Parameters.class</phrase></td>
-<td><phrase diff="add"><loc
-href="#parameter-vocabulary-profile">ttp:profile</loc></phrase></td>
+<td>Parameters.class</td>
+<td><loc
+href="#parameter-vocabulary-profile">ttp:profile</loc></td>
</tr>
</tbody>
</table>
@@ -1547,7 +1512,7 @@
</tr>
</tbody>
</table>
-<note role="explanation" diff="add">
+<note role="explanation">
<p>Only those attributes defined as either (1) global, i.e., namespace qualified, or
(2) shared element-specific, i.e., not namespace qualified but shared across multiple
element types, are listed in <specref ref="attribute-vocab-table"/> above.
@@ -1570,13 +1535,13 @@
for extension vocabulary:</p>
<ulist>
<item>
-<p>TT Metadata Extension<phrase diff="del">s</phrase></p>
-</item>
-<item>
-<p diff="add">TT Parameter Extension</p>
-</item>
-<item>
-<p>TT Style Extension<phrase diff="del">s</phrase></p>
+<p>TT Metadata Extension</p>
+</item>
+<item>
+<p>TT Parameter Extension</p>
+</item>
+<item>
+<p>TT Style Extension</p>
</item>
</ulist>
<p>In addition to standardized extension vocabulary, a conforming TT
@@ -1600,21 +1565,18 @@
core vocabulary items or for establishing a processing context by means
of which TT AF content can be related to an external environment.</p>
<div2 id="parameter-element-vocabulary">
-<head><phrase diff="add">Parameter </phrase>Element Vocabulary</head>
-<p diff="add">The following elements, all defined in the TT Parameter
+<head>Parameter Element Vocabulary</head>
+<p>The following elements, all defined in the TT Parameter
Namespace, specify parametric information that applies to a document
or a content processor:</p>
-<ulist diff="add">
+<ulist>
<item><p><specref ref="parameter-vocabulary-profile"/></p></item>
<item><p><specref ref="parameter-vocabulary-features"/></p></item>
<item><p><specref ref="parameter-vocabulary-feature"/></p></item>
<item><p><specref ref="parameter-vocabulary-extensions"/></p></item>
<item><p><specref ref="parameter-vocabulary-extension"/></p></item>
</ulist>
-<p diff="del">No parameters related element vocabulary is defined for use in the
-core vocabulary catalog.</p>
-
-<div3 id="parameter-vocabulary-profile" diff="add">
+<div3 id="parameter-vocabulary-profile">
<head>ttp:profile</head>
<p>The <el>ttp:profile</el> element is used to specify a collection of
required (mandatory) and optional (voluntary) features and extensions that must or
@@ -1755,7 +1717,7 @@
</note>
</div3>
-<div3 id="parameter-vocabulary-features" diff="add">
+<div3 id="parameter-vocabulary-features">
<head>ttp:features</head>
<p>The <el>ttp:features</el> element is a container element used to group
infomation about feature support requirements.</p>
@@ -1789,7 +1751,7 @@
of feature designation URIs expressed by child <el>ttp:feature</el>
elements.</p>
</div3>
-<div3 id="parameter-vocabulary-feature" diff="add">
+<div3 id="parameter-vocabulary-feature">
<head>ttp:feature</head>
<p>The <el>ttp:feature</el> element is used to specify
infomation about support requirements for a particular feature.</p>
@@ -1895,7 +1857,7 @@
profile).</p>
</note>
</div3>
-<div3 id="parameter-vocabulary-extensions" diff="add">
+<div3 id="parameter-vocabulary-extensions">
<head>ttp:extensions</head>
<p>The <el>ttp:extensions</el> element is a container element used to group
infomation about extension support requirements.</p>
@@ -1929,7 +1891,7 @@
of extension designation URIs expressed by child <el>ttp:extension</el>
elements.</p>
</div3>
-<div3 id="parameter-vocabulary-extension" diff="add">
+<div3 id="parameter-vocabulary-extension">
<head>ttp:extension</head>
<p>The <el>ttp:extension</el> element is used to specify
infomation about support requirements for a particular extension.</p>
@@ -2043,7 +2005,7 @@
</div3>
</div2>
<div2 id="parameter-attribute-vocabulary">
-<head><phrase diff="add">Parameter </phrase>Attribute Vocabulary</head>
+<head>Parameter Attribute Vocabulary</head>
<p>The following attributes are defined in the TT Parameter Namespace.</p>
<ulist>
<item><p><specref ref="parameter-attribute-cellResolution"/></p></item>
@@ -2215,8 +2177,8 @@
be expressed as an integral number of frames per second.</p>
<p>If not specified, the frame rate multiplier must be considered to
be equal to one (1:1). If a denominator is specified, then it must not be zero (0).
-<phrase diff="add"> If no denominator is specified, then a denominator of one (1)
-applies</phrase>.</p>
+ If no denominator is specified, then a denominator of one (1)
+applies.</p>
<p>A <att>ttp:frameRateMultiplier</att> attribute is considered to be significant only
when specified on the <el>tt</el> element.</p>
<note role="example">
@@ -2342,14 +2304,12 @@
<p>If specified, the value of this attribute must adhere to the
<code>xsd:anyURI</code> data type defined by <bibref ref="xsd-2"/>,
§3.2.17, and, further, must specify a
-profile <phrase diff="chg">designator in accordance with</phrase>
+profile designator in accordance with
<specref ref="vocabulary-profiles"/>.</p>
-<p diff="del">If not specified, then the Distribution Format Exchange
-Profile (DFXP) must be assumed to apply.</p>
<p>A <att>ttp:profile</att>
attribute is considered to be significant only when specified on the
<el>tt</el> element.</p>
-<p diff="add">If a <el>ttp:profile</el> element appears as a
+<p>If a <el>ttp:profile</el> element appears as a
descendant of the <el>tt</el> element, then the <loc
href="#parameter-attribute-profile"><att>ttp:profile</att></loc>
attribute should not be specified on the <el>tt</el> element. If both
@@ -2560,7 +2520,7 @@
be synchronized. In this case, the value of the <att>ttp:markerMode</att>
and <att>ttp:smpteMode</att> parameters apply, as defined by <specref
ref="parameter-attribute-markerMode"/> and <specref
-ref="parameter-attribute-smpteMode"/>, respectively<phrase diff="add">.</phrase></p>
+ref="parameter-attribute-smpteMode"/>, respectively.</p>
<p>If the time base is designated as <code>clock</code>, then the time
expression denotes a coordinate in some real-world time line as
established by some real-time clock, such as the local wall-clock time
@@ -2575,7 +2535,7 @@
be subject to transformations of the controlling time line, such as
temporal reversal, dilation (expansion), or constriction
(compression); however, when operating with the <code>clock</code>
-time base, no transformations are permitted, and <phrase diff="chg">diachronic</phrase>
+time base, no transformations are permitted, and diachronic
presentation proceeds on a linear, monotonically increasing time line
based on the passage of real time.</p>
<note role="example">
@@ -2591,7 +2551,7 @@
<p>This section specifies the <emph>content</emph> matter of the core
vocabulary catalog.</p>
<div2 id="content-element-vocabulary">
-<head><phrase diff="add">Content </phrase>Element Vocabulary</head>
+<head>Content Element Vocabulary</head>
<p>The following elements specify the structure and principal content aspects of a
document instance:</p>
<ulist>
@@ -2616,7 +2576,7 @@
<td>
<eg xml:space="preserve">
<tt
- <phrase diff="add"><loc href="#style-attribute-extent">tts:extent</loc> = string</phrase>
+ <loc href="#style-attribute-extent">tts:extent</loc> = string
<loc href="#content-attribute-id">xml:id</loc> = ID
<loc href="#content-attribute-lang"><phrase role="reqattr">xml:lang</phrase></loc> = string
<loc href="#content-attribute-space">xml:space</loc> = (<emph>default</emph>|<emph>preserve</emph>) : default
@@ -2637,7 +2597,7 @@
<p>A document instance has an implicit duration that is equal to the
implicit duration of the <el>body</el> element of the document, if present, or zero,
if not present.</p>
-<p diff="add">If the <att>tts:extent</att> attribute is specified on the <el>tt</el>
+<p>If the <att>tts:extent</att> attribute is specified on the <el>tt</el>
element, then it must adhere to <specref ref="style-attribute-extent"/>, in which case it
specifies the spatial extent of the root container region in
which content regions are located and presented. If no <att>tts:extent</att>
@@ -2653,12 +2613,12 @@
<div3 id="document-structure-vocabulary-head">
<head>head</head>
<p>The <el>head</el> element is a container element used to group
-header matter, including metadata<phrase diff="add">,
-profile</phrase>, styling, and layout information.</p>
+header matter, including metadata,
+profile, styling, and layout information.</p>
<p>The <el>head</el> element accepts as its children zero or more
-elements in the <code>Metadata.class</code> element group<phrase diff="add">,
+elements in the <code>Metadata.class</code> element group,
followed by zero or more elements in the
-<code>Parameters.class</code> element group</phrase>,
+<code>Parameters.class</code> element group,
followed by zero or one <el>styling</el> element,
followed by zero or one <el>layout</el> element.</p>
<p>Any metadata specified by children in the <code>Metadata.class</code>
@@ -2682,7 +2642,7 @@
<loc href="#content-attribute-id">xml:id</loc> = ID
<loc href="#content-attribute-lang">xml:lang</loc> = string
<loc href="#content-attribute-space">xml:space</loc> = (<emph>default</emph>|<emph>preserve</emph>)>
- <emph>Content:</emph> <loc href="#element-vocab-group-table">Metadata.class</loc>*<phrase diff="add">, <loc href="#element-vocab-group-table">Parameters.class</loc>*</phrase>, <loc href="#styling-vocabulary-styling">styling</loc>?, <loc href="#layout-vocabulary-layout">layout</loc>?
+ <emph>Content:</emph> <loc href="#element-vocab-group-table">Metadata.class</loc>*, <loc href="#element-vocab-group-table">Parameters.class</loc>*, <loc href="#styling-vocabulary-styling">styling</loc>?, <loc href="#layout-vocabulary-layout">layout</loc>?
</head>
</eg>
</td>
@@ -2725,9 +2685,9 @@
<loc href="#content-attribute-lang">xml:lang</loc> = string
<loc href="#content-attribute-space">xml:space</loc> = (<emph>default</emph>|<emph>preserve</emph>)
{<emph>any attribute in TT Metadata namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Metadata Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Metadata Extension namespace ...</emph>}
{<emph>any attribute in TT Style namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Style Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Style Extension namespace ...</emph>}
{<emph>any attribute not in default or any TT namespace ...</emph>}>
<emph>Content:</emph> <loc href="#element-vocab-group-table">Metadata.class</loc>*, <loc href="#element-vocab-group-table">Animation.class</loc>*, <loc href="#content-vocabulary-div">div</loc>*
</body>
@@ -2752,12 +2712,6 @@
<p>If the external time interval is shorter than the computed duration of the
<el>body</el> element, then the active time interval of a document instance is
truncated to the active end point of the external time interval.</p>
-<p diff="del">If the <att>tts:extent</att> attribute is specified on the <el>body</el>
-element, then it specifies the spatial extent of the root container region in
-which content regions are located and presented. If no <att>tts:extent</att>
-attribute is specified, then the spatial extent of the root container region is
-considered to be determined by the external authoring or presentation
-context.</p>
<p>An author may associate a set of style properties with a
<el>body</el> element by means of either the <att>style</att>
attribute or inline style attributes or a combination thereof.</p>
@@ -2765,33 +2719,30 @@
<p>Style properties that are associated with a <el>body</el> element
in a document instance are available for style inheritance by
descendant content elements such as <el>div</el>, <el>p</el>,
-<phrase diff="del">and</phrase>
<el>span</el>
-<phrase diff="add">and <el>br</el></phrase>.</p>
-</note>
-<p diff="del">The declared value of an inline style attribute on a <el>body</el>
-element must not be <code>inherit</code>.</p>
-<p diff="chg">If no <att>timeContainer</att> attribute is specified on a
+and <el>br</el>.</p>
+</note>
+<p>If no <att>timeContainer</att> attribute is specified on a
<el>body</el> element, then it must be interpreted as having
-<emph><phrase diff="del">sequential</phrase><phrase diff="add">parallel</phrase></emph>
+<emph>parallel</emph>
time containment semantics.</p>
</div3>
<div3 id="content-vocabulary-div">
<head>div</head>
<p>The <el>div</el> element functions as a logical container and a temporal
structuring element for a sequence of textual content units represented as
-logical <phrase diff="add">sub-divisions or </phrase>paragraphs.</p>
+logical sub-divisions or paragraphs.</p>
<note role="explanation">
<p>When rendered on a continuous (non-paged) visual presentation medium,
a <el>div</el> element is expected to generate
-<phrase diff="del">a single</phrase><phrase diff="add">one or more</phrase> block
-area<phrase diff="add">s</phrase>
-that contain<phrase diff="del">s</phrase> zero or more child block areas
+one or more block
+areas
+that contain zero or more child block areas
generated by the <el>div</el> element's
-<phrase diff="del">child</phrase><phrase diff="add">descendant</phrase>
+descendant
<el>p</el> elements.
</p>
-<p>If <phrase diff="del">the single</phrase><phrase diff="add">some</phrase>
+<p>If some
block area generated by a <el>div</el> element does
not contain any child areas, then it is not expected to be presented.</p>
</note>
@@ -2801,13 +2752,8 @@
elements in the <code>Animation.class</code> element group,
followed by
zero or more
-<phrase diff="add"><el>div</el> or </phrase>
+<el>div</el> or
<el>p</el> elements.</p>
-<note role="motivation" diff="del">
-<p>The core vocabulary intentionally does not support nested divisions in order to reduce
-the complexity of the profile to match that of the legacy distribution formats with which
-the core vocabulary was designed to interoperate.</p>
-</note>
<p>Any metadata specified by children in the <code>Metadata.class</code>
element group applies semantically to the <el>div</el> element and its descendants as a whole.</p>
<p>Any animation elements specified by children in the <code>Animation.class</code>
@@ -2829,9 +2775,9 @@
<loc href="#content-attribute-lang">xml:lang</loc> = string
<loc href="#content-attribute-space">xml:space</loc> = (<emph>default</emph>|<emph>preserve</emph>)
{<emph>any attribute in TT Metadata namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Metadata Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Metadata Extension namespace ...</emph>}
{<emph>any attribute in TT Style namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Style Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Style Extension namespace ...</emph>}
{<emph>any attribute not in default or any TT namespace ...</emph>}>
<emph>Content:</emph> <loc
href="#element-vocab-group-table">Metadata.class</loc>*, <loc
@@ -2847,15 +2793,15 @@
the <att>style</att> attribute or inline style attributes or a combination thereof.</p>
<note role="explanation">
<p>Style properties that are associated
-<phrase diff="del">to</phrase><phrase diff="add">with</phrase>
+with
a <el>div</el> element in a document instance
are available for style inheritance by descendant content elements such as
-<phrase diff="add"><el>div</el>, </phrase>
-<el>p</el><phrase diff="add">,</phrase>
-<phrase diff="del">and</phrase> <el>span</el><phrase diff="add">, and
-<el>br</el></phrase>.</p>
-</note>
-<p diff="chg">If no <att>timeContainer</att> attribute is specified on
+<el>div</el>,
+<el>p</el>,
+<el>span</el>, and
+<el>br</el>.</p>
+</note>
+<p>If no <att>timeContainer</att> attribute is specified on
a <el>div</el> element, then it must be interpreted as having
<emph>parallel</emph> time containment semantics.</p>
</div3>
@@ -2893,9 +2839,9 @@
<loc href="#content-attribute-lang">xml:lang</loc> = string
<loc href="#content-attribute-space">xml:space</loc> = (<emph>default</emph>|<emph>preserve</emph>)
{<emph>any attribute in TT Metadata namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Metadata Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Metadata Extension namespace ...</emph>}
{<emph>any attribute in TT Style namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Style Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Style Extension namespace ...</emph>}
{<emph>any attribute not in default or any TT namespace ...</emph>}>
<emph>Content:</emph> <loc
href="#element-vocab-group-table">Metadata.class</loc>*, <loc
@@ -2907,16 +2853,16 @@
</tr>
</tbody>
</table>
-<p diff="add">An author may associate a set of style properties with a
+<p>An author may associate a set of style properties with a
<el>p</el> element by means of either the <att>style</att>
attribute or inline style attributes or a combination thereof.</p>
-<note role="explanation" diff="add">
+<note role="explanation">
<p>Style properties that are associated with a <el>p</el> element
in a document instance are available for style inheritance by
descendant content elements such as <el>span</el> and
<el>br</el>.</p>
</note>
-<p diff="add">If no <att>timeContainer</att> attribute is specified on
+<p>If no <att>timeContainer</att> attribute is specified on
a <el>p</el> element, then it must be interpreted as having
<emph>parallel</emph> time containment semantics.</p>
<p>If a sequence of children of a <el>p</el> element
@@ -2937,14 +2883,9 @@
elements in the <code>Animation.class</code> element group,
followed by
zero or more
-<phrase diff="add"><el>span</el> elements ,</phrase>
-<el>br</el> element<phrase diff="add">s,</phrase>
+<el>span</el> elements,
+<el>br</el> elements,
or text nodes interpreted as anonymous spans.</p>
-<note role="motivation" diff="del">
-<p>The core vocabulary intentionally does not support nested spans in order to reduce
-the complexity of the profile to match that of the legacy distribution formats with which
-the core vocabulary was designed to interoperate.</p>
-</note>
<p>Any metadata specified by children in the <code>Metadata.class</code>
element group applies semantically to the <el>span</el> element and its descendants as a whole.</p>
<p>Any animation elements specified by children in the <code>Animation.class</code>
@@ -2966,9 +2907,9 @@
<loc href="#content-attribute-lang">xml:lang</loc> = string
<loc href="#content-attribute-space">xml:space</loc> = (<emph>default</emph>|<emph>preserve</emph>)
{<emph>any attribute in TT Metadata namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Metadata Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Metadata Extension namespace ...</emph>}
{<emph>any attribute in TT Style namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Style Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Style Extension namespace ...</emph>}
{<emph>any attribute not in default or any TT namespace ...</emph>}>
<emph>Content:</emph> <loc
href="#element-vocab-group-table">Metadata.class</loc>*, <loc
@@ -2980,16 +2921,16 @@
</tr>
</tbody>
</table>
-<p diff="add">An author may associate a set of style properties with a
+<p>An author may associate a set of style properties with a
<el>span</el> element by means of either the <att>style</att>
attribute or inline style attributes or a combination thereof.</p>
-<note role="explanation" diff="add">
+<note role="explanation">
<p>Style properties that are associated with a <el>span</el> element
in a document instance are available for style inheritance by
descendant content elements such as <el>span</el> and
<el>br</el>.</p>
</note>
-<p diff="add">If no <att>timeContainer</att> attribute is specified on
+<p>If no <att>timeContainer</att> attribute is specified on
a <el>span</el> element, then it must be interpreted as having
<emph>parallel</emph> time containment semantics.</p>
</div3>
@@ -3008,9 +2949,9 @@
<loc href="#content-attribute-lang">xml:lang</loc> = string
<loc href="#content-attribute-space">xml:space</loc> = (<emph>default</emph>|<emph>preserve</emph>)
{<emph>any attribute in TT Metadata namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Metadata Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Metadata Extension namespace ...</emph>}
{<emph>any attribute in TT Style namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Style Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Style Extension namespace ...</emph>}
{<emph>any attribute not in default or any TT namespace ...</emph>}>
<emph>Content:</emph> <loc href="#element-vocab-group-table">Metadata.class</loc>*, <loc href="#element-vocab-group-table">Animation.class</loc>*
</br>
@@ -3032,7 +2973,7 @@
</div3>
</div2>
<div2 id="content-attribute-vocabulary">
-<head><phrase diff="add">Content </phrase>Attribute Vocabulary</head>
+<head>Content Attribute Vocabulary</head>
<p>This section defines the following common attributes used with many or all element types
in the core vocabulary catalog:</p>
<ulist>
@@ -3137,7 +3078,7 @@
<code><?xml-stylesheet ... ?></code> processing instruction is defined
by this specification.</p>
<div2 id="styling-element-vocabulary">
-<head><phrase diff="add">Styling </phrase>Element Vocabulary</head>
+<head>Styling Element Vocabulary</head>
<p>The following elements specify the structure and principal styling aspects of a
document instance:</p>
<ulist>
@@ -3176,10 +3117,9 @@
<div3 id="styling-vocabulary-style">
<head>style</head>
<p>The <el>style</el> element is used to define
-<phrase diff="del">a single style specification or </phrase>a set
-of style specifications<phrase diff="add"> expressed as a
+a set of style specifications expressed as a
specified style set in accordance with
-<specref ref="semantics-style-resolution-processing-sss"/></phrase>.</p>
+<specref ref="semantics-style-resolution-processing-sss"/>.</p>
<p>The <el>style</el> element accepts as its children zero or more <el>metadata</el> elements.</p>
<table id="elt-syntax-style" role="syntax">
<caption>XML Representation – Element Information Item: style</caption>
@@ -3202,43 +3142,12 @@
</tr>
</tbody>
</table>
-<p diff="del">The declared value of an inline style attribute on a <el>style</el>
-element must not be <code>inherit</code>.</p>
-<p diff="del">A <el>style</el> element is considered to define a
-<emph>computed style specification set</emph>, where the set is determined using the
-following ordered rules:</p>
-<olist diff="del">
-<item>
-<p>If a <att>style</att> attribute is specified on the <el>style</el> element,
-then the set must be initialized so as to include each style specification contained in
-the <emph>computed style specification set</emph> of each element referenced by
-the <att>style</att> attribute. If the same named style property is specified
-by more than one such referenced computed style specification set, then the value
-of the named style property in following referenced sets takes precedence over the value
-of the named style property in prior referenced sets, where following and prior are
-determined according to the order of the referenced ID in the IDREFS value of the <att>style</att>
-attribute.</p>
-</item>
-<item>
-<p>If the <el>style</el> element specifies an attribute from the TT Style Namespace
-or TT Style Extension Namespace, then each style
-specification defined by that attribute either overrides an existing style
-specification already contained within the set or augments the set with a new style
-specification according to whether or not the named style property of the style specification
-matches the named style property of an existing style specification already included in
-the set.</p>
-</item>
-</olist>
-<p diff="del">Two named style properties are considered to match if their expanded names match,
-where <emph>expanded name</emph> is defined by <bibref ref="xmlns10"/>, §2.1,
-and the expanded name of a named style property is the expanded name of the attribute
-that specifies the named style property.</p>
<p>If a <el>style</el> element appears as a descendant of a
<el>region</el> element, then the <el>style</el> element must be
ignored for the purpose of computing referential styles as defined by
<specref ref="semantics-style-association-referential"/> and <specref
ref="semantics-style-association-chained-referential"/>.</p>
-<note role="explanation" diff="add">
+<note role="explanation">
<p>That is to say, when referential styling is used by an element to
refer to a <el>style</el> element, then the referenced <el>style</el>
element must appear as a descendant of the <el>styling</el> element, and
@@ -3247,7 +3156,7 @@
</div3>
</div2>
<div2 id="styling-attribute-vocabulary">
-<head><phrase diff="add">Styling </phrase>Attribute Vocabulary</head>
+<head>Styling Attribute Vocabulary</head>
<p>This section defines the <specref ref="style-attribute-style"/> attribute used
with both style definition elements as well as content elements.</p>
<p>In addition, this section specifies the following attributes in the TT Style Namespace
@@ -3282,7 +3191,7 @@
</ulist>
<p>Unless explicitly stated otherwise, linear white-space (LWSP) may
appear between tokens of a value of a TT
-Style<phrase diff="add"> or TT Style Extension</phrase>
+Style or TT Style Extension
Property.</p>
<note role="explanation">
<p>This specification makes use of <emph>lowerCamelCased</emph> local
@@ -3301,11 +3210,11 @@
<div3 id="style-attribute-style">
<head>style</head>
<p>The <att>style</att> attribute is used
-<phrase diff="add">by referential style association</phrase>
+by referential style association
to reference one or more <el>style</el>
elements each of which define a
-<phrase diff="del">computed</phrase><phrase diff="add">specified</phrase>
-style<phrase diff="del"> specification</phrase> set.</p>
+specified
+style set.</p>
<p>The <att>style</att> attribute may be specified by an instance of the following
element types:</p>
<ulist>
@@ -3318,9 +3227,9 @@
</ulist>
<note role="usage">
<p>See the specific element type definitions that permit use of the
-<att>style</att> attribute<phrase diff="add">, as well as <specref
+<att>style</att> attribute, as well as <specref
ref="semantics-style-association-referential"/> and <specref
-ref="semantics-style-association-chained-referential"/>,</phrase> for
+ref="semantics-style-association-chained-referential"/>, for
further information on its semantics.</p>
</note>
</div3>
@@ -3329,7 +3238,7 @@
<p>The <att>tts:backgroundColor</att> attribute is used to specify a style property that
defines the background color of a region or an area generated by content flowed into a region.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-backgroundColor" role="common">
@@ -3338,8 +3247,7 @@
<tr>
<td><emph>Values:</emph></td>
<td>
-<loc href="#style-value-color"><color></loc><phrase diff="del"> |
-<code>inherit</code></phrase>
+<loc href="#style-value-color"><color></loc>
</td>
</tr>
<tr>
@@ -3370,7 +3278,7 @@
</tr>
</tbody>
</table>
-<p diff="add">For the purpose of determining applicability of this style property,
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
span.</p>
<p>The <att>tts:backgroundColor</att> style is illustrated by the following example.</p>
@@ -3417,7 +3325,7 @@
<p>The <att>tts:color</att> attribute is used to specify a style property that
defines the foreground color of marks associated with an area generated by content flowed into a region.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-color" role="common">
@@ -3426,13 +3334,12 @@
<tr>
<td><emph>Values:</emph></td>
<td>
-<loc href="#style-value-color"><color></loc><phrase diff="del"> |
-<code>inherit</code></phrase>
+<loc href="#style-value-color"><color></loc>
</td>
</tr>
<tr>
<td><emph>Initial:</emph></td>
-<td><phrase diff="chg">see prose</phrase></td>
+<td>see prose</td>
</tr>
<tr>
<td><emph>Applies to:</emph></td>
@@ -3454,11 +3361,10 @@
</tr>
</tbody>
</table>
-<p diff="chg">For the purpose of determining applicability of this style property,
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
-span<phrase diff="del">, where the value of this style property on the anonymous span is considered to be
-<code>inherit</code></phrase>.</p>
-<p diff="add">The initial value of the <att>tts:color</att> property
+span.</p>
+<p>The initial value of the <att>tts:color</att> property
is considered to be implementation dependent. In the absence of
end-user preference information, a conformant presentation processor
should use an initial value that is highly contrastive to the
@@ -3507,7 +3413,7 @@
defines the directionality of an embedding or override according to
the Unicode bidirectional algorithm.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-direction" role="common">
@@ -3517,8 +3423,7 @@
<td><emph>Values:</emph></td>
<td>
<code>ltr</code> |
-<code>rtl</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>rtl</code>
</td>
</tr>
<tr>
@@ -3544,14 +3449,14 @@
</tr>
<tr>
<td><emph>Animatable:</emph></td>
-<td><phrase diff="del">none</phrase><phrase diff="add">discrete</phrase></td>
-</tr>
-</tbody>
-</table>
-<p diff="add">For the purpose of determining applicability of this style property,
+<td>discrete</td>
+</tr>
+</tbody>
+</table>
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
span.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must ignore the attribute.</p>
<p>The <att>tts:direction</att> style is illustrated by the following example.</p>
<table id="style-attribute-direction-example-1" role="example">
@@ -3602,7 +3507,7 @@
defines whether an element is a candidate for layout and composition
in a region.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-display" role="common">
@@ -3612,8 +3517,7 @@
<td><emph>Values:</emph></td>
<td>
<code>auto</code> |
-<code>none</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>none</code>
</td>
</tr>
<tr>
@@ -3628,7 +3532,7 @@
<loc href="#document-structure-vocabulary-body"><el>body</el></loc>,
<loc href="#content-vocabulary-div"><el>div</el></loc>,
<loc href="#content-vocabulary-p"><el>p</el></loc>,
-<phrase diff="add"><loc href="#layout-vocabulary-region"><el>region</el></loc></phrase>,
+<loc href="#layout-vocabulary-region"><el>region</el></loc>,
<loc href="#content-vocabulary-span"><el>span</el></loc>
</td>
</tr>
@@ -3646,7 +3550,7 @@
</tr>
</tbody>
</table>
-<p diff="add">For the purpose of determining applicability of this style property,
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
span.</p>
<p>If the value of this attribute is <code>auto</code>,
@@ -3735,7 +3639,7 @@
<p>The <att>tts:displayAlign</att> attribute is used to specify a style property that
defines the alignment of block areas in the block progression direction.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-displayAlign" role="common">
@@ -3746,8 +3650,7 @@
<td>
<code>before</code> |
<code>center</code> |
-<code>after</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>after</code>
</td>
</tr>
<tr>
@@ -3772,11 +3675,11 @@
</tr>
<tr>
<td><emph>Animatable:</emph></td>
-<td><phrase diff="del">none</phrase><phrase diff="add">discrete</phrase></td>
-</tr>
-</tbody>
-</table>
-<p diff="add">If a specified value of this attribute is not supported,
+<td>discrete</td>
+</tr>
+</tbody>
+</table>
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>before</code> were specified.</p>
<p>The <att>tts:displayAlign</att> style is illustrated by the following example.</p>
@@ -3851,9 +3754,9 @@
defines how to dynamically flow content into and out of a region over some time
interval.</p>
<p>This style property applies only to a region when the <att>tts:overflow</att>
-property for that region has the value <phrase diff="chg"><code>dynamic</code></phrase>.</p>
+property for that region has the value <code>dynamic</code>.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-dynamicFlow" role="common">
@@ -3862,7 +3765,7 @@
<tr>
<td><emph>Values:</emph></td>
<td>
-<code>none</code><phrase diff="add"> | <code>rollUp</code></phrase> |
+<code>none</code> | <code>rollUp</code> |
<loc href="#style-value-flowFunction"><flowFunction></loc>+ <loc href="#style-value-flowIntervalFunction"><flowIntervalFunction></loc>*
</td>
</tr>
@@ -3886,24 +3789,19 @@
</tr>
<tr>
<td><emph>Animatable:</emph></td>
-<td><phrase diff="del">none</phrase><phrase diff="add">discrete</phrase></td>
+<td>discrete</td>
</tr>
</tbody>
</table>
<p>If the value of this attribute is <code>none</code>, then no
dynamic flow semantics apply.</p>
-<p diff="add">If the value of this attribute is <code>rollUp</code>, then
+<p>If the value of this attribute is <code>rollUp</code>, then
this value is interpreted as a shorthand value equivalent to
<code>out(line,smooth) inter(0.433s)</code>.</p>
<p>If the value of this attribute contains a single <loc
href="#style-value-flowFunction"><flowFunction></loc>, then that
-flow function applies equally to <emph>fill into</emph><phrase
-diff="del">, <emph>reflow within</emph>,</phrase> and <emph>clear
+flow function applies equally to <emph>fill into</emph> and <emph>clear
from</emph> dynamic flow operations.</p>
-<p diff="del">If a reflow <code>within()</code> flow function is
-specified, but no clear <code>out()</code> flow function is specified,
-or vice-versa, then the function applies equally to both <emph>reflow
-within</emph> and <emph>clear from</emph> dynamic flow operations.</p>
<p>If either <code>intra()</code> or <code>inter()</code> <loc
href="#style-value-flowIntervalFunction"><flowIntervalFunction></loc>
is not specified, then the <code>auto</code> value for the missing
@@ -3912,7 +3810,7 @@
applies.</p>
<p>The normative processing model for dynamic flow behavior is
specified in <specref ref="dynamicFlowModel"/>.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>none</code> were specified.</p>
<p>The <att>tts:dynamicFlow</att> style is illustrated by the
@@ -3930,7 +3828,7 @@
<style tts:backgroundColor="transparent"/>
<style tts:fontFamily="proportionalSansSerif"/>
<style tts:fontSize="18px"/>
- <style <phrase role="strong">tts:overflow="<phrase diff="chg">dynamic</phrase>"</phrase>/>
+ <style <phrase role="strong">tts:overflow="dynamic"</phrase>/>
<style <phrase role="strong">tts:dynamicFlow="in(word,jump) out(line,smooth) inter(3s)"</phrase>/>
</region>
...
@@ -3991,7 +3889,7 @@
<emph>width</emph> and <emph>height</emph> of a region area
(which may be the root container region).</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-extent" role="common">
@@ -4001,8 +3899,7 @@
<td><emph>Values:</emph></td>
<td>
<code>auto</code> |
-<loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc><phrase diff="del"> |
-<code>inherit</code></phrase>
+<loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc>
</td>
</tr>
<tr>
@@ -4012,7 +3909,7 @@
<tr>
<td><emph>Applies to:</emph></td>
<td>
-<phrase diff="chg"><loc href="#document-structure-vocabulary-tt"><el>tt</el></loc></phrase>,
+<loc href="#document-structure-vocabulary-tt"><el>tt</el></loc>,
<loc href="#layout-vocabulary-region"><el>region</el></loc>
</td>
</tr>
@@ -4026,7 +3923,7 @@
</tr>
<tr>
<td><emph>Animatable:</emph></td>
-<td><phrase diff="del">none</phrase><phrase diff="add">discrete</phrase></td>
+<td>discrete</td>
</tr>
</tbody>
</table>
@@ -4040,19 +3937,19 @@
</p>
<p>
The root container extent is determined either by a
-<att>tts:extent</att> specified on the <el diff="chg">tt</el> element, if
+<att>tts:extent</att> specified on the <el>tt</el> element, if
present, or by the external authoring context, if not present.
-<phrase diff="del">In the former case,</phrase><phrase diff="add">If
-<att>tts:extent</att> is specified on the <el>tt</el> element,</phrase>
-<phrase diff="del">if</phrase><phrase diff="add">then</phrase>
+If
+<att>tts:extent</att> is specified on the <el>tt</el> element,
+then
the width and height
-<phrase diff="del">is</phrase><phrase diff="add">must be</phrase>
+must be
expressed in terms of two
<loc href="#style-value-length"><length></loc> specifications,
-<phrase diff="del">then</phrase><phrase diff="add">and</phrase>
+and
these specifications must be expressed as non-percentage,
definite lengths using pixel units.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>auto</code> were specified.</p>
<p>The <att>tts:extent</att> style is illustrated by the following example.</p>
@@ -4097,7 +3994,7 @@
defines the font family from which glyphs are selected for glyph areas generated
by content flowed into a region.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-fontFamily" role="common">
@@ -4108,8 +4005,7 @@
<td>
(<loc href="#style-value-familyName"><familyName></loc> | <loc href="#style-value-genericFamilyName"><genericFamilyName></loc>)
(<code>","</code>
- (<loc href="#style-value-familyName"><familyName></loc> | <loc href="#style-value-genericFamilyName"><genericFamilyName></loc>))*<phrase diff="del"> |
-<code>inherit</code></phrase>
+ (<loc href="#style-value-familyName"><familyName></loc> | <loc href="#style-value-genericFamilyName"><genericFamilyName></loc>))*
</td>
</tr>
<tr>
@@ -4140,11 +4036,10 @@
<p>The initial value, <code>default</code>, is a generic font family name, and is
further described in <specref ref="style-value-genericFamilyName"/> below.</p>
</note>
-<p diff="chg">For the purpose of determining applicability of this style property,
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
-span<phrase diff="del">, where the value of this style property on the anonymous span is considered to be
-<code>inherit</code></phrase>.</p>
-<p diff="add">If a specified font family is not available, then a
+span.</p>
+<p>If a specified font family is not available, then a
presentation processor must attempt to map the specified font family
to an available font family that has similar typographic
characteristics, or, in the absence of such a mapping, it must
@@ -4207,7 +4102,7 @@
generated by content flowed into a region, where font size is interpreted as a
scaling transform to the font's design EM square.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-fontSize" role="common">
@@ -4216,8 +4111,7 @@
<tr>
<td><emph>Values:</emph></td>
<td>
-<loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc>?<phrase diff="del"> |
-<code>inherit</code></phrase>
+<loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc>?
</td>
</tr>
<tr>
@@ -4256,11 +4150,10 @@
<p>If horizontal and vertical sizes are expressed independently, then the
metrics of the <loc href="#style-value-length"><length></loc> values must be the same.</p>
<p>The <loc href="#style-value-length"><length></loc> value(s) used to express font size must be non-negative.</p>
-<p diff="chg">For the purpose of determining applicability of this style property,
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
-span<phrase diff="del">, where the value of this style property on the anonymous span is considered to be
-<code>inherit</code></phrase>.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+span.</p>
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>1c</code> were specified.</p>
<p>The <att>tts:fontSize</att> style is illustrated by the following example.</p>
@@ -4314,7 +4207,7 @@
style value to specific font face or style parameterization is not determined
by this specification.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-fontStyle" role="common">
@@ -4326,8 +4219,7 @@
<code>normal</code> |
<code>italic</code> |
<code>oblique</code> |
-<code>reverseOblique</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>reverseOblique</code>
</td>
</tr>
<tr>
@@ -4354,20 +4246,13 @@
</tr>
</tbody>
</table>
-<p diff="chg">For the purpose of determining applicability of this style property,
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
-span<phrase diff="del">, where the value of this style property on the anonymous span is considered to be
-<code>inherit</code></phrase>.</p>
+span.</p>
<p>Use of values <code>oblique</code> and <code>reverseOblique</code>
denote a shear and reverse shear transformation (at an unspecified
-angle) in the inline progression dimension.<phrase diff="del"> A
-conformant processor may perform such a transform on a font in order
-to satisfy this authorial intent for the purpose of presentation
-processing. If a specified font style is not available or a shear or
-reverse shear transformation is not supported, then the processor must
-interpret the font style as if the value <code>normal</code> were
-specified for the purpose of presentation processing.</phrase></p>
-<p diff="add">If a specified font style is not available, then a
+angle) in the inline progression dimension.</p>
+<p>If a specified font style is not available, then a
presentation processor must attempt to map the specified font style
to an available font style that has similar typographic
characteristics, or, in the absence of such a mapping, it must
@@ -4422,7 +4307,7 @@
weight value to specific font face or weight parameterization is not determined
by this specification.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-fontWeight" role="common">
@@ -4432,8 +4317,7 @@
<td><emph>Values:</emph></td>
<td>
<code>normal</code> |
-<code>bold</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>bold</code>
</td>
</tr>
<tr>
@@ -4460,11 +4344,10 @@
</tr>
</tbody>
</table>
-<p diff="chg">For the purpose of determining applicability of this style property,
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
-span<phrase diff="del">, where the value of this style property on the anonymous span is considered to be
-<code>inherit</code></phrase>.</p>
-<p diff="chg">If a specified font weight is not available, then a
+span.</p>
+<p>If a specified font weight is not available, then a
presentation processor must attempt to map the specified font weight
to an available font weight that has similar typographic
characteristics, or, in the absence of such a mapping, it must
@@ -4517,7 +4400,7 @@
<p>The <att>tts:lineHeight</att> attribute is used to specify a style property that
defines the inter-baseline separation between line areas generated by content flowed into a region.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-lineHeight" role="common">
@@ -4527,8 +4410,7 @@
<td><emph>Values:</emph></td>
<td>
<code>normal</code> |
-<loc href="#style-value-length"><length></loc><phrase diff="del"> |
-<code>inherit</code></phrase>
+<loc href="#style-value-length"><length></loc>
</td>
</tr>
<tr>
@@ -4557,13 +4439,12 @@
</table>
<p>If the value of this attribute is <code>normal</code>, then the
initial value of the style property must be considered to be the same
-as the largest font size that applies to any <phrase
-diff="del">child</phrase><phrase diff="add">descendant</phrase>
-element.</p>
+as the largest font size that applies to any
+descendant element.</p>
<p>If specified as a <loc
href="#style-value-length"><length></loc>, then the length must
be non-negative.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>normal</code> were specified.</p>
<p>The <att>tts:lineHeight</att> style is illustrated by the following example.</p>
@@ -4617,15 +4498,12 @@
<head>tts:opacity</head>
<p>The <att>tts:opacity</att> attribute is used to specify a style property that
defines the opacity (or transparency) of marks associated with a
-region<phrase diff="del"> (such as
-a region's background color) or marks associated with areas generated by a given
-content element to which opacity applies</phrase>.</p>
-<p>When presented onto a visual medium, the opacity of the <phrase
-diff="chg">region</phrase> is applied uniformly and on a linear scale
-to all marks produced by <phrase diff="chg">content targeted to the
-region</phrase>.</p>
+region.</p>
+<p>When presented onto a visual medium, the opacity of the region is applied uniformly and on a linear scale
+to all marks produced by content targeted to the
+region.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-opacity" role="common">
@@ -4634,8 +4512,7 @@
<tr>
<td><emph>Values:</emph></td>
<td>
-<loc href="#style-value-alpha"><alpha></loc><phrase diff="del"> |
-<code>inherit</code></phrase>
+<loc href="#style-value-alpha"><alpha></loc>
</td>
</tr>
<tr>
@@ -4739,7 +4616,7 @@
region area with respect to the origin of the root container extent,
if specified, or the external authoring context, if not specified.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-origin" role="common">
@@ -4749,8 +4626,7 @@
<td><emph>Values:</emph></td>
<td>
<code>auto</code> |
-<loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc><phrase diff="del"> |
-<code>inherit</code></phrase>
+<loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc>
</td>
</tr>
<tr>
@@ -4773,7 +4649,7 @@
</tr>
<tr>
<td><emph>Animatable:</emph></td>
-<td><phrase diff="del">none</phrase><phrase diff="add">discrete</phrase></td>
+<td>discrete</td>
</tr>
</tbody>
</table>
@@ -4783,7 +4659,7 @@
<p>If the value of this attribute is <code>auto</code>, then the initial value
of the style property must be considered to be the same as the root container origin.
The root container origin is determined by the external authoring context.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>auto</code> were specified.</p>
<p>The <att>tts:origin</att> style is illustrated by the following example.</p>
@@ -4828,7 +4704,7 @@
defines whether a region area is clipped or not if the descendant areas of the region overflow
its extent.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-overflow" role="common">
@@ -4839,8 +4715,7 @@
<td>
<code>visible</code> |
<code>hidden</code> |
-<code><phrase diff="chg">dynamic</phrase></code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>dynamic</code>
</td>
</tr>
<tr>
@@ -4863,14 +4738,14 @@
</tr>
<tr>
<td><emph>Animatable:</emph></td>
-<td><phrase diff="del">none</phrase><phrase diff="add">discrete</phrase></td>
+<td>discrete</td>
</tr>
</tbody>
</table>
<p>If the value of this attribute is <code>visible</code>, then content should
not be clipped outside of the affected region, and region composition and layout
must be performed as if the region's width and height were
-<phrase diff="del">infinite</phrase><phrase diff="add">unconstrained</phrase>,
+unconstrained,
but with
a well-defined origin. If the value is <code>hidden</code>, then content should
be clipped outside of the affected region.</p>
@@ -4881,12 +4756,12 @@
region is <code>visible</code> and if the applicable <att>tts:wrapOption</att>
style is <code>noWrap</code>.</p>
</note>
-<p>If the value of this attribute is <phrase diff="chg"><code>dynamic</code></phrase>, then content is
+<p>If the value of this attribute is <code>dynamic</code>, then content is
dynamically flowed into and out of the affected region according to the values
of the <att>tts:dynamicFlow</att> style property; in this case, the
semantics of the <att>tts:dynamicFlow</att> apply whether or not the
affected region has overflowed.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>hidden</code> were specified.</p>
<p>The <att>tts:overflow</att> style is illustrated by the following example.</p>
@@ -4958,10 +4833,9 @@
<div3 id="style-attribute-padding">
<head>tts:padding</head>
<p>The <att>tts:padding</att> attribute is used to specify padding (or inset)
-space on all sides of a region area<phrase diff="del"> or a content area produced by a content
-element</phrase>.</p>
+space on all sides of a region area.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-padding" role="common">
@@ -4973,13 +4847,12 @@
<loc href="#style-value-length"><length></loc> |
<loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc> |
<loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc> |
-<loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc><phrase diff="del"> |
-<code>inherit</code></phrase>
+<loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc> <loc href="#style-value-length"><length></loc>
</td>
</tr>
<tr>
<td><emph>Initial:</emph></td>
-<td><code>0<phrase diff="add">px</phrase></code></td>
+<td><code>0px</code></td>
</tr>
<tr>
<td><emph>Applies to:</emph></td>
@@ -5010,7 +4883,7 @@
to the after edge.
If four <loc href="#style-value-length"><length></loc> specifications are provided, then they apply to before, end,
after, and start edges, respectively.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>0px</code> were specified.</p>
<p>The <att>tts:padding</att> style is illustrated by the following example.</p>
@@ -5066,7 +4939,7 @@
constraints on when the background color of a region is intended to be
presented.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-showBackground" role="common">
@@ -5076,8 +4949,7 @@
<td><emph>Values:</emph></td>
<td>
<code>always</code> |
-<code>whenActive</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>whenActive</code>
</td>
</tr>
<tr>
@@ -5109,7 +4981,7 @@
processing on a visual medium; if the value is <code>whenActive</code>,
then the background color of a region is rendered only when some
content is selected into the region.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>always</code> were specified.</p>
<p>The <att>tts:showBackground</att> style is illustrated by the following example.</p>
@@ -5166,7 +5038,7 @@
defines how inline areas are aligned within a containing block area in the inline progression
direction.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-textAlign" role="common">
@@ -5179,8 +5051,7 @@
<code>center</code> |
<code>right</code> |
<code>start</code> |
-<code>end</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>end</code>
</td>
</tr>
<tr>
@@ -5207,7 +5078,7 @@
</tr>
</tbody>
</table>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>start</code> were specified.</p>
<p>The <att>tts:textAlign</att> style is illustrated by the following example.</p>
@@ -5266,7 +5137,7 @@
defines a text decoration effect to apply to glyph areas or other inline
areas that are generated by content flowed into a region.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-textDecoration" role="common">
@@ -5280,13 +5151,12 @@
<code>underline</code> |
<code>noUnderline</code>
] || [
-<phrase diff="chg"><code>lineThrough</code></phrase> |
-<phrase diff="chg"><code>noLineThrough</code></phrase>
+<code>lineThrough</code> |
+<code>noLineThrough</code>
] || [
<code>overline</code> |
<code>noOverline</code>
-] ]<phrase diff="del"> |
-<code>inherit</code></phrase>
+] ]
</td>
</tr>
<tr>
@@ -5295,17 +5165,12 @@
</tr>
<tr>
<td><emph>Applies to:</emph></td>
-<td><phrase diff="del"><loc
-href="#document-structure-vocabulary-body"><el>body</el></loc>, <loc
-href="#content-vocabulary-div"><el>div</el></loc>, <loc
-href="#content-vocabulary-p"><el>p</el></loc>, <loc
-href="#layout-vocabulary-region"><el>region</el></loc>,</phrase><loc
+<td><loc
href="#content-vocabulary-span"><el>span</el></loc></td>
</tr>
<tr>
<td><emph>Inherited:</emph></td>
-<td><phrase diff="del">no, but see prose of <bibref ref="xsl11"/>,
-§ 7.16.4</phrase><phrase diff="add">yes</phrase></td>
+<td>yes</td>
</tr>
<tr>
<td><emph>Percentages:</emph></td>
@@ -5317,10 +5182,10 @@
</tr>
</tbody>
</table>
-<p diff="add">For the purpose of determining applicability of this
+<p>For the purpose of determining applicability of this
style property, each character child of a <el>p</el> element is
considered to be enclosed in an anonymous span.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>none</code> were specified.</p>
<p>The <att>tts:textDecoration</att> style is illustrated by the following example.</p>
@@ -5376,7 +5241,7 @@
defines a text outline effect to apply to glyphs that are selected for glyph areas generated
by content flowed into a region.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-textOutline" role="common">
@@ -5388,8 +5253,7 @@
<code>none</code> |
<loc href="#style-value-color"><color></loc>?
<loc href="#style-value-length"><length></loc>
-<loc href="#style-value-length"><length></loc>?<phrase diff="del"> |
-<code>inherit</code></phrase>
+<loc href="#style-value-length"><length></loc>?
</td>
</tr>
<tr>
@@ -5404,7 +5268,7 @@
</tr>
<tr>
<td><emph>Inherited:</emph></td>
-<td><phrase diff="del">no</phrase><phrase diff="add">yes</phrase></td>
+<td>yes</td>
</tr>
<tr>
<td><emph>Percentages:</emph></td>
@@ -5416,17 +5280,16 @@
</tr>
</tbody>
</table>
-<p diff="chg">For the purpose of determining applicability of this style property,
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
-span<phrase diff="del">, where the value of this style property on the anonymous span is considered to be
-<code>inherit</code></phrase>.</p>
+span.</p>
<p>The value of this attribute consists of an optional <loc href="#style-value-color"><color></loc> term
followed by one or two <loc href="#style-value-length"><length></loc> terms. If a <emph>color</emph> term is
present, then it denotes the outline color; if no <emph>color</emph> term is
present, the computed value of the <att>tts:color</att> applies. The first
<emph>length</emph> term denotes the outline thickness and the second length
term, if present, indicates the blur radius.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>none</code> were specified.</p>
<p>The <att>tts:textOutline</att> style is illustrated by the following
@@ -5476,7 +5339,7 @@
defines a directional embedding or override according to
the Unicode bidirectional algorithm.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-unicodeBidi" role="common">
@@ -5487,8 +5350,7 @@
<td>
<code>normal</code> |
<code>embed</code> |
-<code>bidiOverride</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>bidiOverride</code>
</td>
</tr>
<tr>
@@ -5514,14 +5376,14 @@
</tr>
<tr>
<td><emph>Animatable:</emph></td>
-<td><phrase diff="del">none</phrase><phrase diff="add">discrete</phrase></td>
-</tr>
-</tbody>
-</table>
-<p diff="add">For the purpose of determining applicability of this style property,
+<td>discrete</td>
+</tr>
+</tbody>
+</table>
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
span.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>normal</code> were specified.</p>
<p>The <att>tts:unicodeBidi</att> style is illustrated by the following example.</p>
@@ -5573,7 +5435,7 @@
defines whether generated areas are visible or not when rendered on a visual
presentation medium.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-visibility" role="common">
@@ -5583,8 +5445,7 @@
<td><emph>Values:</emph></td>
<td>
<code>visible</code> |
-<code>hidden</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>hidden</code>
</td>
</tr>
<tr>
@@ -5604,16 +5465,12 @@
</td>
</tr>
<tr>
-<td><phrase diff="add"><emph>Inherited:</emph></phrase></td>
-<td><phrase diff="add">yes</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><emph>Percentages:</emph></phrase></td>
-<td><phrase diff="add">N/A</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="del"><emph>Animatable:</emph></phrase></td>
-<td><phrase diff="del">discrete</phrase></td>
+<td><emph>Inherited:</emph></td>
+<td>yes</td>
+</tr>
+<tr>
+<td><emph>Percentages:</emph></td>
+<td>N/A</td>
</tr>
<tr>
<td><emph>Animatable:</emph></td>
@@ -5621,12 +5478,12 @@
</tr>
</tbody>
</table>
-<p diff="add">For the purpose of determining applicability of this style property,
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
span.</p>
<p>The <att>tts:visibility</att> style has no affect on content layout or
composition, but merely determines whether composed content is visible or not.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>visible</code> were specified.</p>
<p>The <att>tts:visibility</att> style is illustrated by the following example.</p>
@@ -5700,7 +5557,7 @@
defines whether or not automatic line wrapping (breaking) applies within the context of
the affected element.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-wrapOption" role="common">
@@ -5710,8 +5567,7 @@
<td><emph>Values:</emph></td>
<td>
<code>wrap</code> |
-<code>noWrap</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>noWrap</code>
</td>
</tr>
<tr>
@@ -5738,11 +5594,10 @@
</tr>
</tbody>
</table>
-<p diff="chg">For the purpose of determining applicability of this style property,
+<p>For the purpose of determining applicability of this style property,
each character child of a <el>p</el> element is considered to be enclosed in an anonymous
-span<phrase diff="del">, where the value of this style property on the anonymous span is considered to be
-<code>inherit</code></phrase>.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+span.</p>
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>wrap</code> were specified.</p>
<p>The <att>tts:wrapOption</att> style is illustrated by the following example.</p>
@@ -5765,7 +5620,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.<phrase diff="del">"</phrase>
+ A-sitting on a gate.
</p>
</eg>
</td>
@@ -5793,7 +5648,7 @@
defines the block and inline progression directions to be used for the purpose of
stacking block and inline areas within a region area.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-writingMode" role="common">
@@ -5808,8 +5663,7 @@
<code>tblr</code> |
<code>lr</code> |
<code>rl</code> |
-<code>tb</code><phrase diff="del"> |
-<code>inherit</code></phrase>
+<code>tb</code>
</td>
</tr>
<tr>
@@ -5832,11 +5686,11 @@
</tr>
<tr>
<td><emph>Animatable:</emph></td>
-<td><phrase diff="del">none</phrase><phrase diff="add">discrete</phrase></td>
-</tr>
-</tbody>
-</table>
-<p diff="add">If a specified value of this attribute is not supported,
+<td>discrete</td>
+</tr>
+</tbody>
+</table>
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>lrtb</code> were specified.</p>
<p>The <att>tts:writingMode</att> style is illustrated by the following example.</p>
@@ -5903,7 +5757,7 @@
<p>The <att>tts:zIndex</att> attribute is used to specify a style property that
defines the front-to-back ordering of region areas in the case that they overlap.</p>
<p>This attribute may be specified by any
-<phrase diff="chg">element type</phrase>
+element type
that permits use of attributes in the TT Style Namespace; however, this attribute applies
as a style property only to those element types indicated in the following table.</p>
<table id="style-property-details-zIndex" role="common">
@@ -5913,8 +5767,7 @@
<td><emph>Values:</emph></td>
<td>
<code>auto</code> |
-<loc href="#style-value-integer"><integer></loc><phrase diff="del"> |
-<code>inherit</code></phrase>
+<loc href="#style-value-integer"><integer></loc>
</td>
</tr>
<tr>
@@ -5949,7 +5802,7 @@
<p>The semantics of the value <code>auto</code> are those defined by
<bibref ref="xsl11"/>, § 7.28.9, where the <el>tt</el> element
is considered to establish the root stacking context.</p>
-<p diff="add">If a specified value of this attribute is not supported,
+<p>If a specified value of this attribute is not supported,
then a presentation processor must interpret the attribute as if the
value <code>auto</code> were specified.</p>
<p>The <att>tts:zIndex</att> style is illustrated by the following example.</p>
@@ -6047,7 +5900,7 @@
<item><p><specref ref="style-value-genericFamilyName"/></p></item>
<item><p><specref ref="style-value-hexDigit"/></p></item>
<item><p><specref ref="style-value-integer"/></p></item>
-<item><p diff="add"><specref ref="style-value-length"/></p></item>
+<item><p><specref ref="style-value-length"/></p></item>
<item><p><specref ref="style-value-namedColor"/></p></item>
<item><p><specref ref="style-value-quotedString"/></p></item>
<item><p><specref ref="style-value-string"/></p></item>
@@ -6072,11 +5925,11 @@
<p>In the above syntax representation, the syntactic element
<emph><code>float</code></emph> must adhere to the lexical
representation defined by <bibref ref="xsd-2"/> §
-3.2.4.1.<phrase diff="add"> If the value represented is less than 0.0,
+3.2.4.1. If the value represented is less than 0.0,
then it must be interpreted as equal to 0.0; similarly, if the value
represented is greater than 1.0, then it must be interpreted as
-1.0.</phrase></p>
-<p diff="add">If a presentation processor does not support a specific,
+1.0.</p>
+<p>If a presentation processor does not support a specific,
valid opacity value, then it must interpret it as being equal to the
closest supported value.</p>
</div3>
@@ -6128,12 +5981,12 @@
the composition function.</p>
<note role="clarification">
<p>The use of <bibref ref="srgb"/> for the stated semantics of
-composition is not mean<phrase diff="add">t</phrase> to prevent an actual processor from using some
+composition is not meant to prevent an actual processor from using some
other color space either for internal or external purposes. For
example, a presentation processor may ultimately convert the SRGB values
used here to the YUV color space for rendition on a television device.</p>
</note>
-<p diff="add">If a presentation processor does not support a specific,
+<p>If a presentation processor does not support a specific,
valid color or alpha value, then it must interpret it as being equal
to the closest supported value.</p>
</div3>
@@ -6164,7 +6017,7 @@
<td>
<eg xml:space="preserve">
<duration>
- : <loc href="#style-value-digit"><digit></loc><phrase diff="add">+</phrase> ( "." <loc href="#style-value-digit"><digit></loc>+ )? metric
+ : <loc href="#style-value-digit"><digit></loc>+ ( "." <loc href="#style-value-digit"><digit></loc>+ )? metric
metric
: "s" // seconds
@@ -6185,13 +6038,13 @@
<div3 id="style-value-familyName">
<head><familyName></head>
<p>A <familyName> expression specifies a font family name.</p>
-<p>If the name contains a<phrase diff="del"> whitespace or</phrase> quotation delimiter character,
+<p>If the name contains a quotation delimiter character,
then it must be expressed as a
-<quotedString>.<phrase diff="add"> If the name contains a
+<quotedString>. If the name contains a
whitespace character,
then it should be expressed as a
<quotedString>; however, if it is expressed as a <string>, then it
-must not contain a <code>COMMA</code> ',' character.</phrase></p>
+must not contain a <code>COMMA</code> ',' character.</p>
<table id="familyName-style-expression-syntax" role="syntax">
<caption>Syntax Representation – <familyName></caption>
@@ -6211,10 +6064,8 @@
<div3 id="style-value-flowFunction">
<head><flowFunction></head>
<p>A <flowFunction> expression specifies a unit of content to be
-dynamic flowed into<phrase diff="del">, within,</phrase> and <phrase
-diff="chg">out of</phrase> a region according to an optional dynamic
-flow style<phrase diff="del">, flow transition effect, and flow
-transition effect style</phrase>.</p>
+dynamic flowed into and out of a region according to an optional dynamic
+flow style.</p>
<table id="flowFunction-style-expression-syntax" role="syntax">
<caption>Syntax Representation – <flowFunction></caption>
<tbody>
@@ -6222,16 +6073,14 @@
<td>
<eg xml:space="preserve">
<flowFunction>
- : "in(" flowArguments ")"<phrase diff="del">
- | "within(" flowArguments ")"</phrase>
+ : "in(" flowArguments ")"
| "out(" flowArguments ")"
flowArguments
- : flowUnit [ "," flowStyle <phrase diff="del">[ "," flowTransition [ "," flowTransitionStyle ]]</phrase>]
+ : flowUnit [ "," flowStyle ]
flowUnit
-<phrase diff="del"> : "pixel"</phrase>
-<phrase diff="chg"> :</phrase> "glyph"
+ : "glyph"
| "inline"
| "line"
| "block"
@@ -6241,39 +6090,24 @@
flowStyle
: "jump"
- | "smooth"<phrase diff="del">
- | "fade"</phrase>
- | extensionToken<phrase diff="del">
-
-flowTransition
- : "barWipe"
+ | "smooth"
| extensionToken
-flowTransitionStyle
- : "leftToRight"
- | "topToBottom"
- | extensionToken
-
-</phrase>extensionToken
+extensionToken
: "x-" <token>
</eg>
</td>
</tr>
</tbody>
</table>
-
<p>Dynamic flow can be specified independently for flowing content
-into its region<phrase diff="del">, flowing it within its
-region,</phrase> and flowing it out of its region. These <phrase
-diff="chg">two</phrase> phases of dynamic flow are specified using the
-<code>in()</code><phrase diff="del">, <code>within()</code>,</phrase>
-and <code>out()</code> flow functions respectively.</p>
-
+into its region and flowing it out of its region. These two phases of dynamic flow are specified using the
+<code>in()</code> and <code>out()</code> flow functions respectively.</p>
<p>Dynamic flow occurs on the basis of specific visual or semantic
-content units. In the case of <phrase diff="del"><code>pixel</code>, </phrase><code>glyph</code>,
+content units. In the case of <code>glyph</code>,
<code>inline</code>, <code>line</code>, and <code>block</code>, the
unit of dynamic flow is based upon a visually rendered construct
-(<phrase diff="del"><code>pixel</code> or </phrase><code>glyph</code>) or upon an area of the area
+(<code>glyph</code>) or upon an area of the area
tree produced by formatting the affected content. In the case of
<code>character</code> and <code>word</code>, the unit of dynamic flow
is based upon a semantic unit associated with one or more visually
@@ -6293,31 +6127,19 @@
XML whitespace character.</p></item>
</olist>
-<p>When a flow unit is flowed into<phrase diff="del">,
-within,</phrase> or out of its region, the manner by which the unit is
+<p>When a flow unit is flowed into
+or out of its region, the manner by which the unit is
flowed is controlled by the optional <code>flowStyle</code> argument
of the relevant flow function. If the flow style is specified as
<code>jump</code>, or if no flow style is specified, then the flow
unit is instantaneously transitioned into, within, or out of the
region. If the flow style is <code>smooth</code>, then the flow unit
is smoothly transitioned by means of pixel based exposure, movement,
-or hiding, respectively.<phrase diff="del"> If the flow style is
-<code>fade</code>, then the flow unit is faded into or out of the
-region by continuously incrementing or decrementing the alpha
-component of the affected content.</phrase></p>
-
-<p diff="add">If a presentation processor that supports dynamic flow
+or hiding, respectively.</p>
+<p>If a presentation processor that supports dynamic flow
does not the <code>smooth</code> flow style, then this flow style must
be interpreted as if the <code>jump</code> flow style were
specified.</p>
-
-<p diff="del">In addition to the primary flow style, an optional flow transition
-effect and flow transition effect style may be specified, in which
-case the transition effect is additively (and simultaneously) applied
-to the primary flow style transition.</p>
-<p diff="del">For the permitted values of <code>flowTransition</code> and
-<code>flowTransitionStyle</code>, the semantics specified by
-<bibref ref="smil21"/>, § 12.8, apply.</p>
</div3>
<div3 id="style-value-flowIntervalFunction">
<head><flowIntervalFunction></head>
@@ -6404,7 +6226,7 @@
or <code>monospaceSerif</code>. The generic family names <code>sansSerif</code>
and <code>serif</code> are to be interpreted as equivalent to <code>proportionalSansSerif</code>
and <code>proportionalSerif</code>, respectively.</p>
-<p diff="add">If the generic family name <code>default</code> is specified (or implied by
+<p>If the generic family name <code>default</code> is specified (or implied by
an initial value), then its typographic characteristics is considered to be implementation
dependent; however, it is recommended that this default font family be mapped to
an monospaced, sans-serif font.</p>
@@ -6577,7 +6399,7 @@
<div3 id="style-value-string">
<head><string></head>
<p>A <string> expression consists of a sequence of characters where no character
-is a<phrase diff="del"> whitespace or</phrase> quotation delimiter character.</p>
+is a quotation delimiter character.</p>
<table id="string-style-expression-syntax" role="syntax">
<caption>Syntax Representation – <string></caption>
<tbody>
@@ -6585,7 +6407,7 @@
<td>
<eg xml:space="preserve">
<string>
- : ( <emph>char</emph> - { <phrase diff="del"><emph>S</emph> |</phrase>"\"" | "\'" } )+
+ : ( <emph>char</emph> - { "\"" | "\'" } )+
</eg>
</td>
</tr>
@@ -6593,46 +6415,44 @@
</table>
<p>In the above syntax representation, the syntactic element <emph><code>char</code></emph> must adhere to production
[2] <code>Char</code> as defined by <bibref ref="xml10"/> §
-2.2<phrase diff="del">, while the syntactic element <emph><code>S</code></emph> must adhere to production
-[3] <code>S</code> as defined by <bibref ref="xml10"/> §
-2.3</phrase>.</p>
+2.2.</p>
</div3>
</div2>
<!-- START NEW -->
<div2 id="semantics-style-resolution">
-<head><phrase diff="add">Style Resolution</phrase></head>
-<p diff="add">This section defines the semantics of style resolution in terms of
+<head>Style Resolution</head>
+<p>This section defines the semantics of style resolution in terms of
a standard processing model as follows:</p>
-<ulist diff="add">
+<ulist>
<item><p><specref ref="semantics-style-association"/></p></item>
<item><p><specref ref="semantics-style-inheritance"/></p></item>
<item><p><specref ref="semantics-style-resolution-value-categories"/></p></item>
<item><p><specref ref="semantics-style-resolution-processing"/></p></item>
</ulist>
-<p diff="add">Any implementation of this model is permitted provided that the
+<p>Any implementation of this model is permitted provided that the
externally observable results are consistent with the results produced
by this model.</p>
-<note role="derivation" diff="add">
+<note role="derivation">
<p>The semantics of style resolution employed here are based upon
<bibref ref="xsl11"/>, § 5.</p>
</note>
<div3 id="semantics-style-association">
<head>Style Association</head>
-<p diff="add">Style association is a sub-process of <specref
+<p>Style association is a sub-process of <specref
ref="semantics-style-resolution-processing"/> used to determine the
specified style set of each content and
layout element.</p>
<p>Style matter may be associated with content
-<phrase diff="add"> and layout matter</phrase> in a number of ways:</p>
+ and layout matter in a number of ways:</p>
<ulist>
-<item><p diff="chg"><loc href="#semantics-style-association-inline">inline styling</loc></p></item>
-<item><p diff="chg"><loc href="#semantics-style-association-referential">referential styling</loc></p></item>
-<item><p diff="chg"><loc href="#semantics-style-association-chained-referential">chained referential styling</loc></p></item>
+<item><p><loc href="#semantics-style-association-inline">inline styling</loc></p></item>
+<item><p><loc href="#semantics-style-association-referential">referential styling</loc></p></item>
+<item><p><loc href="#semantics-style-association-chained-referential">chained referential styling</loc></p></item>
</ulist>
-<p diff="add">In addition to the above, style matter may be associated with layout matter using:</p>
+<p>In addition to the above, style matter may be associated with layout matter using:</p>
<ulist>
-<item><p diff="add"><loc href="#semantics-style-association-nested">nested styling</loc></p></item>
+<item><p><loc href="#semantics-style-association-nested">nested styling</loc></p></item>
</ulist>
<div4 id="semantics-style-association-inline">
<head>Inline Styling</head>
@@ -6670,7 +6490,7 @@
<p>If a <att>style</att> attribute specifies multiple references, then those references are
evaluated in the specified order, and that order applies to resolution of the value of a
style property in the case that it is specified along multiple reference paths.</p>
-<p diff="add">The use of referential styling is restricted to making
+<p>The use of referential styling is restricted to making
reference to <el>style</el> element descendants of a <el>styling</el>
element. It is considered an error to reference a <el>style</el>
element that is a descendant of a <el>layout</el> element.</p>
@@ -6713,18 +6533,18 @@
affected element. When expressed in this manner, the association of style information
is referred to as <emph>chained referential styling</emph>.</p>
<p>If the same style property is specified in more than one referenced
-<phrase diff="add">style </phrase>
-<phrase diff="del">specification</phrase><phrase diff="add">set</phrase>,
+style
+set,
then the last referenced style
-<phrase diff="del">specification</phrase><phrase diff="add">set</phrase>
+set
applies, where the order of application starts from
the affected element and proceeds to referenced style
-<phrase diff="del">specifications</phrase><phrase diff="add">sets</phrase>,
-and, in turn, to subsequent<phrase diff="add">, recursively</phrase>
+sets,
+and, in turn, to subsequent, recursively
referenced style
-<phrase diff="del">specifications</phrase><phrase diff="add">sets</phrase>.</p>
+sets.</p>
<p>A loop in a sequence of chained style references must be considered an error.</p>
-<p diff="add">The use of referential styling is restricted to making
+<p>The use of referential styling is restricted to making
reference to <el>style</el> element descendants of a <el>styling</el>
element. It is considered an error to reference a <el>style</el>
element that is a descendant of a <el>layout</el> element.</p>
@@ -6754,7 +6574,7 @@
</tbody>
</table>
</div4>
-<div4 id="semantics-style-association-nested" diff="add">
+<div4 id="semantics-style-association-nested">
<head>Nested Styling</head>
<p>Style properties may be expressed in an nested manner by direct specification of one or
more <el>style</el> element children of the affected element.
@@ -6786,24 +6606,21 @@
</div3>
<div3 id="semantics-style-inheritance">
<head>Style Inheritance</head>
-<p diff="add">Style inheritance is a sub-process of <specref
+<p>Style inheritance is a sub-process of <specref
ref="semantics-style-resolution-processing"/> used to determine the
specified style set of each content and
layout element.</p>
-<p><phrase diff="del">Subsequent to the association of style matter
-with content matter as described above in <specref
-ref="semantics-style-association"/>,</phrase> <phrase
-diff="chg">S</phrase>tyles are further propagated to content matter
+<p>Styles are further propagated to content matter
using:
</p>
<ulist>
<item><p><loc href="#semantics-style-inheritance-content">content style inheritance</loc></p></item>
<item><p><loc href="#semantics-style-inheritance-content">region style inheritance</loc></p></item>
</ulist>
-<p diff="add">For the purpose of determining inherited styles, the element hierarchy of
+<p>For the purpose of determining inherited styles, the element hierarchy of
an intermediate synchronic document form of a DFXP document instance must be used, where
such intermediate forms are defined by <specref ref="semantics-region-layout-step-1"/>.</p>
-<note role="explanation" diff="add">
+<note role="explanation">
<p>The intermediate synchronic document form is utilized rather than
the original form in order to facilitate region inheritance
processing.</p>
@@ -6811,26 +6628,15 @@
<div4 id="semantics-style-inheritance-content">
<head>Content Style Inheritance</head>
<p>Style properties are inherited from ancestor content elements
-<phrase diff="add">within an intermediate synchronic document
-if a style property is not associated with a<phrase
-diff="del">n</phrase><phrase diff="add"> content</phrase> element (or
+within an intermediate synchronic document
+if a style property is not associated with a content element (or
an anonymous span) and the style property is designated as
-inheritable</phrase><phrase diff="del"> in the following
-case:</phrase><phrase diff="add">.</phrase></p>
-<olist diff="del">
-<item><p>if a style property is not associated with an element (or
-an anonymous span) and the style property is designated as
-inheritable, or</p></item>
-<item><p>if a style property is associated with an
-element, that element is not the
-<el>body</el> element, and the associated style
-property value is <code>inherit</code>.</p></item>
-</olist>
+inheritable.</p>
<p>If a style property is determined to require inheritance, then the inherited value must
be the value of the same named style property in the computed
-style<phrase diff="del"> specification</phrase> set of the
+style set of the
element's immediate ancestor element
-<phrase diff="add">within the applicable intermediate synchronic document</phrase>.</p>
+within the applicable intermediate synchronic document.</p>
<table id="style-inheritance-example-2" role="example">
<caption>Example – Content Style Inheritance</caption>
<tbody>
@@ -6851,11 +6657,11 @@
property and this property is inheritable; therefore, the value of the
<att>tts:fontFamily</att> style
is inherited from the computed style
-<phrase diff="del">specification </phrase>set of the ancestor <el>p</el> element,
+set of the ancestor <el>p</el> element,
and is added to the
-<phrase diff="del">computed</phrase><phrase diff="add">specified</phrase>
+specified
style
-<phrase diff="del">specification </phrase>set of the <el>span</el> element.</p>
+set of the <el>span</el> element.</p>
</note>
</div4>
<div4 id="semantics-style-inheritance-region">
@@ -6863,15 +6669,14 @@
<p>Style properties are inherited from a region element in the following case:</p>
<olist>
<item><p>if a style property <emph>P</emph> is not associated with
-a<phrase diff="del">n</phrase> <phrase diff="add">content
-</phrase>element or an anonymous span <emph>E</emph> and the style
+a content
+element or an anonymous span <emph>E</emph> and the style
property is designated as inheritable, and</p></item> <item><p>if that
-style property <emph>P</emph> is in the computed style<phrase
-diff="del"> specification</phrase> set of region
-<emph>R</emph><phrase diff="del"> as defined by 9.1.2 region below</phrase>,
+style property <emph>P</emph> is in the computed style
+set of region
+<emph>R</emph>,
and</p></item>
-<item><p>if that element <emph>E</emph> is flowed into <phrase
-diff="add">(presented within)</phrase> region
+<item><p>if that element <emph>E</emph> is flowed into (presented within) region
<emph>R</emph>.</p></item>
</olist>
<table id="style-inheritance-example-3" role="example">
@@ -6891,7 +6696,7 @@
</tr>
</tbody>
</table>
-<note role="explanation" diff="add">
+<note role="explanation">
<p>In the above example, the anonymous span that encloses the character
items <code>Yellow Monospace</code> effectively inherits the <att>tts:color</att>
and <att>tts:fontFamily</att> styles specified on the <el>region</el>
@@ -6899,7 +6704,7 @@
</note>
</div4>
</div3>
-<div3 id="semantics-style-resolution-value-categories" diff="add">
+<div3 id="semantics-style-resolution-value-categories">
<head>Style Resolution Value Categories</head>
<p>During style resolution, layout, and presentation processing,
three categories of style property values are distinguished as
@@ -6965,7 +6770,7 @@
</note>
</div4>
</div3>
-<div3 id="semantics-style-resolution-processing" diff="add">
+<div3 id="semantics-style-resolution-processing">
<head>Style Resolution Processing</head>
<p>The process of style resolution is defined herein as the procedure
(and results thereof) for resolving (determining) the computed values
@@ -7253,7 +7058,7 @@
matter is not embedded (inlined).</p>
</note>
<div2 id="layout-element-vocabulary">
-<head><phrase diff="add">Layout </phrase>Element Vocabulary</head>
+<head>Layout Element Vocabulary</head>
<p>The following elements specify the structure and principal layout aspects of a
document instance:</p>
<ulist>
@@ -7293,7 +7098,7 @@
<head>region</head>
<p>The <el>region</el> element is used to define a space or area into which content is
to be flowed for the purpose of presentation.</p>
-<p diff="add">In addition, and in accordance with
+<p>In addition, and in accordance with
<specref ref="semantics-style-inheritance-region"/>,
the <el>region</el> element may be used to specify inheritable style properties to be
inherited by content that is flowed into it.</p>
@@ -7322,12 +7127,12 @@
<loc href="#timing-attribute-end">end</loc> = <loc href="#timing-value-timeExpression"><timeExpression></loc>
<loc href="#style-attribute-style">style</loc> = IDREFS
<loc href="#timing-attribute-timeContainer">timeContainer</loc> = (<emph>par</emph>|<emph>seq</emph>)
- <phrase diff="add"><loc href="#metadata-attribute-role">ttm:role</loc> = string</phrase>
+ <loc href="#metadata-attribute-role">ttm:role</loc> = string
<loc href="#content-attribute-id">xml:id</loc> = ID
<loc href="#content-attribute-lang">xml:lang</loc> = string
<loc href="#content-attribute-space">xml:space</loc> = (<emph>default</emph>|<emph>preserve</emph>)
{<emph>any attribute in TT Style namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Style Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Style Extension namespace ...</emph>}
{<emph>any attribute not in default or any TT namespace ...</emph>}>
<emph>Content:</emph> <loc href="#element-vocab-group-table">Metadata.class</loc>*, <loc href="#element-vocab-group-table">Animation.class</loc>*, <loc href="#styling-vocabulary-style">style</loc>*
</region>
@@ -7336,54 +7141,6 @@
</tr>
</tbody>
</table>
-<p diff="del">The declared value of an inline style attribute on a <el>region</el>
-element must not be <code>inherit</code>.</p>
-<p diff="del">A <el>region</el> element is considered to define a computed style
-specification set, where the set is determined using the
-following ordered rules:</p>
-<olist diff="del">
-<item>
-<p>If a <att>style</att> attribute is specified on the <el>region</el> element,
-<phrase diff="add">i.e., referential style association is used,</phrase>
-then the set must be initialized so as to include each style specification contained in
-the computed style specification set of each element referenced by
-the <att>style</att> attribute. If the same named style property is specified
-by more than one such referenced computed style specification set, then the value
-of the named style property in following referenced sets takes precedence over the value
-of the named style property in prior referenced sets, where following and prior are
-determined according to the order of the referenced ID in the IDREFS value of the <att>style</att>
-attribute.</p>
-</item>
-<item>
-<p>If the <el>region</el> element has any <el>style</el> element children,
-<phrase diff="add">i.e., nested style association is used,</phrase>
-then each
-style specification of the computed style specification set of each child <el>style</el>
-element either overrides an existing style
-specification already contained within the set or augments the set with a new style
-specification according to whether or not the named style property of the style specification
-matches the named style property of an existing style specification already included in
-the set, where the order of evaluation of child <el>style</el> elements proceeds from first
-to last such child element.</p>
-</item>
-<item>
-<p>If the
-<phrase diff="del"><el>style</el></phrase><phrase diff="add"><el>region</el></phrase>
-element specifies an attribute from the TT Style Namespace
-or TT Style Extension Namespace,
-<phrase diff="add">i.e., inline style association is used,</phrase>
-then each style
-specification defined by that attribute either overrides an existing style
-specification already contained within the set or augments the set with a new style
-specification according to whether or not the named style property of the style specification
-matches the named style property of an existing style specification already included in
-the set.</p>
-</item>
-</olist>
-<p diff="del">Two named style properties are considered to match if their expanded names match,
-where <emph>expanded name</emph> is defined by <bibref ref="xmlns10"/>, §2.1,
-and the expanded name of a named style property is the expanded name of the attribute
-that specifies the named style property.</p>
<p>If <att>begin</att> and (or) <att>end</att> attributes are specified on a
<el>region</el> element, then they specify the beginning and (or) ending points
of a time interval during which the region is eligible for activation and with
@@ -7412,10 +7169,10 @@
both of these cases, it is necessary to posit an active time interval for a
region.</p>
</note>
-<p diff="add">If no <att>timeContainer</att> attribute is specified on
+<p>If no <att>timeContainer</att> attribute is specified on
a <el>region</el> element, then it must be interpreted as having
<emph>parallel</emph> time containment semantics.</p>
-<p diff="add">If a <loc
+<p>If a <loc
href="#metadata-attribute-role"><att>ttm:role</att></loc> attribute is
specified on a <el>region</el> element, then it must adhere to the
value syntax defined by <specref
@@ -7426,7 +7183,7 @@
</div3>
</div2>
<div2 id="layout-attribute-vocabulary">
-<head><phrase diff="add">Layout </phrase>Attribute Vocabulary</head>
+<head>Layout Attribute Vocabulary</head>
<p>This section defines the <specref ref="layout-attribute-region"/> attribute used with content elements.</p>
<div3 id="layout-attribute-region">
<head>region</head>
@@ -7449,9 +7206,9 @@
<div2 id="semantics-region-layout">
<head>Region Layout and Presentation</head>
<p>This section defines the semantics of region layout and
-presentation in terms of a standard processing model<phrase diff="add"> as
-follows</phrase><phrase diff="del">.</phrase><phrase diff="add">:</phrase></p>
-<ulist diff="add">
+presentation in terms of a standard processing model as
+follows:</p>
+<ulist>
<item><p><specref ref="semantics-default-region"/></p></item>
<item><p><specref ref="semantics-region-layout-step-1"/></p></item>
<item><p><specref ref="semantics-region-layout-step-2"/></p></item>
@@ -7461,7 +7218,7 @@
implementation is permitted provided that the externally observable
results are consistent with the results produced by this model.
</p>
-<div3 id="semantics-default-region" diff="add">
+<div3 id="semantics-default-region">
<head>Default Region</head>
<p>If a DFXP document instance does not specify a
<loc href="#layout-vocabulary-region"><el>region</el></loc> element,
@@ -7525,21 +7282,21 @@
</note>
</div3>
<div3 id="semantics-region-layout-step-1">
-<head><phrase diff="chg">Intermediate Synchronic Document Construction</phrase></head>
+<head>Intermediate Synchronic Document Construction</head>
<p>For the purposes of performing presentation processing, the active time
duration of a document instance is divided into a sequence of time coordinates where at
each time coordinate, some element becomes temporally active or inactive,
then, at each such time coordinate, a document
instance is mapped from its original, source
-form<phrase diff="add">, <emph>DOC<sub>source</sub></emph>, </phrase>
+form, <emph>DOC<sub>source</sub></emph>,
to an intermediate
-<phrase diff="add">synchronic document </phrase>form,
-<phrase diff="chg"><emph>DOC<sub>inter</sub></emph></phrase>, as follows:</p>
+synchronic document form,
+<emph>DOC<sub>inter</sub></emph>, as follows:</p>
<olist>
<item>
<p>for each temporally active region <emph>R</emph>, replicate the
-<phrase diff="del">portion of the document's </phrase>sub-tree
-<phrase diff="add"> of <emph>DOC<sub>source</sub></emph></phrase>
+sub-tree
+ of <emph>DOC<sub>source</sub></emph>
headed by the <el>body</el> element;</p>
</item>
<item>
@@ -7558,22 +7315,22 @@
longer semantically relevant;</p>
</item>
</olist>
-<p diff="add">A content element is associated with a region according
+<p>A content element is associated with a region according
to the following ordered rules, where the first rule satisfied
is used and remaining rules are skipped:</p>
<olist>
-<item><p diff="add">if the element specifies a <loc
+<item><p>if the element specifies a <loc
href="#layout-attribute-region"><att>region</att></loc> attribute,
then the element is associated with the region referenced by that
attribute;</p></item>
-<item><p diff="add">if some ancestor of that element specifies a <loc
+<item><p>if some ancestor of that element specifies a <loc
href="#layout-attribute-region"><att>region</att></loc> attribute,
then the element is associated with the region referenced by the most
immediate ancestor that specifies this attribute;</p></item>
-<item><p diff="add">if a default region was implied (due to the absence of any
+<item><p>if a default region was implied (due to the absence of any
<loc href="#layout-vocabulary-region"><el>region</el></loc> element),
then the element is associated with the default region</p></item>
-<item><p diff="add">the element is not associated with any region</p></item>
+<item><p>the element is not associated with any region</p></item>
</olist>
<p>The pseudo-code shown in <specref ref="content-hierarchy-region-mapping"/>
provides one possible algorithm that implements these processing steps.</p>
@@ -7588,9 +7345,7 @@
if TEMPORALLY-ACTIVE? ( R )
APPEND-CHILDREN ( R, SELECT ( D, "/tt/body" ) )
foreach E in POSTORDER-TRAVERSE ( R )
- <phrase diff="del">if CONTENT-ELEMENT? ( E ) and TEMPORALLY-ACTIVE? ( E )</phrase>
- <phrase diff="del">if EMPTY? ( E ) or REGION-OF ( E ) != R and</phrase>
- <phrase diff="add">if ! CONTENT-ELEMENT? ( E ) or ! TEMPORALLY-ACTIVE? ( E ) or EMPTY? ( E ) or REGION-OF ( E ) != R</phrase>
+ if ! CONTENT-ELEMENT? ( E ) or ! TEMPORALLY-ACTIVE? ( E ) or EMPTY? ( E ) or REGION-OF ( E ) != R
then PRUNE ( E )
PRUNE ( SELECT ( D, "/tt/body" ) )
PRUNE ( SELECT ( D, "//*/@region" ) )
@@ -7611,49 +7366,43 @@
</tbody>
</table>
<p>The result of performing the processing described above will be a sequence of
-<emph>N</emph> intermediate <phrase diff="add"> synchronic</phrase>
-document<phrase diff="del">s</phrase> instances,
-<phrase diff="chg"><emph>DOC<sub><phrase>inter<sub>0</sub></phrase></sub></emph></phrase> …
-<phrase diff="chg"><emph>DOC<sub><phrase>inter<sub>N−1</sub></phrase></sub></emph></phrase>.</p>
+<emph>N</emph> intermediate synchronic
+document instances,
+<emph>DOC<sub><phrase>inter<sub>0</sub></phrase></sub></emph> …
+<emph>DOC<sub><phrase>inter<sub>N−1</sub></phrase></sub></emph>.</p>
</div3>
<div3 id="semantics-region-layout-step-2">
<head>Synchronic Flow Processing</head>
<p>Subsequent to performing a temporal (synchronic) slice and subsequent
remapping of regionally selected content hierarchy, the resulting intermediate
-<phrase diff="add"> synchronic</phrase> document is
+ synchronic document is
subjected to a flow transformation step that produces a rooted flow object tree
represented as an XSL FO document instance as defined by <bibref ref="xsl11"/>,
and semantically extended by TT AF specific style properties that have no XSL
FO counterpart.</p>
-<p>Each intermediate<phrase diff="add"> synchronic</phrase> document produced by <specref
+<p>Each intermediate synchronic document produced by <specref
ref="semantics-region-layout-step-1"/> is mapped to an XSL FO document instance,
<emph>F</emph>, as follows:</p>
<olist>
<item>
-<p diff="del">for each significant text node in a content element that is not a child of a
-<el>span</el> element, synthesize an anonymous span to enclose the text node,
-substituting the new anonymous span for the original text node child in its
-sibling and parent hierarchy;</p>
-<p diff="add">perform the following ordered sub-steps to create anonymous spans:</p>
+<p>perform the following ordered sub-steps to create anonymous spans:</p>
<olist>
-<item><p diff="add">for each significant text node in a content element,
+<item><p>for each significant text node in a content element,
synthesize an anonymous span to enclose the text node, substituting
the new anonymous span for the original text node child in its sibling
and parent hierarchy;</p></item>
-<item><p diff="add">for each contiguous sequence of anonymous spans, replace the
+<item><p>for each contiguous sequence of anonymous spans, replace the
sequence with a single anonymous span which contains a sequence of
text nodes representing the individual text node children of the
original sequence of anonymous spans;</p></item>
-<item><p diff="add">for each span element whose child is a single anonymous span,
+<item><p>for each span element whose child is a single anonymous span,
replace the anonymous span with its sequence of child text
nodes;</p></item>
</olist>
</item>
<item>
-<p><phrase diff="del">for each element and anonymous span, determine
-its computed style specification set, if applicable</phrase><phrase
-diff="add">resolve styles according to <specref
-ref="semantics-style-resolution-process-overall"/></phrase>;</p>
+<p>resolve styles according to <specref
+ref="semantics-style-resolution-process-overall"/>;</p>
</item>
<item>
<p>map the <el>tt</el> element to an <el>fo:root</el> element, populated
@@ -7681,11 +7430,10 @@
associated with a <att>tts:display</att> style property with the value
<code>none</code>, map the element to a distinct <el>fo:block</el> element,
populating the style properties of <el>fo:block</el> by using the computed
-style<phrase diff="del"> specification</phrase>
-set associated with each original TT AF content element;</p>
-</item>
-<item>
-<p diff="add">for the resulting <el>fo:block</el> formatting object
+style set associated with each original TT AF content element;</p>
+</item>
+<item>
+<p>for the resulting <el>fo:block</el> formatting object
produced in the previous step that corresponds to the <el>body</el>
element, synthesize and append to the end of its children an empty
<el>fo:block</el> with the following attributes:
@@ -7700,12 +7448,11 @@
<p>for each <el>span</el> element that is not
associated with a <att>tts:display</att> style property with the value
<code>none</code> and for each anonymous
-span<phrase diff="add"> that is a child of a <el>p</el> or <el>span</el> element</phrase>,
+span that is a child of a <el>p</el> or <el>span</el> element,
map the element or
sequence of character items to a distinct <el>fo:inline</el> element,
populating the style properties of <el>fo:inline</el> by using the computed
-style<phrase diff="del"> specification</phrase>
-set associated with each original TT AF content element
+style set associated with each original TT AF content element
or anonymous span;</p>
</item>
<item>
@@ -7725,8 +7472,7 @@
</item>
<item>
<p>for each TT AF style property attribute in some computed
-style<phrase diff="del"> specification</phrase>
-set that
+style set that
has no counterpart in <bibref ref="xsl11"/>, map that attribute directly through
to the relevant formatting object produced by the input TT AF content element to
which the style property applies;</p>
@@ -7738,12 +7484,12 @@
</item>
</olist>
<p>For each resulting XSL FO document instance
-<phrase diff="chg"><emph>DOC<sub>FO</sub></emph></phrase>,
+<emph>DOC<sub>FO</sub></emph>,
if processing
requires presentation on a visual medium, then apply the formatting semantics
prescribed by <bibref ref="xsl11"/> in order to produce an XSL FO area tree that
may then be subsequently rendered onto the visual medium.</p>
-<note role="elaboration" diff="add">
+<note role="elaboration">
<p>In the XSL FO area tree produced by formatting
<emph>DOC<sub>FO</sub></emph>, the <code>page-viewport-area</code>,
which is generated by <code>fo:page-sequence</code> element by
@@ -7856,12 +7602,12 @@
content and that denotes authorial intentions about the temporal presentation of
that content.</p>
<div2 id="timing-element-vocabulary">
-<head><phrase diff="add">Timing </phrase>Element Vocabulary</head>
+<head>Timing Element Vocabulary</head>
<p>No timing related element vocabulary is defined for use in the core
vocabulary catalog.</p>
</div2>
<div2 id="timing-attribute-vocabulary">
-<head><phrase diff="add">Timing </phrase>Attribute Vocabulary</head>
+<head>Timing Attribute Vocabulary</head>
<p>This section defines the following basic timing attributes for use with timed elements:</p>
<ulist>
<item><p><specref ref="timing-attribute-begin"/></p></item>
@@ -7880,8 +7626,8 @@
ref="timing-value-timeExpression"/>.</p>
<p>The begin point of a temporal interval is included in the
interval; i.e., the interval is left-wise closed.</p>
-<p diff="chg">The semantics of the <att>begin</att> attribute are those defined
-by <bibref ref="smil21"/>, § <phrase diff="chg">10.4.1</phrase>,
+<p>The semantics of the <att>begin</att> attribute are those defined
+by <bibref ref="smil21"/>, § 10.4.1,
while taking into account any overriding semantics defined by this specification.</p>
</div3>
<div3 id="timing-attribute-end">
@@ -7904,8 +7650,8 @@
with frame 0). The same holds if the active interval is specified
as [300f,310f).</p>
</note>
-<p diff="chg">The semantics of the <att>end</att> attribute are those defined
-by <bibref ref="smil21"/>, § <phrase diff="chg">10.4.1</phrase>,
+<p>The semantics of the <att>end</att> attribute are those defined
+by <bibref ref="smil21"/>, § 10.4.1,
while taking into account any overriding semantics defined by this specification.</p>
</div3>
<div3 id="timing-attribute-dur">
@@ -7915,8 +7661,8 @@
the value of a <att>dur</att> attribute must adhere to a
<timeExpression> specification as defined by <specref
ref="timing-value-timeExpression"/>.</p>
-<p diff="chg">The semantics of the <att>dur</att> attribute are those defined
-by <bibref ref="smil21"/>, § <phrase diff="chg">10.4.1</phrase>,
+<p>The semantics of the <att>dur</att> attribute are those defined
+by <bibref ref="smil21"/>, § 10.4.1,
while taking into account any overriding semantics defined by this specification.</p>
</div3>
<div3 id="timing-attribute-timeContainer">
@@ -7953,7 +7699,7 @@
<item><p><loc href="#layout-vocabulary-region"><el>region</el></loc></p></item>
<item><p><loc href="#content-vocabulary-span"><el>span</el></loc></p></item>
</ulist>
-<p diff="chg">The semantics of parallel and sequential time
+<p>The semantics of parallel and sequential time
containment are those defined by <bibref ref="smil21"/>, § 10.3.2,
while taking into account any overriding semantics defined by this specification.</p>
</div3>
@@ -8061,34 +7807,25 @@
<ulist>
<item>
<p>The implicit duration of
-<phrase diff="del">
-<el>body</el>, <el>div</el>, <el>p</el>, and <el>span</el> (whether anonyous or not)
-</phrase>
-<phrase diff="add">
+
an anonymous span
-</phrase>
+
is defined as follows: if
the
-<phrase diff="del">
-element's
-</phrase>
-<phrase diff="add">
+
anonymous span's
-</phrase>
+
parent time container is a parallel time container, then
the implicit duration is equivalent to the <code>indefinite</code>
duration value as defined by <bibref ref="smil21"/>; if the
-<phrase diff="del">
-element's
-</phrase>
-<phrase diff="add">
+
anonymous span's
-</phrase>
+
parent time container is a sequential time container, then the
implicit duration is equivalent to zero.</p>
</item>
<item>
-<p diff="add">The implicit duration of a <el>body</el>, <el>div</el>, <el>p</el>,
+<p>The implicit duration of a <el>body</el>, <el>div</el>, <el>p</el>,
or <el>span</el> element is determined in accordance to (1) whether
the element is a parallel or sequential time container, and (2) the
semantics of <bibref ref="smil21"/> as applied to these time
@@ -8129,7 +7866,7 @@
timing and styling in order to denote authorial intention about (temporally) dynamic
styling of content.</p>
<div2 id="animation-element-vocabulary">
-<head><phrase diff="add">Animation </phrase>Element Vocabulary</head>
+<head>Animation Element Vocabulary</head>
<p>The following elements specify the structure and principal animation aspects of a
document instance:</p>
<ulist>
@@ -8138,7 +7875,7 @@
<div3 id="animation-vocabulary-set">
<head>set</head>
<p>The <el>set</el> element is used as a child element of a content
-element<phrase diff="add"> or a <el>region</el> element</phrase>
+element or a <el>region</el> element
in order to express a discrete change of some style parameter value
that applies over some time interval.</p>
<p>The <el>set</el> element accepts as its children zero or more
@@ -8169,42 +7906,42 @@
<p>The use of multiple <el>set</el> element children may be used to effect fade and
position transitions.</p>
</note>
-<p diff="add">An example of using the <el>set</el> element to animate content
+<p>An example of using the <el>set</el> element to animate content
styling is illustrated below:</p>
<table id="animation-vocabulary-set-example-1" role="example">
-<caption><phrase diff="add">Example Fragment – Content Style Animation</phrase></caption>
-<tbody>
-<tr>
-<td>
-<eg xml:space="preserve">
-<phrase diff="add">...
+<caption>Example Fragment – Content Style Animation</caption>
+<tbody>
+<tr>
+<td>
+<eg xml:space="preserve">
+...
<p dur="5s" tts:color="yellow">
<phrase role="strong"><set begin="1s" dur="1s" tts:color="red"/></phrase>
<phrase role="strong"><set begin="2s" dur="1s" tts:color="green"/></phrase>
<phrase role="strong"><set begin="3s" dur="1s" tts:color="red"/></phrase>
Text with Flashing Colors!
</p>
-...</phrase>
-</eg>
-</td>
-</tr>
-</tbody>
-</table>
-<note role="explanation" diff="add">
+...
+</eg>
+</td>
+</tr>
+</tbody>
+</table>
+<note role="explanation">
<p>In the above example, the foreground color of the content "Text
with Flashing Colors" is animated from yellow, to red, to green, to
red, then back to yellow over a 5 second period.</p>
</note>
-<p diff="add">An example of using the <el>set</el> element to animate region
+<p>An example of using the <el>set</el> element to animate region
styling is illustrated below:</p>
<table id="animation-vocabulary-set-example-2" role="example">
-<caption><phrase diff="add">Example Fragment – Region Style Animation</phrase></caption>
-<tbody>
-<tr>
-<td>
-<eg xml:space="preserve">
-<phrase diff="add"><tt xml:lang="" xmlns="http://www.w3.org/2006/10/ttaf1"
+<caption>Example Fragment – Region Style Animation</caption>
+<tbody>
+<tr>
+<td>
+<eg xml:space="preserve">
+<tt xml:lang="" xmlns="http://www.w3.org/2006/10/ttaf1"
xmlns:ttp="http://www.w3.org/2006/10/ttaf1#parameter"
xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling"
ttp:cellResolution="40 16">
@@ -8221,13 +7958,13 @@
</layout>
</head>
<body region="r1">...</body>
-</tt></phrase>
-</eg>
-</td>
-</tr>
-</tbody>
-</table>
-<note role="explanation" diff="add">
+</tt>
+</eg>
+</td>
+</tr>
+</tbody>
+</table>
+<note role="explanation">
<p>In the above example, the root container region is divided into a
cell grid of 40 columns and 16 rows. A region, <code>r1</code>, with
dimensions of 24 columns and 2 rows is then positioned within the
@@ -8243,7 +7980,7 @@
</div3>
</div2>
<div2 id="animation-attribute-vocabulary">
-<head><phrase diff="add">Animation </phrase>Attribute Vocabulary</head>
+<head>Animation Attribute Vocabulary</head>
<p>No animation related attribute vocabulary is defined for use in the
core vocabulary catalog.</p>
</div2>
@@ -8253,14 +7990,14 @@
<p>This section specifies the <emph>metadata</emph> matter of the core
vocabulary catalog, where
metadata is to be understood as a separable layer of information that applies to
-<phrase diff="add">parameters, </phrase>content,
+parameters, content,
style, layout, timing, and even metadata itself, where the information
represented by metadata takes one of two forms: (1) metadata defined by this
specification for standardized use in a document instance, and (2) arbitrary
metadata defined outside of the scope of this specification, whose use and
semantics depend entirely upon an application's use of TT AF content.</p>
<div2 id="metadata-element-vocabulary">
-<head><phrase diff="add">Metadata </phrase>Element Vocabulary</head>
+<head>Metadata Element Vocabulary</head>
<p>The <specref ref="metadata-vocabulary-metadata"/> element serves as
a generic container element for grouping metadata information.</p>
<p>In addition, the following elements, all defined in the TT Metadata Namespace,
@@ -8281,11 +8018,10 @@
information.</p>
<p>Metadata information may be expressed by a <el>metadata</el> element
in one of two (non-mutually exclusive) manners: (1) by specifying one
-or more metadata attributes on the<phrase diff="add"> <el>metadata</el></phrase>
+or more metadata attributes on the <el>metadata</el>
element, and (2) by specifying one
-or more
-<phrase diff="del"><el>metadata</el> </phrase>child elements
-<phrase diff="add">in the <el>metadata</el> element</phrase>
+or more child elements
+in the <el>metadata</el> element
that express metadata. Both types of metadata
are referred to in this document as <emph>metadata items</emph>.</p>
<table id="elt-syntax-metadata" role="syntax">
@@ -8299,7 +8035,7 @@
<loc href="#content-attribute-lang">xml:lang</loc> = string
<loc href="#content-attribute-space">xml:space</loc> = (<emph>default</emph>|<emph>preserve</emph>)
{<emph>any attribute in TT Metadata namespace ...</emph>}
- <phrase diff="add">{<emph>any attribute in TT Metadata Extension namespace ...</emph>}</phrase>
+ {<emph>any attribute in TT Metadata Extension namespace ...</emph>}
{<emph>any attribute not in default or any TT namespace ...</emph>}>
<emph>Content:</emph> {<emph>any element not in TT namespace</emph>}*
</metadata>
@@ -8315,66 +8051,66 @@
for the <el>body</el> element. See specific element vocabulary
definitions for any constraints that apply to such usage.</p>
</note>
-<p diff="add">The use of document metadata is illustrated by the following example.</p>
+<p>The use of document metadata is illustrated by the following example.</p>
<table id="metadata-vocabulary-metadata-example-1" role="example">
-<caption><phrase diff="add">Example Fragment – Document Metadata</phrase></caption>
-<tbody>
-<tr>
-<td>
-<eg xml:space="preserve">
-<phrase diff="add">...
+<caption>Example Fragment – Document Metadata</caption>
+<tbody>
+<tr>
+<td>
+<eg xml:space="preserve">
+...
<head>
<metadata xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata">
<ttm:title>Document Metadata Example</ttm:title>
<ttm:desc>This document employs document metadata.</ttm:desc>
</metadata>
</head>
-...</phrase>
+...
</eg>
</td>
</tr>
</tbody>
</table>
<p/>
-<p diff="add">The use of element metadata is illustrated by the following example.</p>
+<p>The use of element metadata is illustrated by the following example.</p>
<table id="metadata-vocabulary-metadata-example-2" role="example">
-<caption><phrase diff="add">Example Fragment – Element Metadata</phrase></caption>
-<tbody>
-<tr>
-<td>
-<eg xml:space="preserve">
-<phrase diff="add">...
+<caption>Example Fragment – Element Metadata</caption>
+<tbody>
+<tr>
+<td>
+<eg xml:space="preserve">
+...
<div>
<metadata xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata">
<ttm:title>Chapter 6 – Sherlock Holmes Gives a Demonstration</ttm:title>
<ttm:desc>Holmes shows Watson how the murderer entered the window.</ttm:desc>
</metadata>
</div>
-...</phrase>
+...
</eg>
</td>
</tr>
</tbody>
</table>
<p/>
-<p diff="add">The use of metadata attribute items is illustrated by the following example.</p>
+<p>The use of metadata attribute items is illustrated by the following example.</p>
<table id="metadata-vocabulary-metadata-example-3" role="example">
-<caption><phrase diff="add">Example Fragment – Metadata Attribute Items</phrase></caption>
-<tbody>
-<tr>
-<td>
-<eg xml:space="preserve">
-<phrase diff="add">...
+<caption>Example Fragment – Metadata Attribute Items</caption>
+<tbody>
+<tr>
+<td>
+<eg xml:space="preserve">
+...
<div xmlns:ext="http://foo.bar.example.org/ttaf1#metadata">
<metadata ext:ednote="remove this division prior to publishing"/>
</div>
-...</phrase>
-</eg>
-</td>
-</tr>
-</tbody>
-</table>
-<note role="explanation" diff="add">
+...
+</eg>
+</td>
+</tr>
+</tbody>
+</table>
+<note role="explanation">
<p>In the above example, a global attribute from a foreign (external)
namespace is used to express a metadata attribute that applies
semantically to the containing <el>div</el> element. Note that the
@@ -8410,7 +8146,7 @@
<note role="elaboration">
<p>No specific use of the <el>ttm:title</el> element is defined by this specification.</p>
</note>
-<p diff="add">Examples of the <att>ttm:name</att> element are shown above in
+<p>Examples of the <att>ttm:name</att> element are shown above in
<specref ref="metadata-vocabulary-metadata-example-1"/> and
<specref ref="metadata-vocabulary-metadata-example-2"/>.</p>
</div3>
@@ -8439,7 +8175,7 @@
<note role="elaboration">
<p>No specific use of the <el>ttm:desc</el> element is defined by this specification.</p>
</note>
-<p diff="add">Examples of the <att>ttm:desc</att> element are shown above in
+<p>Examples of the <att>ttm:desc</att> element are shown above in
<specref ref="metadata-vocabulary-metadata-example-1"/> and
<specref ref="metadata-vocabulary-metadata-example-2"/>.</p>
</div3>
@@ -8522,14 +8258,14 @@
agents may be specified (and referenced) wherein different definitions of the
character specify different actors.</p>
</note>
-<p diff="add">The use of agent metadata is illustrated by the following example.</p>
+<p>The use of agent metadata is illustrated by the following example.</p>
<table id="metadata-vocabulary-agent-example-1" role="example">
-<caption><phrase diff="add">Example Fragment – Agent Metadata</phrase></caption>
-<tbody>
-<tr>
-<td>
-<eg xml:space="preserve">
-<phrase diff="add">
+<caption>Example Fragment – Agent Metadata</caption>
+<tbody>
+<tr>
+<td>
+<eg xml:space="preserve">
+
<tt xml:lang="en" xmlns="http://www.w3.org/2006/10/ttaf1" xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata">
<head>
<phrase role="strong"><ttm:agent xml:id="connery" type="person"></phrase>
@@ -8553,13 +8289,12 @@
</div>
</body>
</tt>
-</phrase>
-</eg>
-</td>
-</tr>
-</tbody>
-</table>
-<note role="explanation" diff="add">
+</eg>
+</td>
+</tr>
+</tbody>
+</table>
+<note role="explanation">
<p>In the above example, two agents, a real (person) agent, Sean
Connery, and a fictitious (character) agent, James Bond, are defined,
where the latter is linked to the former by means of the a
@@ -8605,7 +8340,7 @@
</ulist>
<p>The relationship between the type of a name and the syntactic expression of the name
is not defined by this specification.</p>
-<p diff="add">Two examples of the <el>ttm:name</el> element are shown above in
+<p>Two examples of the <el>ttm:name</el> element are shown above in
<specref ref="metadata-vocabulary-agent-example-1"/>.</p>
</div3>
<div3 id="metadata-vocabulary-actor">
@@ -8634,12 +8369,12 @@
<p>The <att>agent</att> attribute of a <el>ttm:actor</el> element must
reference a <el>ttm:agent</el> element that denotes the person,
group, or organization acting the part of a character.</p>
-<p diff="add">An example of the <el>ttm:actor</el> element is shown above in
+<p>An example of the <el>ttm:actor</el> element is shown above in
<specref ref="metadata-vocabulary-agent-example-1"/>.</p>
</div3>
</div2>
<div2 id="metadata-attribute-vocabulary">
-<head><phrase diff="add">Metadata </phrase>Attribute Vocabulary</head>
+<head>Metadata Attribute Vocabulary</head>
<p>This section specifies the following attributes in the TT Metadata Namespace
for use with the <el>metadata</el> element and with certain content elements:</p>
<ulist>
@@ -8654,39 +8389,39 @@
<head>ttm:agent</head>
<p>The <att>ttm:agent</att> attribute takes an <code>IDREFS</code>
value, and is used with certain content elements to designate the
-<phrase diff="chg">agents that perform or are</phrase>
+agents that perform or are
involved in the performance of the content.</p>
<p>If specified, a <att>ttm:agent</att> attribute must reference
-<phrase diff="chg"><el>ttm:agent</el> element instances that appear</phrase>
+<el>ttm:agent</el> element instances that appear
as a descendent of the same document instance as
that of the referring element.</p>
-<p diff="add">An example of the <att>ttm:agent</att> attribute is shown above in
+<p>An example of the <att>ttm:agent</att> attribute is shown above in
<specref ref="metadata-vocabulary-agent-example-1"/>.</p>
</div3>
<div3 id="metadata-attribute-role">
<head>ttm:role</head>
<p>The <att>ttm:role</att> attribute may be used by a content author
to express
-<phrase diff="chg">the roles, functions, or characteristics</phrase>
+the roles, functions, or characteristics
of some content element that is so labeled.</p>
<p>If specified, the value of this attribute must adhere to the following
-syntax<phrase diff="add">, where
+syntax, where
the syntactic element <emph>S</emph> must adhere to production
[3] <code>S</code> as defined by <bibref ref="xml10"/> §
-2.3</phrase>:</p>
+2.3:</p>
<table id="metadata-attribute-role-syntax" role="syntax">
<caption>Syntax Representation – ttm:role</caption>
<tbody>
<tr>
<td>
<eg xml:space="preserve">
-ttm:role<phrase diff="add">
+ttm:role
role ( <emph>S</emph> role )*
-role</phrase>
+role
: "action"
| "caption"
-<phrase diff="add"> | "description"</phrase>
+ | "description"
| "dialog"
| "expletive"
| "kinesic"
@@ -8767,7 +8502,7 @@
<p><emph>This appendix is normative.</emph></p>
<p>This appendix specifies a dynamic flow processing model that is
used to present content in a region whose <att>tts:overflow</att>
-property is assigned a value of <phrase diff="chg"><code>dynamic</code></phrase>.</p>
+property is assigned a value of <code>dynamic</code>.</p>
<div2 id="dynamicFlowIntroduction">
<head>Introduction</head>
<p><emph>This sub-section is non-normative.</emph></p>
@@ -8785,14 +8520,10 @@
streaming contexts, even the content is not known at authoring time,
but is only known at time of streaming.</p>
<p>In describing dynamic flow, the flow process is logically divided
-into <phrase diff="chg">two</phrase> types of flow operations:</p>
+into two types of flow operations:</p>
<ulist>
<item><p><emph>fill into</emph> – causes new content
to consume extent in the designated presentation region;</p></item>
-<item><p diff="del"><emph>reflow within</emph> – causes content
-presently consuming extent to be moved, possibly entailing new line break
-positions, within its designated
-presentation region;</p></item>
<item><p><emph>clear out</emph> – causes content
presently consuming extent in the designated presentation region to no
longer consume extent.</p></item>
@@ -8814,37 +8545,18 @@
of the <code>in()</code> flow function;</p></item>
<item><p><emph>fill style</emph>, as specified by the <code>flowStyle</code> argument
of the <code>in()</code> flow function;</p></item>
-<item><p diff="del"><emph>fill transition</emph>, as specified by the <code>flowTransition</code> argument
-of the <code>in()</code> flow function;</p></item>
-<item><p diff="del"><emph>fill transition style</emph>, as specified by the
-<code>flowTransitionStyle</code> argument
-of the <code>in()</code> flow function;</p></item>
-<item>
-<p><emph>reflow unit</emph>, <phrase diff="del">as specified by the
-<code>flowUnit</code> argument of the <code>within()</code> flow
-function</phrase> <phrase diff="add">which is set to the same value as
-the <emph>clear unit</emph> parameter</phrase>;</p>
-</item>
-<item>
-<p><emph>reflow style</emph>, <phrase diff="del">as specified by the
-<code>flowStyle</code> argument of the <code>within()</code> flow
-function</phrase> <phrase diff="add">which is set to the same value as
-the <emph>clear style</emph> parameter</phrase>;</p>
-</item>
-<item><p diff="del"><emph>reflow transition</emph>, as specified by the <code>flowTransition</code> argument
-of the <code>within()</code> flow function;</p></item>
-<item><p diff="del"><emph>reflow transition style</emph>, as specified by the
-<code>flowTransitionStyle</code> argument
-of the <code>within()</code> flow function;</p></item>
+<item>
+<p><emph>reflow unit</emph>, which is set to the same value as
+the <emph>clear unit</emph> parameter;</p>
+</item>
+<item>
+<p><emph>reflow style</emph>, which is set to the same value as
+the <emph>clear style</emph> parameter;</p>
+</item>
<item><p><emph>clear unit</emph>, as specified by the <code>flowUnit</code> argument
of the <code>out()</code> flow function;</p></item>
<item><p><emph>clear style</emph>, as specified by the <code>flowStyle</code> argument
of the <code>out()</code> flow function;</p></item>
-<item><p diff="del"><emph>clear transition</emph>, as specified by the <code>flowTransition</code> argument
-of the <code>out()</code> flow function;</p></item>
-<item><p diff="del"><emph>clear transition style</emph>, as specified by the
-<code>flowTransitionStyle</code> argument
-of the <code>out()</code> flow function;</p></item>
<item><p><emph>fill interval</emph>, as specified by the <code>intra()</code>
flow interval function;</p></item>
<item><p><emph>clear interval</emph>, as specified by the <code>inter()</code>
@@ -8857,20 +8569,20 @@
</item>
</olist>
<p>Except for the computed fill and clear
-interval<phrase diff="add"> parameter</phrase>s,
-<phrase diff="add">and unless the
-<att>tts:dynamicFlow</att> property is animated, </phrase>
+interval parameters,
+and unless the
+<att>tts:dynamicFlow</att> property is animated,
the flow interval
-state parameters enumerated above are<phrase diff="add"> nominally</phrase>
+state parameters enumerated above are nominally
static and specified at authoring
-time.<phrase diff="add"> If the <att>tts:dynamicFlow</att> property is animated,
+time. If the <att>tts:dynamicFlow</att> property is animated,
then these nominally static parameters remain static between
-animation intervals.</phrase></p>
+animation intervals.</p>
</div2>
<div2 id="dynamicFlowEvents">
<head>Flow Buffer</head>
<p>Each region which is assigned a <att>tts:overflow</att> property
-with the value <phrase diff="chg"><code>dynamic</code></phrase> is associated with a <emph>flow
+with the value <code>dynamic</code> is associated with a <emph>flow
buffer</emph>, whose implementation is not defined by this
specification.</p>
<p>The content of a flow buffer is defined to be equivalent (in form) to the
@@ -8879,7 +8591,7 @@
content that is awaiting, but has not yet been flowed into (made
visible in) the
presentation region with which the flow buffer is associated.</p>
-<note role="clarification" diff="add">
+<note role="clarification">
<p>In the context of dynamic flow processing, the temporal extent of a region's flow
buffer is assumed to persist over a period that includes multiple instantiations
of synchronous intermediate documents, as described by
@@ -8911,7 +8623,7 @@
position that corresponds with the most logically subsequent content presently
visible in the region;</p></item>
<item><p>difference present, but not limited to before, between, or after
-the <phrase diff="add">logical content </phrase>positions
+the logical content positions
that correspond with the most logically prior
and subsequent content presently visible in the region;</p></item>
</olist>
@@ -8919,28 +8631,28 @@
<item><p>If any one of the conditions 2a, 2b, and 2c applies, then do not
change the flow buffer.</p></item>
<item><p>If condition 2d applies, then instantaneously replace
-the<phrase diff="add"> affected</phrase>
+the affected
content of the flow buffer with the new content (in part or in whole) that corresponds with
time <code>T<sub>k+1</sub></code> such that the
-<phrase diff="add">logical content </phrase>position
+logical content position
of the content that
corresponds with the start of the flow buffer does not change with
respect to the corresponding
-<phrase diff="add">logical content </phrase>position of the previous content.</p></item>
+logical content position of the previous content.</p></item>
<item><p>If condition 2e applies, then subdivide the new content that
corresponds with time <code>T<sub>k+1</sub></code> into two parts: (1)
that part that wholly precedes the
-<phrase diff="add">logical content </phrase>position that corresponds with the
+logical content position that corresponds with the
most logically subsequent content presently visible in the region, and
(2) that part that corresponds with or wholly follows the
-<phrase diff="add">logical content </phrase>position
+logical content position
that corresponds with the most logically subsequent content presently
visible in the region, then ignore the first part and process the second part
in the same manner as if condition 2d had originally applied.</p></item>
<item><p>If after performing the above steps the flow buffer is
non-empty, then perform the following steps:</p>
<olist>
-<item><p diff="add">If, due to style property animation, the dynamic
+<item><p>If, due to style property animation, the dynamic
flow state parameters for the region have changed since last performing
this procedure, then re-perform the process described in <specref
ref="dynamicFlowIntervalTimingCalculation"/>, then reset both fill and
@@ -8952,7 +8664,7 @@
</olist>
</item>
</olist>
-<p diff="add">In the procedure described above, the content of a flow
+<p>In the procedure described above, the content of a flow
buffer at time <code>T<sub>k</sub></code> is considered to be
significantly different from the content of the same flow buffer at
time <code>T<sub>k+1</sub></code> if the set of glyph areas that would
@@ -8960,28 +8672,28 @@
<code>T<sub>k</sub></code> differs from the set of glyph areas that
would be produced by formatting the content at time
<code>T<sub>k+1</sub></code> in any of the following ways:</p>
-<ulist diff="add">
+<ulist>
<item><p>the number of glyph areas are different;</p></item>
<item><p>the (positionally) ordered sets of glyphs associated with the
two sets of glyph areas are different;</p></item>
<item><p>the positions assigned to the glyph images associated with the two
sets of glyph areas are different;</p></item>
</ulist>
-<note role="elaboration" diff="add">
+<note role="elaboration">
<p>Other potential, but insignificant differences (as far as flow
buffer processing is concerned) between the two sets of glyph areas
are ignored, including (among others) differences in: background
color, foreground color, glyph decoration(s), actual presentation
order of glyphs (independently from their assigned position).</p>
</note>
-<p diff="add">If the value of a style property assigned to content
+<p>If the value of a style property assigned to content
awaiting in a flow buffer or already dynamically flowed into a
presentation region is changed due to animation or other temporal
effects, and that style property change is not otherwise construed as
a significant difference between temporal flow buffer states as
described above, then the semantic, presentation effects of that
change of value still apply.</p>
-<p diff="add">In the procedure described above,
+<p>In the procedure described above,
the phrase <emph>logical content position</emph> refers to a tuple
[active duration begin time,
active duration end time,
@@ -8998,7 +8710,7 @@
sub-tree (of the synchronic intermediate document instance)
associated with the presentation region of the current flow buffer.
</p>
-<p diff="add">A logical content position <emph>P<sub>0</sub></emph> is
+<p>A logical content position <emph>P<sub>0</sub></emph> is
considered to be <emph>prior</emph> to (before) logical content
position <emph>P<sub>1</sub></emph> if (1) the active duration begin
time of <emph>P<sub>0</sub></emph> is temporally prior to the active
@@ -9025,12 +8737,12 @@
<head>Flow Interval Timing Calculation</head>
<p>Flow interval timing is either statically specified at authoring
time or is dependent upon
-<phrase diff="add">animation of the <att>tts:dynamicFlow</att>
-style property or upon </phrase>the content of the flow buffer or the
+animation of the <att>tts:dynamicFlow</att>
+style property or upon the content of the flow buffer or the
presentation region or both, in which case timing is recomputed
-dynamically upon changes to <phrase diff="add">style property, </phrase>the
-content of the flow buffer<phrase diff="add">,</phrase> or the presentation
-region<phrase diff="del"> or both</phrase>.</p>
+dynamically upon changes to style property, the
+content of the flow buffer, or the presentation
+region.</p>
<div3 id="flowIntervalFillTiming">
<head>Computed Fill Timing Interval</head>
<p>The computed fill timing interval is determined as follows:</p>
@@ -9040,9 +8752,8 @@
interval;</p></item>
<item><p>otherwise, if the value of the <emph>fill interval</emph> parameter is a
definite rate, then the computed fill interval is equal to the
-<phrase diff="del">number of fill units currently available in the
-<emph>flow buffer</emph> divided by</phrase><phrase diff="add">inverse
-of the</phrase> specified rate (in fill units per second);</p></item>
+inverse
+of the specified rate (in fill units per second);</p></item>
<item><p>otherwise, if the value of the <emph>fill interval</emph> is
<code>auto</code>, then the computed fill interval is equal to the
difference between the time coordinate associated with the most
@@ -9062,11 +8773,7 @@
interval;</p></item>
<item><p>otherwise, if the value of the <emph>clear interval</emph> parameter is a
definite rate, then the computed clear interval is equal to the
-<phrase diff="del">number of clear units currently
-available in the <emph>presentation region</emph> divided
-by</phrase><phrase diff="add">inverse of the</phrase>
-specified rate
-(in clear units per second);</p></item>
+specified rate (in clear units per second);</p></item>
<item><p>otherwise, if the value of the <emph>clear interval</emph> is
<code>auto</code>, then the computed clear interval is equal to the
difference between the time coordinate associated with the most
@@ -9082,9 +8789,9 @@
<head>Flow Operations</head>
<p>Flow operations perform the filling, reflowing, and clearing of
formatted content into, within, and from
-a presentation <phrase diff="add">region </phrase>undergoing dynamic
+a presentation region undergoing dynamic
flow processing.</p>
-<p diff="add">When performing flow operations, the fill unit state parameters that
+<p>When performing flow operations, the fill unit state parameters that
apply to these operations determine which logical content and
which formatted content are affected. If a fill unit is expressed in terms
of logical content units, then the logical content corresponds in turn
@@ -9092,7 +8799,7 @@
expressed in terms of formatted content units, then the formatted
content corresponds in turn with the logical content that generates
this formatted content.</p>
-<p diff="add">Flow operations apply simultaneously to logical content
+<p>Flow operations apply simultaneously to logical content
and to its corresponding formatted content. In the context of the
presentation region, fill, reflow, and clear operations operate on
formatted content units (glyph, inline, line, and block areas);
@@ -9104,7 +8811,7 @@
deterministically related to one another, an operation upon logical
units can always be described in terms of operations on formatted
units, and vice-versa.</p>
-<note role="elaboration" diff="add">
+<note role="elaboration">
<p>In general, there is not a one-to-one correspondence between
logical content units and formatted content units. A single logical
content unit often corresponds to multiple formatted content
@@ -9114,7 +8821,7 @@
single glyph area may correspond to multiple character information
items.</p>
</note>
-<p diff="add">When effecting the result of a flow operation on a
+<p>When effecting the result of a flow operation on a
presentation region, the direction of (apparent)
translation of formatted content is determined by the nature of the
affected formatted content element. If the affected formatted content
@@ -9126,7 +8833,7 @@
progression direction that applies to the nearest immediate ancestor
block, and it is translated in a direction towards the before edge of
this ancestor area.</p>
-<p diff="add">If the <code>smooth</code> flow style applies to a flow
+<p>If the <code>smooth</code> flow style applies to a flow
operation, then the direction of (apparent) translation of pixels that
belong to the affected formatted content follows the direction of
translation of the formatted content units as determined above.</p>
@@ -9135,10 +8842,10 @@
to be performed:</p>
<olist>
<item><p>remove sufficient
-<phrase diff="add">logical </phrase>content
+logical content
from the beginning of the
<emph>flow buffer</emph> to constitute
-<phrase diff="add">(or compose) </phrase>a
+(or compose) a
<emph>fill
unit</emph>;</p>
</item>
@@ -9152,10 +8859,10 @@
region, where new glyph areas are appended to the current line area
and new line areas are appended to the sequence of line areas;</p></item>
<item><p>cause the newly appended areas to be made visible according
-to the <emph>fill style</emph><phrase diff="del">, <emph>fill transition</emph>, and <emph>fill transition
-style</emph></phrase> state parameter<phrase diff="del">s</phrase> in force.</p></item>
+to the <emph>fill style</emph>
+state parameter in force.</p></item>
</olist>
-<note role="elaboration" diff="add">
+<note role="elaboration">
<p>In certain cases, it may be necessary to retain logical content
removed from the flow buffer in an intermediate, holding buffer. This
will be the case when the smallest logical content unit of a flow
@@ -9172,21 +8879,19 @@
to be performed:</p>
<olist>
<item>
-<p>translate glyph areas<phrase diff="add">, inline
-areas,</phrase><phrase diff="del"> or</phrase> (full or partial
-measure) line areas <phrase diff="add">, or block areas </phrase>that
+<p>translate glyph areas, inline
+areas, (full or partial
+measure) line areas , or block areas that
correspond with a <emph>reflow unit</emph> of formatted content that
follows (in inline or block progression dimension order) the space
cleared by the immediately preceding <emph>clear operation</emph> to a
new position such that the glyph area that corresponds to the most
logically prior content is aligned with the before and start edges of
the presentation region, and where the translation adheres to the
-<emph>reflow style</emph><phrase diff="del">, <emph>reflow
-transition</emph>, and <emph>reflow transition style</emph></phrase>
-state parameter<phrase diff="del">s</phrase> in force.</p>
+<emph>reflow style</emph> state parameter in force.</p>
</item>
</olist>
-<note role="elaboration" diff="add">
+<note role="elaboration">
<p>If a reflow unit is based on logical content units, then "reflow
unit of formatted content" refers to the logical content that
generates the block, line, inline and glyph areas of formatted
@@ -9202,18 +8907,16 @@
to be performed:</p>
<olist>
<item>
-<p>remove glyph areas<phrase diff="add">, inline
-areas,</phrase><phrase diff="del"> or</phrase> (full or partial
-measure) line areas<phrase diff="add">, or block areas </phrase> that
+<p>remove glyph areas, inline
+areas, (full or partial
+measure) line areas, or block areas that
correspond with a <emph>clear unit</emph> of formatted content from
the starting edge or the before edge of the presentation region in
inline or block progression direction, respectively, applying the
-<emph>clear style</emph><phrase diff="del">, <emph>clear
-transition</emph>, and <emph>clear transition style</emph></phrase>
-state parameter<phrase diff="del">s</phrase> in force.</p>
+<emph>clear style</emph> state parameter in force.</p>
</item>
</olist>
-<note role="elaboration" diff="add">
+<note role="elaboration">
<p>If a clear unit is based on logical content units, then "clear unit
of formatted content" refers to the logical content that generates the
block, line, inline and glyph areas of formatted content that are
@@ -9228,7 +8931,7 @@
<head>Flow Timers</head>
<p>Flow timers control the filling and clearing of formatted content
from a presentation undergoing dynamic flow processing.</p>
-<p diff="add">In the case of continuous time bases, the timeline of
+<p>In the case of continuous time bases, the timeline of
flow timers follows (is synchronized with) the time base that applies
to the document instance as determined by the <loc
href="#parameter-attribute-timeBase"><att>ttp:timeBase</att></loc>
@@ -9313,7 +9016,7 @@
normative definitions of document type, element type, or attribute type
as defined by the body of this specification, then the body of this
specification takes precedence.</p>
-<div2 id="dfxp-schema-rnc" diff="chg">
+<div2 id="dfxp-schema-rnc">
<head>Relax NG Schema</head>
<p>This section specifies a Relax NG Compact Syntax (RNC) <bibref ref="rng"/> based schema
for DFXP, also available in a <loc href="rnc/schema.zip">ZIP
@@ -9394,7 +9097,7 @@
</div4>
</div3>
</div2>
-<div2 id="dfxp-schema-xsd" diff="chg">
+<div2 id="dfxp-schema-xsd">
<head>XML Schema Definition (XSD) Schema</head>
<p>This section specifies a W3C XML Schema Definition (XSD) <bibref ref="xsd-1"/> based schema
for DFXP, also available in a <loc href="xsd/schema.zip">ZIP
@@ -9608,7 +9311,7 @@
</gitem>
</glist>
</div1>
-<div1 id="features" diff="add">
+<div1 id="features">
<head>Features</head>
<p><emph>This appendix is normative.</emph></p>
<p>This appendix specifies (1) a set of feature designations, each of which
@@ -12099,7 +11802,7 @@
</table>
</div2>
</div1>
-<div1 id="extensions" diff="add">
+<div1 id="extensions">
<head>Extensions</head>
<p><emph>This appendix is normative.</emph></p>
<p>This appendix specifies the syntactic form of extension designations, which are
@@ -12135,7 +11838,7 @@
identifier.</p>
</div2>
</div1>
-<div1 id="profiles" diff="add">
+<div1 id="profiles">
<head>Profiles</head>
<p><emph>This appendix is normative.</emph></p>
<p>This appendix specifies the following standard TT AF profiles:</p>
@@ -12221,16 +11924,11 @@
May 1999. (See
<xspecref href="http://www.w3.org/TR/1999/WAI-WEBCONTENT-19990505/">http://www.w3.org/TR/1999/WAI-WEBCONTENT-19990505/</xspecref>.)
</bibl>
-<bibl id="xml10" key="XML 1.0" diff="add">Tim Bray, et al.
+<bibl id="xml10" key="XML 1.0">Tim Bray, et al.
<titleref href="http://www.w3.org/TR/2008/REC-xml-20081126/">Extensible Markup Language (XML)
1.0 (Fifth Edition)</titleref>, W3C Recommendation, 26 November 2008. (See
<xspecref href="http://www.w3.org/TR/2008/REC-xml-20081126/">http://www.w3.org/TR/2008/REC-xml-20081126/</xspecref>.)
</bibl>
-<bibl id="xml11" key="XML 1.1" diff="del">Tim Bray, et al.
-<titleref href="http://www.w3.org/TR/2004/REC-xml-20040204/">Extensible Markup Language (XML)
-1.1</titleref>, W3C Recommendation, 04 February 2004, updated 15 Apr 2004. (See
-<xspecref href="http://www.w3.org/TR/2004/REC-xml-20040204/">http://www.w3.org/TR/2004/REC-xml-20040204/</xspecref>.)
-</bibl>
<bibl id="xmlid" key="XML ID">Jonathan Marsh, Daniel Veillard, Norman Walsh, Eds.,
<titleref href="http://www.w3.org/TR/2005/REC-xml-id-20050909/">xml:id Version 1.0</titleref>,
W3C Recommendation, 09 September 2005. (See
@@ -12255,16 +11953,11 @@
<xspecref
href="http://www.rfc-editor.org/rfc/rfc3023.txt">http://www.rfc-editor.org/rfc/rfc3023.txt</xspecref>.)
</bibl>
-<bibl id="xmlns10" key="XML Namespaces 1.0" diff="add">Tim Bray, et al.
+<bibl id="xmlns10" key="XML Namespaces 1.0">Tim Bray, et al.
<titleref href="http://www.w3.org/TR/2006/REC-xml-names-20060816/">Namespaces
in XML 1.0 (Second Edition)</titleref>, W3C Recommendation, 16 August 2006. (See
<xspecref href="http://www.w3.org/TR/2006/REC-xml-names-20060816/">http://www.w3.org/TR/2006/REC-xml-names11-20060816/</xspecref>.)
</bibl>
-<bibl id="xmlns11" key="XML Namespaces 1.1" diff="del">Tim Bray, et al.
-<titleref href="http://www.w3.org/TR/2004/REC-xml-names11-20040204/">Namespaces
-in XML 1.1</titleref>, W3C Recommendation, 04 February 2004. (See
-<xspecref href="http://www.w3.org/TR/2004/REC-xml-names11-20040204/">http://www.w3.org/TR/2004/REC-xml-names11-20040204/</xspecref>.)
-</bibl>
<bibl id="xsd-1" key="XML Schema Part 1">Henry S. Thompson, David Beech,
Murray Maloney, Noah Mendelsohn, Eds.,
<titleref href="http://www.w3.org/TR/xmlschema-1/">XML Schema Part 1: Structures</titleref>,
@@ -12276,12 +11969,7 @@
W3C Recommendation, 28 October 2004. (See
<xspecref href="http://www.w3.org/TR/xmlschema-2/">http://www.w3.org/TR/xmlschema-2/</xspecref>.)
</bibl>
-<bibl id="xsl10" key="XSL 1.0" diff="del">Sharon Adler, Anders Berglund, et al., Eds.,
-<titleref href="http://www.w3.org/TR/2001/REC-xsl-20011015/">Extensible Stylesheet Language, Version 1.0</titleref>,
-W3C Recommendation, 15 October 2001. (See
-<xspecref href="http://www.w3.org/TR/2001/REC-xsl-20011015/">http://www.w3.org/TR/2001/REC-xsl-20011015/</xspecref>.)
-</bibl>
-<bibl id="xsl11" key="XSL 1.1" diff="add">Anders Berglund,
+<bibl id="xsl11" key="XSL 1.1">Anders Berglund,
<titleref href="http://www.w3.org/TR/2006/REC-xsl11-20061205/">Extensible Stylesheet Language (XSL) Version 1.1</titleref>,
W3C Recommendation, 05 December 2006. (See
<xspecref href="http://www.w3.org/TR/2006/REC-xsl11-20061205/">http://www.w3.org/TR/2006/REC-xsl11-20061205/</xspecref>.)
@@ -13001,39 +12689,39 @@
</tr>
<tr>
-<td><phrase diff="add"><loc href="#parameter-vocabulary-extension"><code>ttp:extension</code></loc></phrase></td>
-<td><phrase diff="add"><code>@requiredExtensions</code></phrase></td>
-<td><phrase diff="add"><bibref ref="svg11"/></phrase></td>
-<td><phrase diff="add">conceptual derivation</phrase></td>
-<td><phrase diff="add">10</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#parameter-vocabulary-extensions"><code>ttp:extensions</code></loc></phrase></td>
-<td><phrase diff="add"><code>@requiredExtensions</code></phrase></td>
-<td><phrase diff="add"><bibref ref="svg11"/></phrase></td>
-<td><phrase diff="add">conceptual derivation</phrase></td>
-<td><phrase diff="add">10</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#parameter-vocabulary-feature"><code>ttp:feature</code></loc></phrase></td>
-<td><phrase diff="add"><code>@requiredFeatures</code></phrase></td>
-<td><phrase diff="add"><bibref ref="svg11"/></phrase></td>
-<td><phrase diff="add">conceptual derivation</phrase></td>
-<td><phrase diff="add">10</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#parameter-vocabulary-features"><code>ttp:features</code></loc></phrase></td>
-<td><phrase diff="add"><code>@requiredFeatures</code></phrase></td>
-<td><phrase diff="add"><bibref ref="svg11"/></phrase></td>
-<td><phrase diff="add">conceptual derivation</phrase></td>
-<td><phrase diff="add">10</phrase></td>
-</tr>
-<tr>
-<td><phrase diff="add"><loc href="#parameter-vocabulary-profile"><code>ttp:profile</code></loc></phrase></td>
-<td><phrase diff="add"><code>@baseProfile</code></phrase></td>
-<td><phrase diff="add"><bibref ref="svg11"/></phrase></td>
-<td><phrase diff="add">conceptual derivation</phrase></td>
-<td><phrase diff="add">11</phrase></td>
+<td><loc href="#parameter-vocabulary-extension"><code>ttp:extension</code></loc></td>
+<td><code>@requiredExtensions</code></td>
+<td><bibref ref="svg11"/></td>
+<td>conceptual derivation</td>
+<td>10</td>
+</tr>
+<tr>
+<td><loc href="#parameter-vocabulary-extensions"><code>ttp:extensions</code></loc></td>
+<td><code>@requiredExtensions</code></td>
+<td><bibref ref="svg11"/></td>
+<td>conceptual derivation</td>
+<td>10</td>
+</tr>
+<tr>
+<td><loc href="#parameter-vocabulary-feature"><code>ttp:feature</code></loc></td>
+<td><code>@requiredFeatures</code></td>
+<td><bibref ref="svg11"/></td>
+<td>conceptual derivation</td>
+<td>10</td>
+</tr>
+<tr>
+<td><loc href="#parameter-vocabulary-features"><code>ttp:features</code></loc></td>
+<td><code>@requiredFeatures</code></td>
+<td><bibref ref="svg11"/></td>
+<td>conceptual derivation</td>
+<td>10</td>
+</tr>
+<tr>
+<td><loc href="#parameter-vocabulary-profile"><code>ttp:profile</code></loc></td>
+<td><code>@baseProfile</code></td>
+<td><bibref ref="svg11"/></td>
+<td>conceptual derivation</td>
+<td>11</td>
</tr>
</tbody>
</table>
@@ -13081,12 +12769,12 @@
elements.</p>
</item>
<item>
-<p diff="add">Derived from the use of <code>@requiredExtensions</code>
+<p>Derived from the use of <code>@requiredExtensions</code>
and <code>@requiredFeatures</code> on the <code>svg:svg</code> element,
but extended to support distinct specification of optionality.</p>
</item>
<item>
-<p diff="add">Derived from the use of <code>@baseProfile</code>
+<p>Derived from the use of <code>@baseProfile</code>
and <code>@version</code> on the <code>svg:svg</code> element.</p>
</item>
</olist>
@@ -13271,42 +12959,42 @@
<td><loc href="#style-attribute-backgroundColor"><code>tts:backgroundColor</code></loc></td>
<td><code>background-color</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td>1,6</td>
</tr>
<tr>
<td><loc href="#style-attribute-color"><code>tts:color</code></loc></td>
<td><code>color</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td>6</td>
</tr>
<tr>
<td><loc href="#style-attribute-direction"><code>tts:direction</code></loc></td>
<td><code>direction</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td></td>
</tr>
<tr>
<td><loc href="#style-attribute-display"><code>tts:display</code></loc></td>
<td><code>display</code></td>
<td><bibref ref="css2"/></td>
-<td>only <code>auto</code>, <code>none</code><phrase diff="del">, inherit</phrase></td>
+<td>only <code>auto</code>, <code>none</code></td>
<td></td>
</tr>
<tr>
<td><loc href="#style-attribute-displayAlign"><code>tts:displayAlign</code></loc></td>
<td><code>display-align</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td>1</td>
</tr>
<tr>
<td><loc href="#style-attribute-dynamicFlow"><code>tts:dynamicFlow</code></loc></td>
<td><emph>none</emph></td>
<td></td>
-<td>defines <phrase diff="chg">dynamic</phrase> overflow behavior</td>
+<td>defines dynamic overflow behavior</td>
<td></td>
</tr>
<tr>
@@ -13320,42 +13008,42 @@
<td><loc href="#style-attribute-fontFamily"><code>tts:fontFamily</code></loc></td>
<td><code>font-family</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="add"><code>-inherit</code>, </phrase>extends generic family names</td>
+<td><code>-inherit</code>, extends generic family names</td>
<td>1</td>
</tr>
<tr>
<td><loc href="#style-attribute-fontSize"><code>tts:fontSize</code></loc></td>
<td><code>font-size</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td>1,7</td>
</tr>
<tr>
<td><loc href="#style-attribute-fontStyle"><code>tts:fontStyle</code></loc></td>
<td><code>font-style</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="add"><code>-inherit</code>, </phrase>uses alias <code>reverseOblique</code> for <code>backslant</code></td>
+<td><code>-inherit</code>, uses alias <code>reverseOblique</code> for <code>backslant</code></td>
<td>1</td>
</tr>
<tr>
<td><loc href="#style-attribute-fontWeight"><code>tts:fontWeight</code></loc></td>
<td><code>font-weight</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="add"><code>-inherit</code>, </phrase><code>-bolder</code>, <code>-lighter</code>, <code>-<number></code></td>
+<td><code>-inherit</code>, <code>-bolder</code>, <code>-lighter</code>, <code>-<number></code></td>
<td>1</td>
</tr>
<tr>
<td><loc href="#style-attribute-lineHeight"><code>tts:lineHeight</code></loc></td>
<td><code>line-height</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="add"><code>-inherit</code>, </phrase><code>-<number></code>, <code>-<space></code></td>
+<td><code>-inherit</code>, <code>-<number></code>, <code>-<space></code></td>
<td>1</td>
</tr>
<tr>
<td><loc href="#style-attribute-opacity"><code>tts:opacity</code></loc></td>
<td><code>opacity</code></td>
<td><bibref ref="css3-color"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td></td>
</tr>
<tr>
@@ -13369,77 +13057,77 @@
<td><loc href="#style-attribute-overflow"><code>tts:overflow</code></loc></td>
<td><code>overflow</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="add"><code>-inherit</code>, </phrase><code>-auto</code>, <code>-error-if-overflow</code>; <phrase diff="chg"><code>+dynamic</code></phrase></td>
+<td><code>-inherit</code>, <code>-auto</code>, <code>-error-if-overflow</code>; <code>+dynamic</code></td>
<td>8</td>
</tr>
<tr>
<td><loc href="#style-attribute-padding"><code>tts:padding</code></loc></td>
<td><code>padding</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td>9</td>
</tr>
<tr>
<td><loc href="#style-attribute-showBackground"><code>tts:showBackground</code></loc></td>
<td><code>showBackground</code></td>
<td><bibref ref="smil21"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td></td>
</tr>
<tr>
<td><loc href="#style-attribute-textAlign"><code>tts:textAlign</code></loc></td>
<td><code>text-align</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td>1</td>
</tr>
<tr>
<td><loc href="#style-attribute-textDecoration"><code>tts:textDecoration</code></loc></td>
<td><code>text-decoration</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
-<td>1,10<phrase diff="add">,13</phrase></td>
+<td><code>-inherit</code></td>
+<td>1,10,13</td>
</tr>
<tr>
<td><loc href="#style-attribute-textOutline"><code>tts:textOutline</code></loc></td>
<td><code>text-shadow</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
-<td>11<phrase diff="add">,13</phrase></td>
+<td><code>-inherit</code></td>
+<td>11,13</td>
</tr>
<tr>
<td><loc href="#style-attribute-unicodeBidi"><code>tts:unicodeBidi</code></loc></td>
<td><code>unicode-bidi</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td>1</td>
</tr>
<tr>
<td><loc href="#style-attribute-visibility"><code>tts:visibility</code></loc></td>
<td><code>visibility</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="add"><code>-inherit</code>, </phrase><code>-collapse</code></td>
+<td><code>-inherit</code>, <code>-collapse</code></td>
<td></td>
</tr>
<tr>
<td><loc href="#style-attribute-wrapOption"><code>tts:wrapOption</code></loc></td>
<td><code>wrap-option</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td>1</td>
</tr>
<tr>
<td><loc href="#style-attribute-writingMode"><code>tts:writingMode</code></loc></td>
<td><code>writing-mode</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="add"><code>-inherit</code>, </phrase><code>+tblr</code></td>
+<td><code>-inherit</code>, <code>+tblr</code></td>
<td>1</td>
</tr>
<tr>
<td><loc href="#style-attribute-zIndex"><code>tts:zIndex</code></loc></td>
<td><code>z-index</code></td>
<td><bibref ref="xsl11"/></td>
-<td><phrase diff="chg"><code>-inherit</code></phrase></td>
+<td><code>-inherit</code></td>
<td>1</td>
</tr>
<tr>
@@ -13529,7 +13217,7 @@
square.</p>
</item>
<item>
-<p>The value <phrase diff="chg"><code>dynamic</code></phrase> is defined in terms of the
+<p>The value <code>dynamic</code> is defined in terms of the
<att>tts:dynamicFlow</att> style property.</p>
</item>
<item>
@@ -13555,7 +13243,7 @@
ref="content-attribute-space"/>.</p>
</item>
<item>
-<p diff="add">Defined to be inheritable.</p>
+<p>Defined to be inheritable.</p>
</item>
</olist>
</note>
@@ -13964,7 +13652,7 @@
<inform-div1 id="change-history">
<head>Change History</head>
-<div2 id="change-history-cr1-to-wd1" diff='add'>
+<div2 id="change-history-cr1-to-wd1">
<head>Changes since Candidate Recommendation</head>
<eg xml:space="preserve">