Merge pull request #808 from w3c/issue-0804-xml-base

Add xml:base to core vocabulary (#804).
w3c · Jun 7, 2018 · e8e293f · e8e293f
2 parents f44bac0 + ea183f9
commit e8e293f
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 12 deletions.
diff --git a/spec/profiles/ttml2-full.xml b/spec/profiles/ttml2-full.xml
@@ -28,6 +28,8 @@
     <feature value="required">#backgroundOrigin</feature>
     <feature value="required">#backgroundPosition</feature>
     <feature value="required">#backgroundRepeat</feature>
+    <feature value="required">#base</feature>
+    <feature value="required">#base-version-2</feature>
     <feature value="required">#bidi</feature>
     <feature value="required">#bidi-version-2</feature>
     <feature value="required">#border</feature>

diff --git a/spec/profiles/ttml2-presentation.xml b/spec/profiles/ttml2-presentation.xml
@@ -43,6 +43,8 @@
     <feature value="optional">#backgroundOrigin</feature>
     <feature value="optional">#backgroundPosition</feature>
     <feature value="optional">#backgroundRepeat</feature>
+    <feature value="optional">#base</feature>
+    <feature value="optional">#base-version-2</feature>
     <feature value="optional">#bidi</feature>
     <feature value="optional">#bidi-version-2</feature>
     <feature value="optional">#border</feature>

diff --git a/spec/profiles/ttml2-transformation.xml b/spec/profiles/ttml2-transformation.xml
@@ -43,6 +43,8 @@
     <feature value="optional">#backgroundOrigin</feature>
     <feature value="optional">#backgroundPosition</feature>
     <feature value="optional">#backgroundRepeat</feature>
+    <feature value="optional">#base</feature>
+    <feature value="optional">#base-version-2</feature>
     <feature value="optional">#bidi</feature>
     <feature value="optional">#bidi-version-2</feature>
     <feature value="optional">#border</feature>

diff --git a/spec/rnc/ttml2-core-attribs.rnc b/spec/rnc/ttml2-core-attribs.rnc
@@ -4,6 +4,9 @@
 
 namespace xlink = "http://www.w3.org/1999/xlink"
 
+TTAF.base.attrib
+  = attribute xml:base { TTAF.URI.datatype }?
+
 TTAF.condition.attrib
   = attribute condition { string }?
 
@@ -42,6 +45,7 @@ TTAF.Core.extra.attrib
 
 TTAF.Core.attrib.class &=
   TTAF.id.attrib,
+  TTAF.base.attrib,
   TTAF.lang.attrib,
   TTAF.space.attrib,
   TTAF.Core.extra.attrib

diff --git a/spec/rnc/ttml2-embedded.rnc b/spec/rnc/ttml2-embedded.rnc
@@ -52,6 +52,7 @@ TTAF.chunk =
   }
 
 TTAF.chunk.attlist &=
+  TTAF.base.attrib,
   TTAF.id.attrib,
   TTAF.condition.attrib,
   TTAF.encoding.attrib,

diff --git a/spec/rnc/ttml2-isd.rnc b/spec/rnc/ttml2-isd.rnc
@@ -32,6 +32,8 @@ TTAF.isd.sequence =
 TTAF.isd.sequence.attlist &=
   attribute size { xsd:nonNegativeInteger }?,
   attribute version { xsd:nonNegativeInteger }?,
+  TTAF.base.attrib,
+  TTAF.id.attrib,
   TTAF.lang.required.attrib,
   TTAF.isd.parameter.attrib.class,
   TTAF.isd.other.attrib.class
@@ -54,6 +56,8 @@ TTAF.isd.isd.attlist &=
   attribute begin { string },
   attribute end { string },
   attribute version { xsd:nonNegativeInteger }?,
+  TTAF.base.attrib,
+  TTAF.id.attrib,
   TTAF.lang.attrib,
   TTAF.isd.parameter.attrib.class,
   TTAF.isd.other.attrib.class
@@ -74,7 +78,9 @@ TTAF.isd.css =
   }
 
 TTAF.isd.css.attlist &=
+  TTAF.base.attrib,
   TTAF.id.required.attrib,
+  TTAF.lang.attrib,
   TTAF.isd.style.attrib.class,
   TTAF.isd.other.attrib.class
 
@@ -92,7 +98,9 @@ TTAF.isd.region =
 
 TTAF.isd.region.attlist &=
   attribute style { xsd:IDREF }?,
+  TTAF.base.attrib,
   TTAF.id.required.attrib,
+  TTAF.lang.attrib,
   TTAF.isd.other.attrib.class
 
 TTAF.isd.region.content.extra = empty

diff --git a/spec/ttml2.xml b/spec/ttml2.xml
diff --git a/spec/xsd/ttml2-core-attribs.xsd b/spec/xsd/ttml2-core-attribs.xsd
@@ -13,6 +13,7 @@
   </xs:attributeGroup>
   <xs:attributeGroup name="Core.attrib.class">
     <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
+    <xs:attribute ref="xml:base"/>
     <xs:attribute ref="xml:lang"/>
     <xs:attribute ref="xml:space"/>
     <xs:anyAttribute namespace="##other" processContents="lax"/>

diff --git a/spec/xsd/ttml2-isd.xsd b/spec/xsd/ttml2-isd.xsd
@@ -36,6 +36,7 @@
   <xs:attributeGroup name="sequence.attlist">
     <xs:attribute name="size" type="xs:nonNegativeInteger"/>
     <xs:attribute name="version" type="xs:nonNegativeInteger"/>
+    <xs:attribute ref="xml:base"/>
     <xs:attribute ref="xml:id"/>
     <xs:attribute ref="xml:lang" use="required"/>
     <xs:attributeGroup ref="isd:isd.parameter.attrib.class"/>
@@ -53,6 +54,7 @@
     <xs:attribute name="begin" type="xs:string" use="required"/>
     <xs:attribute name="end" type="xs:string" use="required"/>
     <xs:attribute name="version" type="xs:nonNegativeInteger"/>
+    <xs:attribute ref="xml:base"/>
     <xs:attribute ref="xml:id"/>
     <xs:attribute ref="xml:lang"/>
     <xs:attributeGroup ref="isd:isd.parameter.attrib.class"/>
@@ -69,7 +71,9 @@
   </xs:complexType>
   <xs:attributeGroup name="css.attlist">
     <xs:attribute name="style" type="xs:IDREF"/>
+    <xs:attribute ref="xml:base"/>
     <xs:attribute ref="xml:id" use="required"/>
+    <xs:attribute ref="xml:lang"/>
     <xs:attributeGroup ref="isd:isd.style.attrib.class"/>
     <xs:attributeGroup ref="isd:isd.other.attrib.class"/>
   </xs:attributeGroup>
@@ -81,7 +85,9 @@
   </xs:complexType>
   <xs:attributeGroup name="region.attlist">
     <xs:attribute name="style" type="xs:IDREF"/>
+    <xs:attribute ref="xml:base"/>
     <xs:attribute ref="xml:id" use="required"/>
+    <xs:attribute ref="xml:lang"/>
     <xs:attributeGroup ref="isd:isd.other.attrib.class"/>
   </xs:attributeGroup>
   <xs:complexType name="region.eltype">

diff --git a/spec/xsd/ttml2-parameter-items.xsd b/spec/xsd/ttml2-parameter-items.xsd
@@ -21,7 +21,6 @@
   </xs:attributeGroup>
   <xs:attributeGroup name="features.attlist">
     <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
-    <xs:attribute ref="xml:base"/>
     <xs:anyAttribute namespace="##other" processContents="lax"/>
   </xs:attributeGroup>
   <xs:attributeGroup name="feature.attlist">
@@ -33,7 +32,6 @@
   </xs:attributeGroup>
   <xs:attributeGroup name="extensions.attlist">
     <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
-    <xs:attribute ref="xml:base"/>
     <xs:anyAttribute namespace="##other" processContents="lax"/>
   </xs:attributeGroup>
   <xs:attributeGroup name="extension.attlist">