Merge pull request #1143 from w3c/issue-1141-data-embeddings

Widen scope of reference and sourced data embedding terms (#1141).

spec/ttml2.xml

@@ -1683,9 +1683,9 @@ constraints specify by <specref ref="reduced-infoset"/>.</p>
 <gitem id="terms-reference-data-embedding">
 <label>[reference data embedding]</label>
 <def>
-<p>A <loc href="#embedded-content-vocabulary-data"><el>data</el></loc> element that indirectly references the content
-of an <loc href="#terms-embedded-data-resource">embedded data resource</loc> by making use of a
-<att>src</att> attribute that references a data source.</p>
+<p>An <loc href="#terms-embedded-content-element">embedded content element</loc> that indirectly references the content
+of an <loc href="#terms-embedded-content-resource">embedded content resource</loc> by making use of a
+<att>src</att> attribute.</p>
 </def>
 </gitem>
 <gitem id="terms-region">
@@ -1792,8 +1792,8 @@ as a broadcast audio/video stream.</p>
 <gitem id="terms-sourced-data-embedding">
 <label>[sourced data embedding]</label>
 <def>
-<p>A <loc href="#embedded-content-vocabulary-data"><el>data</el></loc> element that indirectly references the content
-of an <loc href="#terms-embedded-data-resource">embedded data resource</loc> by making use of a
+<p>An <loc href="#terms-embedded-content-element">embedded content element</loc> that indirectly references the content
+of an <loc href="#terms-embedded-content-resource">embedded content resource</loc> by making use of a
 child <loc href="#embedded-content-vocabulary-source"><el>source</el></loc> element.</p>
 </def>
 </gitem>
@@ -7263,7 +7263,9 @@ zero or more elements in the <loc href="#element-vocab-group-animation"><code>An
 </tr>
 </tbody>
 </table>
-<p>An <el>audio</el> element designates an <loc href="#terms-audio-resource">audio resource</loc> by
+<p>An <el>audio</el> element designates an <loc href="#terms-audio-resource">audio resource</loc> by using either
+a <loc href="#terms-reference-data-embedding">reference data embedding</loc> or
+a <loc href="#terms-sourced-data-embedding">sourced data embedding</loc>, which entails
 (1) referring to a <loc href="#terms-built-in-data-resource">built-in data resource</loc>,
 (2) referring to an <loc href="#terms-external-data-resource">external data resource</loc>, or
 (3) defining or referring to an <loc href="#terms-embedded-data-resource">embedded data resource</loc>,
@@ -7652,7 +7654,9 @@ zero or more elements in the <loc href="#element-vocab-group-metadata"><code>Met
 </tr>
 </tbody>
 </table>
-<p>A <el>font</el> element defines a <loc href="#terms-font-resource">font resource</loc> by
+<p>A <el>font</el> element defines a <loc href="#terms-font-resource">font resource</loc> by using either
+a <loc href="#terms-reference-data-embedding">reference data embedding</loc> or
+a <loc href="#terms-sourced-data-embedding">sourced data embedding</loc>, which entails
 (1) referring to a <loc href="#terms-built-in-data-resource">built-in data resource</loc>,
 (2) referring to an <loc href="#terms-external-data-resource">external data resource</loc>, or
 (3) defining or referring to an <loc href="#terms-embedded-data-resource">embedded data resource</loc>,
@@ -7794,7 +7798,9 @@ zero or more <loc href="#embedded-content-vocabulary-source"><el>source</el></lo
 </tr>
 </tbody>
 </table>
-<p>An <el>image</el> element defines an <loc href="#terms-image-resource">image resource</loc> by
+<p>An <el>image</el> element defines an <loc href="#terms-image-resource">image resource</loc> by using either
+a <loc href="#terms-reference-data-embedding">reference data embedding</loc> or
+a <loc href="#terms-sourced-data-embedding">sourced data embedding</loc>, which entails
 (1) referring to a <loc href="#terms-built-in-data-resource">built-in data resource</loc>,
 (2) referring to an <loc href="#terms-external-data-resource">external data resource</loc>, or
 (3) defining or referring to an <loc href="#terms-embedded-data-resource">embedded data resource</loc>,