From 224440f8e26ff811b58778bb833be1ee8601af40 Mon Sep 17 00:00:00 2001 From: Nigel Megitt Date: Thu, 26 Sep 2024 16:49:33 -0700 Subject: [PATCH] Allow `.` as delimiter, and fix user-defined descriptor text --- ...nguage-with-dub-language-and-adaptation.xml | 4 ++-- ...tro-original-language-with-dub-language.xml | 4 ++-- examples/intro-original-language.xml | 4 ++-- examples/intro-script-with-gain.xml | 4 ++-- examples/intro-times-and-text.xml | 6 +++--- examples/sourceMediaIdentifier.xml | 2 +- index.html | 18 ++++++++++++------ 7 files changed, 24 insertions(+), 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 index faa8dcf..6271ab5 100644 --- 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"> @@ -15,7 +15,7 @@ -
+

Et c'est grâce à ça qu'on va devenir riches.

diff --git a/examples/intro-original-language-with-dub-language.xml b/examples/intro-original-language-with-dub-language.xml index 91a6a68..ff648db 100644 --- 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"> @@ -15,7 +15,7 @@ -
+

Et c'est grâce à ça qu'on va devenir riches.

diff --git a/examples/intro-original-language.xml b/examples/intro-original-language.xml index bda7755..0f05de9 100644 --- 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"> @@ -15,7 +15,7 @@ -
+

Et c'est grâce à ça qu'on va devenir riches.

diff --git a/examples/intro-script-with-gain.xml b/examples/intro-script-with-gain.xml index 7d27ffa..da1220c 100644 --- a/examples/intro-script-with-gain.xml +++ b/examples/intro-script-with-gain.xml @@ -1,10 +1,10 @@ ... -
+

diff --git a/examples/intro-times-and-text.xml b/examples/intro-times-and-text.xml index 35645a5..c4f8c78 100644 --- 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"> -

+

A woman climbs into a small sailing boat.

-
+

The woman pulls the tiller and the boat turns.

diff --git a/examples/sourceMediaIdentifier.xml b/examples/sourceMediaIdentifier.xml index 0e3d997..bc73978 100644 --- 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"> diff --git a/index.html b/index.html index d4da108..42e52d5 100755 --- a/index.html +++ b/index.html @@ -880,10 +880,13 @@
<content-descriptor> values
: <descriptor-token> ( <descriptor-delimiter> <descriptor-token> )* <descriptor-token> - : xsd:NMtoken + : (descriptorTokenChar)+ + + descriptorTokenChar # xsd:NMtoken without the "." + : NameStartChar | "-" | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040] <descriptor-delimiter> - : ; # SEMI-COLON U+003B + : "." # FULL STOP U+002E

<content-descriptor> has values that are delimiter separated ordered lists @@ -926,7 +929,11 @@

<content-descriptor> values
and B could be the value of a Represents property.

The permitted values for <content-descriptor> - are either those listed in the following registry table, or can be user-defined:

+ are either those listed in the following registry table, or can be user-defined.

+

Valid user-defined values MUST begin with x- or be sub-types of + values in the content-descriptor registry table, where the + first additional <descriptor-token> component begins with x-.

+
- + @@ -1016,7 +1023,6 @@
<content-descriptor> values
Registry table for the <content-descriptor> component @@ -987,8 +994,8 @@
<content-descriptor> values
visual;text Provisional>Indicates that the DAPT content represents textual - parts of the visual image of the programmeIndicates that the DAPT content represents textual + content in the visual image of the programme Audio Description For example, a signpost, a clock, a newspaper headline, an instant message etc.
-

User-defined values MUST begin with x-.