Skip to content

Commit

Permalink
Metadata attributes apply as well as elements (#1273)
Browse files Browse the repository at this point in the history
* Metadata attributes apply as well as elements

Closes #1271

Also made a grammar fix where plurals "Any metadata" and "Any parameters" had singular "applies" form of the verb - replaced with plural "apply".

* Reorder wording to address potential ambiguity

Intended to address @skynavga 's review comments
  • Loading branch information
nigelmegitt authored Jun 12, 2024
1 parent d35fa21 commit d793829
Showing 1 changed file with 18 additions and 13 deletions.
31 changes: 18 additions & 13 deletions spec/ttml2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6170,10 +6170,10 @@ followed by zero or one <loc href="#styling-vocabulary-styling"><el>styling</el>
followed by zero or one <loc href="#layout-vocabulary-layout"><el>layout</el></loc> element,
followed by zero or one <loc href="#animation-vocabulary-animation"><el>animation</el></loc> element.</p>
<p>Any metadata specified by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc>
element group applies semantically to the <loc href="#terms-document-instance">document instance</loc> as a
element group apply semantically to the <loc href="#terms-document-instance">document instance</loc> as a
whole, and not just the <el>head</el> element.</p>
<p>Any parameters specified by children in the <code>Parameters.class</code>
element group applies semantically to the <loc href="#terms-document-instance">document instance</loc> as a
element group apply semantically to the <loc href="#terms-document-instance">document instance</loc> as a
whole, and not just the <el>head</el> element.</p>
<p>A <el>resources</el> child element is used to specify embedded content constructs
that are referenced from certain style constructs and
Expand Down Expand Up @@ -6218,8 +6218,9 @@ elements in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</
followed by zero or more
elements in the <loc href="#element-vocab-group-animation"><code>Animation.class</code></loc> element group,
followed by zero or more <el>div</el> or <loc href="#element-vocab-group-embedded"><code>Embedded.class</code></loc> element group elements.</p>
<p>Any metadata specified by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc>
element group applies semantically to the <el>body</el> element and its descendants as a whole.</p>
<p>Any metadata specified by <loc href="#attribute-vocab-group-metadata">Metadata attributes</loc>
or by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc> element group
apply semantically to the <el>body</el> element and its descendants as a whole.</p>
<p>Any animation elements specified by children in the <loc href="#element-vocab-group-animation"><code>Animation.class</code></loc>
element group apply semantically to the <el>body</el> element.</p>
<table id="elt-syntax-body" role="syntax">
Expand Down Expand Up @@ -6312,8 +6313,9 @@ followed by zero or one
element in the <loc href="#element-vocab-group-layout"><code>Layout.class</code></loc> element group,
followed by zero or more elements in the <loc href="#element-vocab-group-block"><code>Block.class</code></loc> or
<loc href="#element-vocab-group-embedded"><code>Embedded.class</code></loc> element groups.</p>
<p>Any metadata specified by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc>
element group applies semantically to the <el>div</el> element and its descendants as a whole.</p>
<p>Any metadata specified by <loc href="#attribute-vocab-group-metadata">Metadata attributes</loc>
or by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc> element group
apply semantically to the <el>div</el> element and its descendants as a whole.</p>
<p>Any animation elements specified by children in the <loc href="#element-vocab-group-animation"><code>Animation.class</code></loc>
element group apply semantically to the <el>div</el> element.</p>
<table id="elt-syntax-div" role="syntax">
Expand Down Expand Up @@ -6372,8 +6374,9 @@ followed by zero or one
element in the <loc href="#element-vocab-group-layout"><code>Layout.class</code></loc> element group,
followed by zero or more elements in the <loc href="#element-vocab-group-inline"><code>Inline.class</code></loc> or
<loc href="#element-vocab-group-embedded"><code>Embedded.class</code></loc> element groups.</p>
<p>Any metadata specified by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc>
element group applies semantically to the <el>p</el> element and its descendants as a whole.</p>
<p>Any metadata specified by <loc href="#attribute-vocab-group-metadata">Metadata attributes</loc>
or by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc> element group
apply semantically to the <el>p</el> element and its descendants as a whole.</p>
<p>Any animation elements specified by children in the <loc href="#element-vocab-group-animation"><code>Animation.class</code></loc>
element group apply semantically to the <el>p</el> element.</p>
<table id="elt-syntax-p" role="syntax">
Expand Down Expand Up @@ -6443,8 +6446,9 @@ followed by zero or more
elements in the <loc href="#element-vocab-group-animation"><code>Animation.class</code></loc> element group,
followed by zero or more elements in the <loc href="#element-vocab-group-inline"><code>Inline.class</code></loc> or
<loc href="#element-vocab-group-embedded"><code>Embedded.class</code></loc> element groups.</p>
<p>Any metadata specified by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc>
element group applies semantically to the <el>span</el> element and its descendants as a whole.</p>
<p>Any metadata specified by <loc href="#attribute-vocab-group-metadata">Metadata attributes</loc>
or by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc> element group
apply semantically to the <el>span</el> element and its descendants as a whole.</p>
<p>Any animation elements specified by children in the <loc href="#element-vocab-group-animation"><code>Animation.class</code></loc>
element group apply semantically to the <el>span</el> element.</p>
<table id="elt-syntax-span" role="syntax">
Expand Down Expand Up @@ -6514,8 +6518,9 @@ is subject to <phrase role="strong"><loc href="#procedure-construct-anonymous-sp
<div3 id="content-vocabulary-br">
<head>br</head>
<p>The <el>br</el> element denotes an explicit line break.</p>
<p>Any metadata specified by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc>
element group applies semantically to the <el>br</el> element and its descendants as a whole.</p>
<p>Any metadata specified by <loc href="#attribute-vocab-group-metadata">Metadata attributes</loc>
or by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc> element group
apply semantically to the <el>br</el> element and its descendants as a whole.</p>
<p><phrase role="deprecated">The use of <code>Animation.class</code> children is deprecated.</phrase></p>
<note role="explanation">
<p>No style attributes apply to <el>br</el> elements therefore animation has no effect on <el>br</el>.</p>
Expand Down Expand Up @@ -17558,7 +17563,7 @@ elements in the <loc href="#element-vocab-group-animation"><code>Animation.class
followed by
zero or more <el>style</el> elements.</p>
<p>Any metadata specified by children in the <loc href="#element-vocab-group-metadata"><code>Metadata.class</code></loc>
element group applies semantically to the <el>region</el> element and its descendants as a whole.
element group apply semantically to the <el>region</el> element and its descendants as a whole.
Any animation elements specified by children in the <loc href="#element-vocab-group-animation"><code>Animation.class</code></loc>
element group apply semantically to the <el>region</el> element.
Any <el>style</el> child element must be considered a local style
Expand Down

0 comments on commit d793829

Please sign in to comment.