Author: duncan
Date: Thu Feb  1 18:06:33 2007
New Revision: 9122

Modified:
   branches/rel-1/freevo/share/skins/freevo-skin.dtd

Log:
Reordered entities and added img to if, code seems to support this but it never 
used.

Modified: branches/rel-1/freevo/share/skins/freevo-skin.dtd
==============================================================================
--- branches/rel-1/freevo/share/skins/freevo-skin.dtd   (original)
+++ branches/rel-1/freevo/share/skins/freevo-skin.dtd   Thu Feb  1 18:06:33 2007
@@ -24,15 +24,58 @@
 <!ELEMENT menu (style+)>
 <!ATTLIST menu type CDATA #REQUIRED>
 
-<!ELEMENT style EMPTY>
-<!ATTLIST style text CDATA #REQUIRED>
-<!ATTLIST style image CDATA #IMPLIED>
-
-<!-- label is really an id but can't have spaces -->
 <!ELEMENT menuset ((screen | title | subtitle | view | listing | info)+)>
 <!ATTLIST menuset label CDATA #REQUIRED>
 <!ATTLIST menuset inherits CDATA #IMPLIED>
 
+<!ELEMENT font (shadow?)>
+<!ATTLIST font 
+    label CDATA #REQUIRED
+    name CDATA #IMPLIED
+    size CDATA #IMPLIED
+    color CDATA #IMPLIED
+    bgcolor CDATA #IMPLIED
+>
+
+<!ELEMENT shadow EMPTY>
+<!ATTLIST shadow 
+    border CDATA #IMPLIED
+    color CDATA #REQUIRED
+    visible CDATA #REQUIRED
+    x CDATA #IMPLIED
+    y CDATA #IMPLIED
+>
+
+<!ELEMENT color EMPTY>
+<!ATTLIST color 
+    label CDATA #REQUIRED
+    value CDATA #REQUIRED
+>
+
+<!ELEMENT image EMPTY>
+<!ATTLIST image 
+    label CDATA #IMPLIED
+    filename CDATA #IMPLIED
+    image CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    x CDATA #IMPLIED
+    y CDATA #IMPLIED
+    visible CDATA #IMPLIED
+>
+
+<!ELEMENT popup EMPTY>
+<!ATTLIST popup
+    layout CDATA #REQUIRED>
+    type CDATA #REQUIRED
+>
+
+<!ELEMENT style EMPTY>
+<!ATTLIST style 
+    text CDATA #REQUIRED
+    image CDATA #IMPLIED
+>
+
 <!ELEMENT screen (area?)>
 <!ATTLIST screen
     layout CDATA #REQUIRED
@@ -125,24 +168,9 @@
     hours_per_page CDATA #IMPLIED
     layout CDATA #IMPLIED
 >
-<!-- only splashscreen has a content with a layout
-    layout CDATA #IMPLIED
--->    
 
 <!ELEMENT player (screen, ((view, info)? | (info, view)?), title)>
 
-<!ELEMENT image EMPTY>
-<!ATTLIST image 
-    label CDATA #IMPLIED
-    filename CDATA #IMPLIED
-    image CDATA #IMPLIED
-    width CDATA #IMPLIED
-    height CDATA #IMPLIED
-    x CDATA #IMPLIED
-    y CDATA #IMPLIED
-    visible CDATA #IMPLIED
->
-
 <!ELEMENT item ((rectangle | if | goto_pos | text | shadow | newline)*)>
 <!ATTLIST item 
     label CDATA #IMPLIED
@@ -158,32 +186,6 @@
     height CDATA #IMPLIED
 >
 
-<!ELEMENT font (shadow?)>
-<!ATTLIST font 
-    label CDATA #REQUIRED
-    name CDATA #IMPLIED
-    color CDATA #IMPLIED
-    size CDATA #IMPLIED
->
-<!--
-    align %align; #IMPLIED
--->    
-
-<!ELEMENT color EMPTY>
-<!ATTLIST color 
-    label CDATA #REQUIRED
-    value CDATA #REQUIRED
->
-
-<!ELEMENT shadow EMPTY>
-<!ATTLIST shadow 
-    border CDATA #IMPLIED
-    color CDATA #REQUIRED
-    visible CDATA #REQUIRED
-    x CDATA #IMPLIED
-    y CDATA #IMPLIED
->
-
 <!ELEMENT rectangle EMPTY>
 <!ATTLIST rectangle
     color CDATA #IMPLIED
@@ -196,7 +198,7 @@
     y CDATA #IMPLIED
 >
 
-<!ELEMENT if ((if | text | newline | goto_pos)+)>
+<!ELEMENT if ((if | text | newline | goto_pos | img)+)>
 <!ATTLIST if expression CDATA #IMPLIED>
 
 <!ELEMENT text (#PCDATA)>
@@ -221,12 +223,17 @@
     y CDATA #IMPLIED
 >
 
-<!ELEMENT popup EMPTY>
-<!ATTLIST popup layout CDATA #REQUIRED>
-<!ATTLIST popup type CDATA #REQUIRED>
-
-<!ELEMENT tv (style)>
+<!ELEMENT img EMPTY>
+<!ATTLIST img
+    x CDATA #IMPLIED
+    y CDATA #IMPLIED
+    width CDATA #IMPLIED
+    height CDATA #IMPLIED
+    src CDATA #IMPLIED
+>
 
 <!ELEMENT splashscreen (screen, content)>
 
+<!ELEMENT tv (style)>
+
 <!ELEMENT headlines (screen, title?, info)>

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to