[paparazzi-commits] [4024] add sectors, header to procedures

[Pascal Brisset]

Revision: 4024
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4024
Author:   hecto
Date:     2009-08-30 19:32:58 +0000 (Sun, 30 Aug 2009)
Log Message:
-----------
 add sectors, header to procedures
 add color to sectors

Modified Paths:
--------------
    paparazzi3/trunk/conf/flight_plans/flight_plan.dtd

Modified: paparazzi3/trunk/conf/flight_plans/flight_plan.dtd
===================================================================
--- paparazzi3/trunk/conf/flight_plans/flight_plan.dtd  2009-08-30 13:53:46 UTC 
(rev 4023)
+++ paparazzi3/trunk/conf/flight_plans/flight_plan.dtd  2009-08-30 19:32:58 UTC 
(rev 4024)
@@ -1,8 +1,8 @@
 <!-- Paparazzi flight plan DTD -->
 
-<!ELEMENT flight_plan (header?,waypoints,sectors?,include*,exceptions?,blocks)>
+<!ELEMENT flight_plan 
(header?,waypoints,sectors?,includes?,exceptions?,blocks)>
 
-<!ELEMENT procedure (param*,waypoints,exceptions?,blocks)>
+<!ELEMENT procedure (param*,header?,waypoints?,sectors?,exceptions?,blocks?)>
 
 <!ELEMENT header (#PCDATA)>
 
@@ -14,6 +14,8 @@
 <!ELEMENT corner EMPTY>
 <!ELEMENT kml EMPTY>
 
+<!ELEMENT includes (include*)>
+
 <!ELEMENT exceptions (exception*)>
 
 <!ELEMENT blocks (block+)>
@@ -67,10 +69,13 @@
 lon CDATA #IMPLIED
 alt CDATA #IMPLIED>
 
+<!ATTLIST exceptions>
+
 <!ATTLIST sectors>
 
 <!ATTLIST sector
-name CDATA #REQUIRED>
+name CDATA #REQUIRED
+color CDATA #IMPLIED>
 
 <!ATTLIST corner
 name CDATA #REQUIRED>
@@ -78,6 +83,8 @@
 <!ATTLIST kml
 file CDATA #REQUIRED>
 
+<!ATTLIST blocks>
+
 <!ATTLIST block 
 name CDATA #REQUIRED
 pre_call CDATA #IMPLIED
@@ -197,6 +204,8 @@
 <!ATTLIST deroute
 block CDATA #REQUIRED>
 
+<!ATTLIST includes>
+
 <!ATTLIST include
 name CDATA #REQUIRED
 procedure CDATA #REQUIRED