[xiph-commits] r3276 - standards

[silvia at svn.annodex.net]

Author: silvia
Date: 2007-11-18 12:49:40 -0800 (Sun, 18 Nov 2007)
New Revision: 3276

Modified:
   standards/cmml_3_1.dtd
   standards/draft-pfeiffer-cmml-current.xml
Log:
I didn't intend using a "div" element in the example, but only a "span".



Modified: standards/cmml_3_1.dtd
===================================================================
--- standards/cmml_3_1.dtd	2007-11-18 20:26:35 UTC (rev 3275)
+++ standards/cmml_3_1.dtd	2007-11-18 20:49:40 UTC (rev 3276)
@@ -314,8 +314,7 @@
                 time relative to the basetime of the header 
                 [NOT INCLUDED IN ANNODEXED DOCUMENT] -->
 
-XXX FIX THIS CONTENT MODEL XXX
-<!ELEMENT clip ((meta|style)*, a?, img?, desc?, caption?)>
+<!ELEMENT clip (meta* |style* | a? | img? | desc? | caption?)>
 <!ATTLIST clip
   %attrs;
   track       CDATA          "default"
@@ -379,7 +378,7 @@
 <!-- attrs    = the base language of the data in the description;
                 the class & style attributes;
                 a short title representing the p (e.g. in tooltips) -->
-<!ELEMENT p (span*, br*, #PCDATA)>
+<!ELEMENT p (span*| br*| #PCDATA)>
 <!ATTLIST p
   %attrs;
   start       %Timestamp;    #REQUIRED

Modified: standards/draft-pfeiffer-cmml-current.xml
===================================================================
--- standards/draft-pfeiffer-cmml-current.xml	2007-11-18 20:26:35 UTC (rev 3275)
+++ standards/draft-pfeiffer-cmml-current.xml	2007-11-18 20:49:40 UTC (rev 3276)
@@ -2771,7 +2771,7 @@
   <meta name="Subject" content="dolphin"/>
   <caption>
     <p id="subtitle3">
-      This is a <div style="fontWeight: bold;">lengthy</div><br/>
+      This is a <span style="fontWeight: bold;">lengthy</span><br/>
       subtitle that is split over two lines.
     </p>
   </caption>