[xiph-commits] r3552 - standards
silvia at svn.annodex.net
silvia at svn.annodex.net
Sun Apr 13 07:21:26 PDT 2008
Author: silvia
Date: 2008-04-13 07:21:26 -0700 (Sun, 13 Apr 2008)
New Revision: 3552
Modified:
standards/cmml_4_0.xsd
Log:
removed elements that could be taken straight out of xhtml
Modified: standards/cmml_4_0.xsd
===================================================================
--- standards/cmml_4_0.xsd 2008-04-13 06:22:17 UTC (rev 3551)
+++ standards/cmml_4_0.xsd 2008-04-13 14:21:26 UTC (rev 3552)
@@ -46,6 +46,10 @@
html:LanguageCode
html:FrameTarget
html:Length
+ html:style
+ html:meta
+ html:link
+ html:block
</xs:documentation>
</xs:annotation>
@@ -76,25 +80,6 @@
<xs:restriction base="xs:string" />
</xs:simpleType>
- <xs:simpleType name="Playbacktime">
- <xs:annotation>
- <xs:documentation>
- timestamps similar to [RFC2326]
- "smpte-24:" SMPTE time with a 24 fps basis
- "smpte-24-drop:" SMPTE time with a 24/1.001 fps basis
- "smpte-25:" SMPTE time with a 25 fps basis
- "smpte-30:" SMPTE time with a 30 fps basis
- "smpte-30-drop:" SMPTE time with a 30/1.001 fps basis
- "smpte-50:" SMPTE time with a 50 fps basis
- "smpte-60:" SMPTE time with a 60 fps basis
- "smpte-60-drop:" SMPTE time with a 60/1.001 fps basis
- "npt:" npt-time
- no clock time
- </xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:string" />
- </xs:simpleType>
-
<xs:annotation>
<xs:documentation>
=================== Generic Attributes ===============================
@@ -122,10 +107,12 @@
cmml tag containing sequence of one head and n clip tags
i18n = the default language for the whole document including
the id tag of the cmml element
- xmlns = namespace of the cmml tags
role = describes what type of text track this CMML file represents,
such as e.g. closed-caption, annotation, subtitle, transcript,
ticker
+ basetime = time stamp offset from which to calculate the start and end
+ times of the clip tags; allows to synchronise with a media
+ file that does not start at time offset 0
</xs:documentation>
</xs:annotation>
@@ -138,6 +125,7 @@
<xs:attributeGroup ref="html:i18n"/>
<xs:attribute name="role" type="TTextType"/>
<xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="basetime" type="Timestamp" default="0"/>
</xs:complexType>
</xs:element>
@@ -158,21 +146,21 @@
Title is the title of the media file
Img is an optional representative image for the full media file
Base is an optional base URL for the full media file
- Style is style sheet for the document
+ Style is an optional internal style sheet for the document
Meta is a collection of meta tags for the document
Link points to related documents
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:all minOccurs="0">
- <xs:element ref="title" />
+ <xs:element ref="html:title" />
<xs:element ref="img" />
<xs:element ref="base" />
</xs:all>
<xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="style"/>
- <xs:element ref="meta"/>
- <xs:element ref="link"/>
+ <xs:element ref="html:style"/>
+ <xs:element ref="html:meta"/>
+ <xs:element ref="html:link"/>
</xs:choice>
<xs:attributeGroup ref="html:i18n"/>
<xs:attribute name="id" type="xs:ID"/>
@@ -182,28 +170,6 @@
<xs:annotation>
<xs:documentation>
- =================== Title ===============================
- title tag giving descriptive title of the media document
- i18n = the language of the title text
- </xs:documentation>
- </xs:annotation>
-
- <xs:element name="title">
- <xs:annotation>
- <xs:documentation>
- The title element is not considered part of the presentation.
- It should be displayed, for example as the page header or
- window title. Exactly one title is required per document.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType mixed="true">
- <xs:attributeGroup ref="html:i18n"/>
- <xs:attribute name="id" type="xs:ID"/>
- </xs:complexType>
- </xs:element>
-
- <xs:annotation>
- <xs:documentation>
=================== Img ===========================================
To avoid accessibility problems for people who aren't
able to see the image, you should provide a text
@@ -251,84 +217,6 @@
<xs:annotation>
<xs:documentation>
- =================== Meta ===============================
- description tags of the document (empty content)
- i18n = the language of the meta attributes
- name = identifies a property name; does not list legal values for this
- attribute
- content = specifies a property's value; does not list legal values for
- this attribute
- scheme = names a scheme to be used to interpret the property's value
- (see the profiles tag in the head element for locating these)
- </xs:documentation>
- </xs:annotation>
-
- <xs:element name="meta">
- <xs:complexType>
- <xs:attributeGroup ref="i18n"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:attribute name="http-equiv"/>
- <xs:attribute name="name"/>
- <xs:attribute name="content" use="required"/>
- <xs:attribute name="scheme"/>
- </xs:complexType>
- </xs:element>
-
- <xs:annotation>
- <xs:documentation>
- =================== Link ===============================
- LINK tag to specify relationship values (empty content)
- attrs = the language of the title text; a short description of the
- relationship through title, and the stylesheet class
- href = reference to a related document
- type = type of the document referenced, e.g. "text/css"
- rel = type of relationship to forward linked document
- rev = type of relationship to reverse linked document
- media = type or medium/media to be rendered on, default "screen"
- </xs:documentation>
- </xs:annotation>
-
- <xs:element name="link">
- <xs:complexType>
- <xs:attributeGroup ref="attrs"/>
- <xs:attribute name="href" type="URI"/>
- <xs:attribute name="type" type="html:ContentType"/>
- <xs:attribute name="rel" type="html:LinkTypes"/>
- <xs:attribute name="rev" type="html:LinkTypes"/>
- <xs:attribute name="media" type="html:MediaDesc"/>
- </xs:complexType>
- </xs:element>
-
- <xs:annotation>
- <xs:documentation>
- =================== Style ===============================
- STYLE tag to specify presentation styles
- i18n = the language of the style's title attribute
- title = short description of the style
- type = type of the document referenced, e.g. "text/css"
- media = type or medium/media to be rendered on, default "screen"
- xml:space = fixed to preserve whitespace characters in content
- </xs:documentation>
- </xs:annotation>
-
- <xs:element name="style">
- <xs:annotation>
- <xs:documentation>
- The content of the "style" element is a style sheet.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType mixed="true">
- <xs:attributeGroup ref="i18n"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:attribute name="title" type="html:Text"/>
- <xs:attribute name="type" use="required" type="html:ContentType"/>
- <xs:attribute name="media" type="html:MediaDesc"/>
- <xs:attribute ref="xml:space" fixed="preserve"/>
- </xs:complexType>
- </xs:element>
-
- <xs:annotation>
- <xs:documentation>
=================== Clip Elements ===============================
Clip tag containing information for a specific fragment
attrs = the base language of the clip's attribute values and
@@ -350,8 +238,8 @@
<xs:complexType>
<xs:all>
<xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="meta"/>
- <xs:element ref="style"/>
+ <xs:element ref="html:meta"/>
+ <xs:element ref="html:style"/>
</xs:choice>
<xs:element ref="a" minOccurs="0" maxOccurs="1"/>
<xs:element ref="img" minOccurs="0" maxOccurs="1"/>
@@ -390,13 +278,17 @@
</xs:documentation>
</xs:annotation>
<xs:complexType mixed="true">
- <xs:attributeGroup ref="attrs"/>
- <xs:attribute name="href" type="html:URI"/>
- <xs:attribute name="hreflang" type="html:LanguageCode"/>
- <xs:attribute name="rel" type="html:LinkTypes"/>
- <xs:attribute name="rev" type="html:LinkTypes"/>
- <xs:attribute name="target" type="html:FrameTarget"/>
- <xs:attribute name="type" type="html:ContentType"/>
+ <xs:attributeGroup ref="attrs"/>
+ <xs:attribute name="target" type="html:FrameTarget"/>
+ <xs:attribute name="charset" type="Charset"/>
+ <xs:attribute name="type" type="html:ContentType"/>
+ <xs:attribute name="name" type="xs:NMTOKEN"/>
+ <xs:attribute name="href" type="html:URI"/>
+ <xs:attribute name="hreflang" type="html:LanguageCode"/>
+ <xs:attribute name="rel" type="html:LinkTypes"/>
+ <xs:attribute name="rev" type="html:LinkTypes"/>
+ <xs:attribute name="shape" default="rect" type="Shape"/>
+ <xs:attribute name="coords" type="Coords"/>
</xs:complexType>
</xs:element>
More information about the commits
mailing list