--- a/spec/rnc/ttaf1-dfxp-datatypes.rnc Mon May 04 06:06:00 2009 +0000
+++ b/spec/rnc/ttaf1-dfxp-datatypes.rnc Mon May 04 11:30:42 2009 +0000
@@ -21,26 +21,43 @@
TTAF.Direction.datatype =
"ltr" |
- "rtl" |
- "inherit"
+ "rtl"
TTAF.Display.datatype =
"auto" |
- "none" |
- "inherit"
+ "none"
TTAF.DisplayAlign.datatype =
"before" |
"center" |
- "after" |
- "inherit"
+ "after"
TTAF.DynamicFlow.datatype =
string
+TTAF.ExtensionBase.datatype =
+ TTAF.URI.datatype
+
+TTAF.ExtensionDesignator.datatype =
+ TTAF.URI.datatype
+
+TTAF.ExtensionValue.datatype =
+ "required" |
+ "optional"
+
TTAF.Extent.datatype =
string
+TTAF.FeatureBase.datatype =
+ TTAF.URI.datatype
+
+TTAF.FeatureDesignator.datatype =
+ TTAF.URI.datatype
+
+TTAF.FeatureValue.datatype =
+ "required" |
+ "optional"
+
TTAF.FontFamily.datatype =
string
@@ -51,13 +68,11 @@
"normal" |
"italic" |
"oblique" |
- "reverseOblique" |
- "inherit"
+ "reverseOblique"
TTAF.FontWeight.datatype =
"normal" |
- "bold" |
- "inherit"
+ "bold"
TTAF.FrameRate.datatype =
xsd:nonNegativeInteger
@@ -92,6 +107,7 @@
TTAF.MetadataRoleBaseType.datatype =
"action" |
"caption" |
+ "description" |
"dialog" |
"expletive" |
"kinesic" |
@@ -116,8 +132,7 @@
TTAF.Overflow.datatype =
"visible" |
"hidden" |
- "scroll" |
- "inherit"
+ "dynamic"
TTAF.Padding.datatype =
string
@@ -129,12 +144,11 @@
TTAF.URI.datatype
TTAF.Role.datatype =
- xsd:NMTOKEN
+ xsd:NMTOKENS
TTAF.ShowBackground.datatype =
"always" |
- "whenActive" |
- "inherit"
+ "whenActive"
TTAF.SMPTEMode.datatype =
"dropNTSC" |
@@ -149,8 +163,7 @@
"center" |
"right" |
"start" |
- "end" |
- "inherit"
+ "end"
TTAF.TextDecoration.datatype =
"none" |
@@ -159,8 +172,7 @@
"overline" |
"noOverline" |
"lineThrough" |
- "noLineThrough" |
- "inherit"
+ "noLineThrough"
TTAF.TextOutline.datatype =
string
@@ -189,18 +201,15 @@
TTAF.UnicodeBidi.datatype =
"normal" |
"embed" |
- "bidiOverride" |
- "inherit"
+ "bidiOverride"
TTAF.Visibility.datatype =
"hidden" |
- "visible" |
- "inherit"
+ "visible"
TTAF.WrapOption.datatype =
"wrap" |
- "noWrap" |
- "inherit"
+ "noWrap"
TTAF.WritingMode.datatype =
"lrtb" |
@@ -209,8 +218,7 @@
"tblr" |
"lr" |
"rl" |
- "tb" |
- "inherit"
+ "tb"
TTAF.XMLSpace.datatype =
"default" |
--- a/spec/rnc/ttaf1-dfxp-head.rnc Mon May 04 06:06:00 2009 +0000
+++ b/spec/rnc/ttaf1-dfxp-head.rnc Mon May 04 11:30:42 2009 +0000
@@ -15,6 +15,7 @@
TTAF.head.content.extra = empty
TTAF.head.content =
(TTAF.Metadata.class*,
+ TTAF.Parameters.class*,
TTAF.styling?,
TTAF.layout?,
TTAF.head.content.extra*)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/spec/rnc/ttaf1-dfxp-parameter-items.rnc Mon May 04 11:30:42 2009 +0000
@@ -0,0 +1,95 @@
+# .......................................................................
+# TT-AF 1.0 DFXP Parameter Items Module .................................
+# .......................................................................
+
+namespace ttp = "http://www.w3.org/2006/10/ttaf1#parameter"
+
+# profile - profile definition or use declaration
+TTAF.parameters.profile =
+ element ttp:profile {
+ TTAF.parameters.profile.attlist,
+ TTAF.parameters.profile.content
+ }
+
+TTAF.parameters.profile.attlist &=
+ TTAF.id.attrib,
+ attribute use { TTAF.Profile.datatype }?
+
+TTAF.parameters.profile.content.extra = empty
+TTAF.parameters.profile.content =
+ (TTAF.Metadata.class*,
+ TTAF.parameters.features*,
+ TTAF.parameters.extensions*,
+ TTAF.parameters.profile.content.extra*)
+
+# features - container for feature elements
+TTAF.parameters.features =
+ element ttp:features {
+ TTAF.parameters.features.attlist,
+ TTAF.parameters.features.content
+ }
+
+TTAF.parameters.features.attlist &=
+ TTAF.id.attrib,
+ attribute base { TTAF.FeatureBase.datatype }?
+
+TTAF.parameters.features.content.extra = empty
+TTAF.parameters.features.content =
+ (TTAF.Metadata.class*,
+ TTAF.parameters.feature*,
+ TTAF.parameters.features.content.extra*)
+
+# feature - feature requirements declaration
+TTAF.parameters.feature =
+ element ttp:feature {
+ TTAF.parameters.feature.attlist,
+ TTAF.parameters.feature.content
+ }
+
+TTAF.parameters.feature.attlist =
+ TTAF.id.attrib,
+ attribute value { TTAF.FeatureValue.datatype }?
+
+TTAF.parameters.feature.content =
+ TTAF.FeatureDesignator.datatype
+
+# extensions - container for extension elements
+TTAF.parameters.extensions =
+ element ttp:extensions {
+ TTAF.parameters.extensions.attlist,
+ TTAF.parameters.extensions.content
+ }
+
+TTAF.parameters.extensions.attlist &=
+ TTAF.id.attrib,
+ attribute base { TTAF.ExtensionBase.datatype }?
+
+TTAF.parameters.extensions.content.extra = empty
+TTAF.parameters.extensions.content =
+ (TTAF.Metadata.class*,
+ TTAF.parameters.extension*,
+ TTAF.parameters.extensions.content.extra*)
+
+# extension - extension requirements declaration
+TTAF.parameters.extension =
+ element ttp:extension {
+ TTAF.parameters.extension.attlist,
+ TTAF.parameters.extension.content
+ }
+
+TTAF.parameters.extension.attlist =
+ TTAF.id.attrib,
+ attribute value { TTAF.ExtensionValue.datatype }?
+
+TTAF.parameters.extension.content =
+ TTAF.ExtensionDesignator.datatype
+
+## ParameterItems.class
+TTAF.ParameterItems.extra = empty
+TTAF.ParameterItems.class |=
+ TTAF.parameters.profile |
+ TTAF.ParameterItems.extra
+
+# .......................................................................
+# .......................................................................
+# .......................................................................
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/spec/rnc/ttaf1-dfxp-parameters.rnc Mon May 04 11:30:42 2009 +0000
@@ -0,0 +1,10 @@
+# .......................................................................
+# TT-AF 1.0 DFXP Parameters Module ......................................
+# .......................................................................
+
+TTAF.Parameters.class |=
+ TTAF.ParameterItems.class
+
+# .......................................................................
+# .......................................................................
+# .......................................................................
--- a/spec/rnc/ttaf1-dfxp.rnc Mon May 04 06:06:00 2009 +0000
+++ b/spec/rnc/ttaf1-dfxp.rnc Mon May 04 11:30:42 2009 +0000
@@ -13,8 +13,10 @@
include "ttaf1-dfxp-metadata-attribs.rnc"
include "ttaf1-dfxp-styling-attribs.rnc"
include "ttaf1-dfxp-timing-attribs.rnc"
+include "ttaf1-dfxp-parameter-items.rnc"
+include "ttaf1-dfxp-parameters.rnc"
+include "ttaf1-dfxp-metadata-items.rnc"
include "ttaf1-dfxp-metadata.rnc"
-include "ttaf1-dfxp-metadata-items.rnc"
include "ttaf1-dfxp-styling.rnc"
include "ttaf1-dfxp-animation.rnc"
include "ttaf1-dfxp-layout.rnc"
@@ -22,7 +24,7 @@
include "ttaf1-dfxp-head.rnc"
include "ttaf1-dfxp-document.rnc"
-start = TTAF.tt
+start = TTAF.tt | TTAF.parameters.profile
# .......................................................................
# .......................................................................
--- a/spec/xsd/ttaf1-dfxp-animation.xsd Mon May 04 06:06:00 2009 +0000
+++ b/spec/xsd/ttaf1-dfxp-animation.xsd Mon May 04 11:30:42 2009 +0000
@@ -2,11 +2,11 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tt="http://www.w3.org/2006/10/ttaf1"
xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"
- xmlns:tts="http://www.w3.org/2006/10/ttaf1#style">
+ xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling">
<xs:include schemaLocation="ttaf1-dfxp-core-attribs.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-timing-attribs.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-metadata.xsd"/>
- <xs:import namespace="http://www.w3.org/2006/10/ttaf1#style"
+ <xs:import namespace="http://www.w3.org/2006/10/ttaf1#styling"
schemaLocation="ttaf1-dfxp-styling-attribs.xsd"/>
<xs:attributeGroup name="set.attlist">
<xs:attributeGroup ref="tt:Core.attrib.class" />
--- a/spec/xsd/ttaf1-dfxp-content.xsd Mon May 04 06:06:00 2009 +0000
+++ b/spec/xsd/ttaf1-dfxp-content.xsd Mon May 04 11:30:42 2009 +0000
@@ -2,7 +2,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tt="http://www.w3.org/2006/10/ttaf1"
xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"
- xmlns:tts="http://www.w3.org/2006/10/ttaf1#style">
+ xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling">
<xs:include schemaLocation="ttaf1-dfxp-core-attribs.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-timing-attribs.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-metadata.xsd"/>
--- a/spec/xsd/ttaf1-dfxp-core-attribs.xsd Mon May 04 06:06:00 2009 +0000
+++ b/spec/xsd/ttaf1-dfxp-core-attribs.xsd Mon May 04 11:30:42 2009 +0000
@@ -4,13 +4,16 @@
xmlns:xml="http://www.w3.org/XML/1998/namespace">
<xs:import namespace="http://www.w3.org/XML/1998/namespace"
schemaLocation="xml.xsd"/>
+ <xs:attributeGroup name="Core.ID.attrib.class">
+ <xs:attribute ref="xml:id"/>
+ </xs:attributeGroup>
<xs:attributeGroup name="Core.attrib.class">
- <xs:attribute ref="xml:id"/>
+ <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
<xs:attribute ref="xml:lang"/>
<xs:attribute ref="xml:space"/>
</xs:attributeGroup>
<xs:attributeGroup name="Core.required.attrib.class">
- <xs:attribute ref="xml:id"/>
+ <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
<xs:attribute ref="xml:lang" use="required"/>
<xs:attribute ref="xml:space"/>
</xs:attributeGroup>
--- a/spec/xsd/ttaf1-dfxp-datatypes.xsd Mon May 04 06:06:00 2009 +0000
+++ b/spec/xsd/ttaf1-dfxp-datatypes.xsd Mon May 04 11:30:42 2009 +0000
@@ -30,14 +30,12 @@
<xs:restriction base="xs:token">
<xs:enumeration value="ltr"/>
<xs:enumeration value="rtl"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="display">
<xs:restriction base="xs:token">
<xs:enumeration value="auto"/>
<xs:enumeration value="none"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="displayAlign">
@@ -45,24 +43,47 @@
<xs:enumeration value="before"/>
<xs:enumeration value="center"/>
<xs:enumeration value="after"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="dynamicFlow">
<xs:restriction base="xs:string"/>
</xs:simpleType>
+ <xs:simpleType name="extensionBase">
+ <xs:restriction base="xs:anyURI"/>
+ </xs:simpleType>
+ <xs:simpleType name="extensionDesignator">
+ <xs:restriction base="xs:anyURI"/>
+ </xs:simpleType>
+ <xs:simpleType name="extensionValue">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="required"/>
+ <xs:enumeration value="optional"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="extent">
<xs:annotation>
- <xs:documentation>auto | inherit | length length</xs:documentation>
+ <xs:documentation>auto | length length</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
+ <xs:simpleType name="featureBase">
+ <xs:restriction base="xs:anyURI"/>
+ </xs:simpleType>
+ <xs:simpleType name="featureDesignator">
+ <xs:restriction base="xs:anyURI"/>
+ </xs:simpleType>
+ <xs:simpleType name="featureValue">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="required"/>
+ <xs:enumeration value="optional"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="fontFamily">
<xs:restriction base="xs:string"/>
</xs:simpleType>
<xs:simpleType name="fontSize">
<xs:annotation>
- <xs:documentation>inherit | length | length length</xs:documentation>
+ <xs:documentation>length | length length</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
@@ -72,14 +93,12 @@
<xs:enumeration value="italic"/>
<xs:enumeration value="oblique"/>
<xs:enumeration value="reverseOblique"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="fontWeight">
<xs:restriction base="xs:token">
<xs:enumeration value="normal"/>
<xs:enumeration value="bold"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="frameRate">
@@ -95,7 +114,7 @@
</xs:simpleType>
<xs:simpleType name="lineHeight">
<xs:annotation>
- <xs:documentation>normal | inherit | length</xs:documentation>
+ <xs:documentation>normal | length</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
@@ -130,6 +149,7 @@
<xs:restriction base="xs:token">
<xs:enumeration value="action"/>
<xs:enumeration value="caption"/>
+ <xs:enumeration value="description"/>
<xs:enumeration value="dialog"/>
<xs:enumeration value="expletive"/>
<xs:enumeration value="kinesic"/>
@@ -148,13 +168,13 @@
</xs:simpleType>
<xs:simpleType name="opacity">
<xs:annotation>
- <xs:documentation>inherit | alpha</xs:documentation>
+ <xs:documentation>alpha</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
<xs:simpleType name="origin">
<xs:annotation>
- <xs:documentation>auto | inherit | length length</xs:documentation>
+ <xs:documentation>auto | length length</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
@@ -162,13 +182,12 @@
<xs:restriction base="xs:token">
<xs:enumeration value="visible"/>
<xs:enumeration value="hidden"/>
- <xs:enumeration value="scroll"/>
- <xs:enumeration value="inherit"/>
+ <xs:enumeration value="dynamic"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="padding">
<xs:annotation>
- <xs:documentation>inherit | length length | length length length | length length length length</xs:documentation>
+ <xs:documentation>length length | length length length | length length length length</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
@@ -187,13 +206,12 @@
<xs:annotation>
<xs:documentation>metadataRoleBaseType | "x-"string</xs:documentation>
</xs:annotation>
- <xs:restriction base="xs:NMTOKEN"/>
+ <xs:restriction base="xs:NMTOKENS"/>
</xs:simpleType>
<xs:simpleType name="showBackground">
<xs:restriction base="xs:token">
<xs:enumeration value="always"/>
<xs:enumeration value="whenActive"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="smpteMode">
@@ -213,7 +231,6 @@
<xs:enumeration value="right"/>
<xs:enumeration value="start"/>
<xs:enumeration value="end"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="textDecoration">
@@ -225,12 +242,11 @@
<xs:enumeration value="noOverline"/>
<xs:enumeration value="lineThrough"/>
<xs:enumeration value="noLineThrough"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="textOutline">
<xs:annotation>
- <xs:documentation>none | inherit | length | length length | color length | color length length</xs:documentation>
+ <xs:documentation>none | length | length length | color length | color length length</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
@@ -267,21 +283,18 @@
<xs:enumeration value="normal"/>
<xs:enumeration value="embed"/>
<xs:enumeration value="bidiOverride"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="visibility">
<xs:restriction base="xs:token">
<xs:enumeration value="hidden"/>
<xs:enumeration value="visible"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="wrapOption">
<xs:restriction base="xs:token">
<xs:enumeration value="wrap"/>
<xs:enumeration value="noWrap"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="writingMode">
@@ -293,12 +306,11 @@
<xs:enumeration value="lr"/>
<xs:enumeration value="rl"/>
<xs:enumeration value="tb"/>
- <xs:enumeration value="inherit"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="zIndex">
<xs:annotation>
- <xs:documentation>auto | inherit | integer</xs:documentation>
+ <xs:documentation>auto | integer</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
--- a/spec/xsd/ttaf1-dfxp-document.xsd Mon May 04 06:06:00 2009 +0000
+++ b/spec/xsd/ttaf1-dfxp-document.xsd Mon May 04 11:30:42 2009 +0000
@@ -3,12 +3,12 @@
xmlns:tt="http://www.w3.org/2006/10/ttaf1"
xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"
xmlns:ttp="http://www.w3.org/2006/10/ttaf1#parameter"
- xmlns:tts="http://www.w3.org/2006/10/ttaf1#style">
+ xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling">
<xs:import namespace="http://www.w3.org/2006/10/ttaf1#metadata"
schemaLocation="ttaf1-dfxp-metadata-items.xsd"/>
<xs:import namespace="http://www.w3.org/2006/10/ttaf1#parameter"
- schemaLocation="ttaf1-dfxp-parameter-attribs.xsd"/>
- <xs:import namespace="http://www.w3.org/2006/10/ttaf1#style"
+ schemaLocation="ttaf1-dfxp-parameter-items.xsd"/>
+ <xs:import namespace="http://www.w3.org/2006/10/ttaf1#styling"
schemaLocation="ttaf1-dfxp-styling-attribs.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-core-attribs.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-timing-attribs.xsd"/>
--- a/spec/xsd/ttaf1-dfxp-head.xsd Mon May 04 06:06:00 2009 +0000
+++ b/spec/xsd/ttaf1-dfxp-head.xsd Mon May 04 11:30:42 2009 +0000
@@ -2,9 +2,11 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tt="http://www.w3.org/2006/10/ttaf1"
xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"
- xmlns:tts="http://www.w3.org/2006/10/ttaf1#style">
+ xmlns:ttp="http://www.w3.org/2006/10/ttaf1#parameter"
+ xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling">
<xs:include schemaLocation="ttaf1-dfxp-core-attribs.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-metadata.xsd"/>
+ <xs:include schemaLocation="ttaf1-dfxp-parameters.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-styling.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-layout.xsd"/>
<xs:attributeGroup name="head.attlist">
@@ -13,6 +15,7 @@
<xs:complexType name="head.eltype">
<xs:sequence>
<xs:group ref="tt:Metadata.class" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:group ref="tt:Parameters.class" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="tt:styling" minOccurs="0" maxOccurs="1"/>
<xs:element ref="tt:layout" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
--- a/spec/xsd/ttaf1-dfxp-layout.xsd Mon May 04 06:06:00 2009 +0000
+++ b/spec/xsd/ttaf1-dfxp-layout.xsd Mon May 04 11:30:42 2009 +0000
@@ -2,13 +2,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tt="http://www.w3.org/2006/10/ttaf1"
xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"
- xmlns:tts="http://www.w3.org/2006/10/ttaf1#style">
+ xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling">
<xs:include schemaLocation="ttaf1-dfxp-core-attribs.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-timing-attribs.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-metadata.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-animation.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-styling.xsd"/>
- <xs:import namespace="http://www.w3.org/2006/10/ttaf1#style"
+ <xs:import namespace="http://www.w3.org/2006/10/ttaf1#styling"
schemaLocation="ttaf1-dfxp-styling-attribs.xsd"/>
<xs:attributeGroup name="RegionBinding.attrib.class">
<xs:attribute name="region" type="xs:IDREF"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/spec/xsd/ttaf1-dfxp-parameter-items.xsd Mon May 04 11:30:42 2009 +0000
@@ -0,0 +1,74 @@
+<xs:schema targetNamespace="http://www.w3.org/2006/10/ttaf1#parameter"
+ xml:lang="en" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:tt="http://www.w3.org/2006/10/ttaf1"
+ xmlns:ttd="http://www.w3.org/2006/10/ttaf1#datatype"
+ xmlns:ttp="http://www.w3.org/2006/10/ttaf1#parameter">
+ <xs:import namespace="http://www.w3.org/2006/10/ttaf1#datatype"
+ schemaLocation="ttaf1-dfxp-datatypes.xsd"/>
+ <xs:import namespace="http://www.w3.org/2006/10/ttaf1"
+ schemaLocation="ttaf1-dfxp-core-attribs.xsd"/>
+ <xs:include schemaLocation="ttaf1-dfxp-parameter-attribs.xsd"/>
+ <xs:attributeGroup name="profile.attlist">
+ <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
+ <xs:attribute name="use" type="ttd:profile"/>
+ </xs:attributeGroup>
+ <xs:attributeGroup name="features.attlist">
+ <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
+ <xs:attribute name="base" type="ttd:featureBase"/>
+ </xs:attributeGroup>
+ <xs:attributeGroup name="feature.attlist">
+ <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
+ <xs:attribute name="value" type="ttd:featureValue"/>
+ </xs:attributeGroup>
+ <xs:attributeGroup name="extensions.attlist">
+ <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
+ <xs:attribute name="base" type="ttd:extensionBase"/>
+ </xs:attributeGroup>
+ <xs:attributeGroup name="extension.attlist">
+ <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
+ <xs:attribute name="value" type="ttd:extensionValue"/>
+ </xs:attributeGroup>
+ <xs:complexType name="profile.eltype">
+ <xs:sequence>
+ <xs:element ref="ttp:features" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="ttp:extensions" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="ttp:profile.attlist"/>
+ </xs:complexType>
+ <xs:complexType name="features.eltype">
+ <xs:sequence>
+ <xs:element ref="ttp:feature" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="ttp:features.attlist"/>
+ </xs:complexType>
+ <xs:complexType name="feature.eltype">
+ <xs:simpleContent>
+ <xs:extension base="ttd:featureDesignator">
+ <xs:attributeGroup ref="ttp:feature.attlist"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:complexType name="extensions.eltype">
+ <xs:sequence>
+ <xs:element ref="ttp:extension" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="ttp:extensions.attlist"/>
+ </xs:complexType>
+ <xs:complexType name="extension.eltype">
+ <xs:simpleContent>
+ <xs:extension base="ttd:extensionDesignator">
+ <xs:attributeGroup ref="ttp:extension.attlist"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:element name="profile" type="ttp:profile.eltype"/>
+ <xs:element name="features" type="ttp:features.eltype"/>
+ <xs:element name="feature" type="ttp:feature.eltype"/>
+ <xs:element name="extensions" type="ttp:extensions.eltype"/>
+ <xs:element name="extension" type="ttp:extension.eltype"/>
+ <xs:group name="ParameterItems.class">
+ <xs:choice>
+ <xs:element ref="ttp:profile"/>
+ </xs:choice>
+ </xs:group>
+</xs:schema>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/spec/xsd/ttaf1-dfxp-parameters.xsd Mon May 04 11:30:42 2009 +0000
@@ -0,0 +1,13 @@
+<xs:schema targetNamespace="http://www.w3.org/2006/10/ttaf1" xml:lang="en"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:tt="http://www.w3.org/2006/10/ttaf1"
+ xmlns:ttp="http://www.w3.org/2006/10/ttaf1#parameter">
+ <xs:include schemaLocation="ttaf1-dfxp-core-attribs.xsd"/>
+ <xs:import namespace="http://www.w3.org/2006/10/ttaf1#parameter"
+ schemaLocation="ttaf1-dfxp-parameter-items.xsd"/>
+ <xs:group name="Parameters.class">
+ <xs:choice>
+ <xs:group ref="ttp:ParameterItems.class"/>
+ </xs:choice>
+ </xs:group>
+</xs:schema>
--- a/spec/xsd/ttaf1-dfxp-styling-attribs.xsd Mon May 04 06:06:00 2009 +0000
+++ b/spec/xsd/ttaf1-dfxp-styling-attribs.xsd Mon May 04 11:30:42 2009 +0000
@@ -1,7 +1,7 @@
-<xs:schema targetNamespace="http://www.w3.org/2006/10/ttaf1#style" xml:lang="en"
+<xs:schema targetNamespace="http://www.w3.org/2006/10/ttaf1#styling" xml:lang="en"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:ttd="http://www.w3.org/2006/10/ttaf1#datatype"
- xmlns:tts="http://www.w3.org/2006/10/ttaf1#style">
+ xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling">
<xs:import namespace="http://www.w3.org/2006/10/ttaf1#datatype"
schemaLocation="ttaf1-dfxp-datatypes.xsd"/>
<xs:attribute name="backgroundColor" type="ttd:color"/>
--- a/spec/xsd/ttaf1-dfxp-styling.xsd Mon May 04 06:06:00 2009 +0000
+++ b/spec/xsd/ttaf1-dfxp-styling.xsd Mon May 04 11:30:42 2009 +0000
@@ -2,10 +2,10 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tt="http://www.w3.org/2006/10/ttaf1"
xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"
- xmlns:tts="http://www.w3.org/2006/10/ttaf1#style">
+ xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling">
<xs:include schemaLocation="ttaf1-dfxp-core-attribs.xsd"/>
<xs:include schemaLocation="ttaf1-dfxp-metadata.xsd"/>
- <xs:import namespace="http://www.w3.org/2006/10/ttaf1#style"
+ <xs:import namespace="http://www.w3.org/2006/10/ttaf1#styling"
schemaLocation="ttaf1-dfxp-styling-attribs.xsd"/>
<xs:attributeGroup name="StyleBinding.attrib.class">
<xs:attribute name="style" type="xs:IDREFS"/>