Allow . as delimiter, and fix user-defined descriptor text

w3c · Sep 26, 2024 · 224440f · 224440f
1 parent 09b070e
commit 224440f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/examples/intro-original-language-with-dub-language-and-adaptation.xml b/examples/intro-original-language-with-dub-language-and-adaptation.xml
@@ -5,7 +5,7 @@
     ttp:contentProfiles="http://www.w3.org/ns/ttml/profile/dapt1.0/content"
     xml:lang="en"
     daptm:langSrc="fr"
-    daptm:scriptRepresents="audio;dialogue"
+    daptm:scriptRepresents="audio.dialogue"
     daptm:scriptType="preRecording">
   <head>
     <metadata>
@@ -15,7 +15,7 @@
     </metadata>
   </head>
   <body>
-    <div begin="10s" end="13s" ttm:agent="character_1" daptm:onScreen="ON_OFF" daptm:represents="audio;dialogue">
+    <div begin="10s" end="13s" ttm:agent="character_1" daptm:onScreen="ON_OFF" daptm:represents="audio.dialogue">
       <p xml:lang="fr" daptm:langSrc="fr">
         <span>Et c'est grâce à ça qu'on va devenir riches.</span>
       </p>

diff --git a/examples/intro-original-language-with-dub-language.xml b/examples/intro-original-language-with-dub-language.xml
@@ -5,7 +5,7 @@
     ttp:contentProfiles="http://www.w3.org/ns/ttml/profile/dapt1.0/content"
     xml:lang="en"
     daptm:langSrc="fr"
-    daptm:scriptRepresents="audio;dialogue"
+    daptm:scriptRepresents="audio.dialogue"
     daptm:scriptType="translatedTranscript">
   <head>
     <metadata>
@@ -15,7 +15,7 @@
     </metadata>
   </head>
   <body>
-    <div begin="10s" end="13s" ttm:agent="character_1" daptm:represents="audio;dialogue">
+    <div begin="10s" end="13s" ttm:agent="character_1" daptm:represents="audio.dialogue">
       <p xml:lang="fr" daptm:langSrc="fr"> <!-- original -->
         <span>Et c'est grâce à ça qu'on va devenir riches.</span>
       </p>

diff --git a/examples/intro-original-language.xml b/examples/intro-original-language.xml
@@ -5,7 +5,7 @@
     ttp:contentProfiles="http://www.w3.org/ns/ttml/profile/dapt1.0/content"
     xml:lang="fr"
     daptm:langSrc="fr"
-    daptm:scriptRepresents="audio;dialogue"
+    daptm:scriptRepresents="audio.dialogue"
     daptm:scriptType="originalTranscript">
   <head>
     <metadata>
@@ -15,7 +15,7 @@
     </metadata>
   </head>
   <body>
-    <div begin="10s" end="13s" daptm:represents="audio;dialogue">
+    <div begin="10s" end="13s" daptm:represents="audio.dialogue">
       <p ttm:agent="character_1">
         <span>Et c'est grâce à ça qu'on va devenir riches.</span>
       </p>

diff --git a/examples/intro-script-with-gain.xml b/examples/intro-script-with-gain.xml
@@ -1,10 +1,10 @@
 <tt ...
-  daptm:scriptRepresents="visual;nonText visual;text"
+  daptm:scriptRepresents="visual.nonText visual.text"
   daptm:scriptType="asRecorded"
   xml:lang="en"
   daptm:langSrc="">
   ...
-    <div begin="25s" end="28s" daptm:represents="visual;nonText">
+    <div begin="25s" end="28s" daptm:represents="visual.nonText">
       <p>
         <animate begin="0.0s" end="0.3s" tta:gain="1;0.39" fill="freeze"/>
         <animate begin="2.7s" end="3s" tta:gain="0.39;1"/>

diff --git a/examples/intro-times-and-text.xml b/examples/intro-times-and-text.xml
@@ -5,15 +5,15 @@
   ttp:contentProfiles="http://www.w3.org/ns/ttml/profile/dapt1.0/content"
   xml:lang="en"
   daptm:langSrc=""
-  daptm:scriptRepresents="visual;nonText visual;text"
+  daptm:scriptRepresents="visual.nonText visual.text"
   daptm:scriptType="preRecording">
   <body>
-    <div begin="10s" end="13s" daptm:represents="visual;nonText">
+    <div begin="10s" end="13s" daptm:represents="visual.nonText">
       <p>
         A woman climbs into a small sailing boat.
       </p>
     </div>
-    <div begin="18s" end="20s" daptm:represents="visual;nonText">
+    <div begin="18s" end="20s" daptm:represents="visual.nonText">
       <p>
         The woman pulls the tiller and the boat turns.
       </p>

diff --git a/examples/sourceMediaIdentifier.xml b/examples/sourceMediaIdentifier.xml
@@ -4,7 +4,7 @@
     xmlns:ebuttm="urn:ebu:tt:metadata"
     xml:lang="en" 
     ttp:contentProfiles="http://www.w3.org/ns/ttml/profile/dapt1.0/content"
-    daptm:scriptRepresents="audio;dialogue"
+    daptm:scriptRepresents="audio.dialogue"
     daptm:scriptType="originalTranscript">
   <head>
     <metadata>

diff --git a/index.html b/index.html
@@ -880,10 +880,13 @@ <h5><code>&lt;content-descriptor&gt;</code> values</h5>
     : &lt;descriptor-token&gt; ( &lt;descriptor-delimiter&gt; &lt;descriptor-token&gt; )*
 
     &lt;descriptor-token&gt;
-    : <a data-cite="xmlschema-2#NMTOKEN">xsd:NMtoken</a>
+    : (descriptorTokenChar)+
+
+    descriptorTokenChar  # <a data-cite="xmlschema-2#NMTOKEN">xsd:NMtoken</a> without the "."
+    : <a data-cite="xml#NT-NameStartChar">NameStartChar</a> | "-" | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
 
     &lt;descriptor-delimiter&gt;
-    : ;  # SEMI-COLON U+003B
+    : "."  # FULL STOP U+002E
               </pre>
             </div>
             <p><code>&lt;<a>content-descriptor</a>&gt;</code> has values that are delimiter separated ordered lists
@@ -926,7 +929,11 @@ <h5><code>&lt;content-descriptor&gt;</code> values</h5>
                 and B could be the value of a <a>Represents</a> property.</p>
             </aside>
             <p>The permitted values for <code>&lt;<a>content-descriptor</a>&gt;</code>
-              are either those listed in the following <a>registry table</a>, or can be user-defined:</p>
+              are either those listed in the following <a>registry table</a>, or can be user-defined.</p>
+            <p>Valid user-defined values MUST begin with <code>x-</code> or be <a>sub-types</a> of
+              values in the <code>content-descriptor</code> registry table, where the
+              first additional <code>&lt;descriptor-token&gt;</code> component begins with <code>x-</code>.</p>
+
               <div class="registry-table-section">
                 <table class="data">
                   <caption><a>Registry table</a> for the <code>&lt;<a>content-descriptor</a>&gt;</code> component
@@ -987,8 +994,8 @@ <h5><code>&lt;content-descriptor&gt;</code> values</h5>
                     <tr>
                       <td><code>visual;text</code></td>
                       <td>Provisional</td>
-                      <td>>Indicates that the DAPT content represents textual
-                        parts of the visual image of the programme</td>
+                      <td>Indicates that the DAPT content represents textual
+                        content in the visual image of the programme</td>
                       <td>Audio Description</td>
                       <td>For example, a signpost, a clock, a newspaper headline, an instant message etc.</td>
                     </tr>
@@ -1016,7 +1023,6 @@ <h5><code>&lt;content-descriptor&gt;</code> values</h5>
                   </tbody>
                 </table>
               </div>
-              <p>User-defined values MUST begin with <code>x-</code>.</p>
             </section>
         </section>
       </section>