Fix:DTD:Updated the DTD to fix ticket #431

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2947 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit.dtd b/navit/navit.dtd
index 8c3fbc2..4ef8317 100644 (file)
--- a/navit/navit.dtd
+++ b/navit/navit.dtd
@@ -15,23 +15,25 @@
 <!ATTLIST log data CDATA #REQUIRED>
 <!ATTLIST log flush_size CDATA #IMPLIED>
 <!ATTLIST log flush_time CDATA #IMPLIED>
-<!ELEMENT navit (gui,graphics,vehicle*,vehicleprofile*,tracking,route,navigation,speech,osd*,mapset+,layout+,log*)>
+<!ATTLIST log attr_types CDATA #IMPLIED>
+<!ELEMENT navit (graphics,gui+,log*,osd*,vehicle*,tracking,vehicleprofile*,route,navigation,speech,mapset+,layout+)>
 <!ATTLIST navit center CDATA #REQUIRED>
 <!ATTLIST navit zoom CDATA #REQUIRED>
 <!ATTLIST navit tracking CDATA #REQUIRED>
 <!ATTLIST navit orientation CDATA #REQUIRED>
 <!ATTLIST navit recent_dest CDATA #IMPLIED>
 <!ATTLIST navit drag_bitmap CDATA #IMPLIED>
-<!ELEMENT gui EMPTY>
+<!ELEMENT gui ANY>
 <!ATTLIST gui type CDATA #REQUIRED>
 <!ATTLIST gui menubar CDATA #IMPLIED>
 <!ATTLIST gui toolbar CDATA #IMPLIED>
 <!ATTLIST gui statusbar CDATA #IMPLIED>
 <!ATTLIST gui skin CDATA #IMPLIED>
 <!ATTLIST gui fullscreen CDATA #IMPLIED>
+<!ATTLIST gui enabled CDATA #IMPLIED>
 <!ELEMENT graphics EMPTY>
 <!ATTLIST graphics type CDATA #REQUIRED>
-<!ELEMENT vehicle (cursor*)>
+<!ELEMENT vehicle (log*)>
 <!ATTLIST vehicle name CDATA #REQUIRED>
 <!ATTLIST vehicle source CDATA #REQUIRED>
 <!ATTLIST vehicle enabled CDATA #IMPLIED>
@@ -86,10 +88,12 @@
 <!ATTLIST map active CDATA #IMPLIED>
 <!ATTLIST map data CDATA #REQUIRED>
 <!ATTLIST map debug CDATA #IMPLIED>
-<!ELEMENT layout (cursor*,layer*,xi:include*)>
+<!ELEMENT layout (cursor*,xi:include*,layer*)>
 <!ATTLIST layout name CDATA #REQUIRED>
 <!ATTLIST layout color CDATA #IMPLIED>
 <!ATTLIST layout font CDATA #IMPLIED>
+<!ATTLIST layout daylayout CDATA #IMPLIED>
+<!ATTLIST layout nightlayout CDATA #IMPLIED>
 <!ELEMENT layer (itemgra*)>
 <!ATTLIST layer enabled CDATA #IMPLIED>
 <!ATTLIST layer name CDATA #IMPLIED>

diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index 35bf312..54fb886 100644 (file)
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -3282,6 +3282,8 @@ Navigation</text></img>
                                </itemgra>
                        </cursor>
 
+                       <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Symbols'])"/>
+                       <!-- <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Labels'])"/> -->
                        <layer name="Landuse">
                                <itemgra item_types="image" order="0-">
                                        <image/>
@@ -4083,8 +4085,6 @@ Navigation</text></img>
                                        <text text_size="9"/>
                                </itemgra>
                        </layer>
-                       <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Symbols'])"/>
-                       <!-- <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Labels'])"/> -->
                        <layer name="Unknown Elements">
                                <!-- This entry shows all unknown linear elements as blue lines -->
                                <!--