From 57abf3ab685201918aa1c90a62005189bdc96389 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Thu, 10 Apr 2014 00:27:06 -0400
Subject: [PATCH] Make the XML validation phase check against the schema, and
 fixed all the errors it found

---
 osx/BoE.xcodeproj/project.pbxproj |  5 ++-
 rsrc/dialogs/dialog.xsd           | 32 +++++++++-------
 rsrc/dialogs/edit-terrain.xml     | 48 ++++++++++++------------
 rsrc/dialogs/inventory-full.xml   |  4 +-
 rsrc/dialogs/monster-info.xml     | 62 +++++++++++++++----------------
 rsrc/dialogs/pc-info.xml          |  2 +-
 6 files changed, 81 insertions(+), 72 deletions(-)

diff --git a/osx/BoE.xcodeproj/project.pbxproj b/osx/BoE.xcodeproj/project.pbxproj
index 31e4171c..d9165fa1 100644
--- a/osx/BoE.xcodeproj/project.pbxproj
+++ b/osx/BoE.xcodeproj/project.pbxproj
@@ -2487,13 +2487,16 @@
 			files = (
 			);
 			inputPaths = (
+				"$(SRCROOT)/../rsrc/dialogs/*.xml",
 			);
 			name = "Validate Dialog Definitions";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/data/dialogs/*.xml",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/bash -v";
-			shellScript = "\ncd ../rsrc/dialogs/\nxmllint --nonet --noout --stream --load-trace --loaddtd --dtdvalid \"$SOURCE_ROOT/../rsrc/dialogs/dialog.dtd\" \"$SOURCE_ROOT/../rsrc/dialogs\"/*.xml\n";
+			shellScript = "\ncd ../rsrc/dialogs/\nset -o pipefail\nxmllint --nonet --noout --schema \"$SOURCE_ROOT/../rsrc/dialogs/dialog.xsd\" \"$SOURCE_ROOT/../rsrc/dialogs/\"*.xml 2>&1 | sed 's/%20/ /g'\n";
+			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/rsrc/dialogs/dialog.xsd b/rsrc/dialogs/dialog.xsd
index 354839ee..d7948490 100644
--- a/rsrc/dialogs/dialog.xsd
+++ b/rsrc/dialogs/dialog.xsd
@@ -145,6 +145,7 @@
         <xs:restriction base="xs:token">
           <xs:enumeration value="small"/>
           <xs:enumeration value="large"/>
+          <xs:enumeration value="title"/>
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
@@ -173,7 +174,7 @@
         </xs:element>
       </xs:sequence>
       <xs:attribute name="name" type="xs:ID"/>
-      <xs:attribute name="framed" default="true" type="bool"/>
+      <xs:attribute name="framed" default="false" type="bool"/>
       <xs:attributeGroup ref="font"/>
       <xs:attributeGroup ref="keys"/>
       <xs:attribute name="clickable" default="false" type="bool"/>
@@ -186,6 +187,7 @@
       <xs:attribute name="name" type="xs:ID"/>
       <xs:attribute name="type" use="required" type="picttype"/>
       <xs:attribute name="custom" default="false" type="bool"/>
+      <xs:attribute name="framed" default="true" type="bool"/>
       <xs:attribute name="size">
         <xs:simpleType>
           <xs:restriction base="xs:token">
@@ -219,18 +221,22 @@
   </xs:element>
   <xs:element name="led">
     <xs:complexType>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
-      <xs:attribute name="state" default="off">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="red"/>
-            <xs:enumeration value="green"/>
-            <xs:enumeration value="off"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attributeGroup ref="rect"/>
-      <xs:attributeGroup ref="font"/>
+      <xs:simpleContent>
+        <xs:extension base="xs:string">
+          <xs:attribute name="name" use="required" type="xs:ID"/>
+          <xs:attribute name="state" default="off">
+            <xs:simpleType>
+              <xs:restriction base="xs:token">
+                <xs:enumeration value="red"/>
+                <xs:enumeration value="green"/>
+                <xs:enumeration value="off"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attributeGroup ref="rect"/>
+          <xs:attributeGroup ref="font"/>
+        </xs:extension>
+      </xs:simpleContent>
     </xs:complexType>
   </xs:element>
   <xs:element name="group">
diff --git a/rsrc/dialogs/edit-terrain.xml b/rsrc/dialogs/edit-terrain.xml
index 36265da8..0b115edc 100644
--- a/rsrc/dialogs/edit-terrain.xml
+++ b/rsrc/dialogs/edit-terrain.xml
@@ -49,30 +49,30 @@
 	
 	<text size='large' top='238' left='8' height='14' width='175'>Special properties:</text>
 	<group name="prop">
-		<led name='0' top='254' left='8' state='off' width='116'>None</led>
-		<led name='1' top='269' left='8' state='off' width='116'>Change when step on</led>
-		<led name='2' top='284' left='8' state='off' width='116'>Damaging terrain</led>
-		<led name='3' top='299' left='8' state='off' width='116'>Is a bridge</led>
-		<led name='4' top='314' left='8' state='off' width='116'>Change while occupied</led>
-		<led name='5' top='329' left='8' state='off' width='116'>Dangerous terrain</led>
-		<led name='6' top='344' left='8' state='off' width='116'>Reserved</led>
-		<led name='7' top='359' left='8' state='off' width='116'>Crumbling terrain</led>
-		<led name='8' top='254' left='146' state='off' width='116'>Lockable terrain</led>
-		<led name='9' top='269' left='146' state='off' width='116'>Unlockable terrain</led>
-		<led name='10' top='284' left='146' state='off' width='116'>Reserved</led>
-		<led name='11' top='299' left='146' state='off' width='116'>Is a sign</led>
-		<led name='12' top='314' left='146' state='off' width='116'>Call special when step</led>
-		<led name='13' top='329' left='146' state='off' width='116'>Reserved</led>
-		<led name='14' top='344' left='146' state='off' width='116'>Is a container</led>
-		<led name='15' top='359' left='146' state='off' width='116'>Waterfall</led>
-		<led name='16' top='254' left='285' state='off' width='116'>Conveyor belt</led>
-		<led name='17' top='269' left='285' state='off' width='116'>Reserved</led>
-		<led name='18' top='284' left='285' state='off' width='116'>Reserved</led>
-		<led name='19' top='299' left='285' state='off' width='116'>Reserved</led>
-		<led name='20' top='314' left='285' state='off' width='116'>Blocked to monsters</led>
-		<led name='21' top='329' left='285' state='off' width='116'>Town entrance</led>
-		<led name='22' top='344' left='285' state='off' width='116'>Change when used</led>
-		<led name='23' top='359' left='285' state='off' width='116'>Call special when used</led>
+		<led name='prop0' top='254' left='8' state='off' width='116'>None</led>
+		<led name='prop1' top='269' left='8' state='off' width='116'>Change when step on</led>
+		<led name='prop2' top='284' left='8' state='off' width='116'>Damaging terrain</led>
+		<led name='prop3' top='299' left='8' state='off' width='116'>Is a bridge</led>
+		<led name='prop4' top='314' left='8' state='off' width='116'>Change while occupied</led>
+		<led name='prop5' top='329' left='8' state='off' width='116'>Dangerous terrain</led>
+		<led name='prop6' top='344' left='8' state='off' width='116'>Reserved</led>
+		<led name='prop7' top='359' left='8' state='off' width='116'>Crumbling terrain</led>
+		<led name='prop8' top='254' left='146' state='off' width='116'>Lockable terrain</led>
+		<led name='prop9' top='269' left='146' state='off' width='116'>Unlockable terrain</led>
+		<led name='prop10' top='284' left='146' state='off' width='116'>Reserved</led>
+		<led name='prop11' top='299' left='146' state='off' width='116'>Is a sign</led>
+		<led name='prop12' top='314' left='146' state='off' width='116'>Call special when step</led>
+		<led name='prop13' top='329' left='146' state='off' width='116'>Reserved</led>
+		<led name='prop14' top='344' left='146' state='off' width='116'>Is a container</led>
+		<led name='prop15' top='359' left='146' state='off' width='116'>Waterfall</led>
+		<led name='prop16' top='254' left='285' state='off' width='116'>Conveyor belt</led>
+		<led name='prop17' top='269' left='285' state='off' width='116'>Reserved</led>
+		<led name='prop18' top='284' left='285' state='off' width='116'>Reserved</led>
+		<led name='prop19' top='299' left='285' state='off' width='116'>Reserved</led>
+		<led name='prop20' top='314' left='285' state='off' width='116'>Blocked to monsters</led>
+		<led name='prop21' top='329' left='285' state='off' width='116'>Town entrance</led>
+		<led name='prop22' top='344' left='285' state='off' width='116'>Change when used</led>
+		<led name='prop23' top='359' left='285' state='off' width='116'>Call special when used</led>
 	</group>
 	<text top='385' left='9' height='14' width='91'>Extra values:</text>
 	<text name='flag1text' framed='true' top='385' left='109' height='14' width='209'>*flag1</text>
diff --git a/rsrc/dialogs/inventory-full.xml b/rsrc/dialogs/inventory-full.xml
index 5cd48ea1..0876ad60 100644
--- a/rsrc/dialogs/inventory-full.xml
+++ b/rsrc/dialogs/inventory-full.xml
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <!--<!DOCTYPE dialog SYSTEM	"dialog.dtd">-->
 <dialog skin='dark'>
-	<pic type='dlog' num='2' left='8' top='8'/>
+	<pict type='dlog' num='2' left='8' top='8'/>
 	<text left='52' top='4' width='255' height='18'>No room in your inventory.</text>
-	<button name='okay' type='regular' key='enter' left='249' top='30'>OK</button>
+	<button name='okay' type='regular' def-key='enter' left='249' top='30'>OK</button>
 </dialog>
\ No newline at end of file
diff --git a/rsrc/dialogs/monster-info.xml b/rsrc/dialogs/monster-info.xml
index ac4de161..3032430e 100644
--- a/rsrc/dialogs/monster-info.xml
+++ b/rsrc/dialogs/monster-info.xml
@@ -2,35 +2,35 @@
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <!--<!DOCTYPE dialog SYSTEM	"dialog.dtd">-->
 <dialog skin='dark' defbtn='done'>
-	1<text size='large' top='209' left='21' width='137' height='16'>Immunities:</text>
-	2<text size='large' top='7' left='54' width='106' height='16'>Monster Info:</text>
-	3<button name='done' type='done' top='319' left='249'/>
-	4<pict name='pic' type='monst' num='0' top='8' left='12'/>
-	5<text name='name' framed='true' top='32' left='104' width='195' height='16'/>
-	6<text name='lvl' framed='true' top='59' left='53' width='25' height='16'/>
-	7<text name='hp' framed='true' top='59' left='134' width='47' height='16'/>
-	8<text name='sp' framed='true' top='59' left='258' width='47' height='16'/>
-	9<text name='def' framed='true' top='85' left='57' width='25' height='16'/>
-	10<text name='skill' framed='true' top='85' left='127' width='25' height='16'/>
-	11<text name='morale' framed='true' top='85' left='205' width='32' height='16'/>
-	12<text name='ap' framed='true' top='85' left='280' width='25' height='16'/>
-	13<text name='attack1' framed='true' top='111' left='63' width='44' height='16'/>
-	14<text name='attack2' framed='true' top='111' left='160' width='44' height='16'/>
-	15<text name='attack3' framed='true' top='111' left='261' width='44' height='16'/>
-	16<text name='mage' framed='true' top='137' left='78' width='25' height='17'/>
-	17<text name='priest' framed='true' top='137' left='188' width='25' height='17'/>
-	18<text name='poison' framed='true' top='137' left='280' width='25' height='17'/>
-	19<text name='abil1' framed='true' top='165' left='67' width='238' height='16'/>
-	20<led name='immune1' state='off' top='227' left='118'/>
-	21<led name='immune2' state='off' top='242' left='118'/>
-	22<led name='immune3' state='off' top='257' left='118'/>
-	23<led name='immune4' state='off' top='272' left='118'/>
-	24<led name='immune5' state='off' top='227' left='241'/>
-	25<led name='immune6' state='off' top='242' left='241'/>
-	26<led name='immune7' state='off' top='257' left='241'/>
-	27<led name='immune8' state='off' top='272' left='241'/>
-	28<button name='left' type='left' def-key='left' top='319' left='11'/>
-	29<button name='right' type='right' def-key='right' top='319' left='74'/>
-	30<text top='288' left='10' width='305' height='28'>(To make monsters appear in roster menu, cast Scry Monster on them.)</text>
-	31<text name='abil2' framed='true' top='188' left='67' width='238' height='16'/>
+	<text size='large' top='209' left='21' width='137' height='16'>Immunities:</text>
+	<text size='large' top='7' left='54' width='106' height='16'>Monster Info:</text>
+	<button name='done' type='done' top='319' left='249'/>
+	<pict name='pic' type='monst' num='0' top='8' left='12'/>
+	<text name='name' framed='true' top='32' left='104' width='195' height='16'/>
+	<text name='lvl' framed='true' top='59' left='53' width='25' height='16'/>
+	<text name='hp' framed='true' top='59' left='134' width='47' height='16'/>
+	<text name='sp' framed='true' top='59' left='258' width='47' height='16'/>
+	<text name='def' framed='true' top='85' left='57' width='25' height='16'/>
+	<text name='skill' framed='true' top='85' left='127' width='25' height='16'/>
+	<text name='morale' framed='true' top='85' left='205' width='32' height='16'/>
+	<text name='ap' framed='true' top='85' left='280' width='25' height='16'/>
+	<text name='attack1' framed='true' top='111' left='63' width='44' height='16'/>
+	<text name='attack2' framed='true' top='111' left='160' width='44' height='16'/>
+	<text name='attack3' framed='true' top='111' left='261' width='44' height='16'/>
+	<text name='mage' framed='true' top='137' left='78' width='25' height='17'/>
+	<text name='priest' framed='true' top='137' left='188' width='25' height='17'/>
+	<text name='poison' framed='true' top='137' left='280' width='25' height='17'/>
+	<text name='abil1' framed='true' top='165' left='67' width='238' height='16'/>
+	<led name='immune1' state='off' top='227' left='118'/>
+	<led name='immune2' state='off' top='242' left='118'/>
+	<led name='immune3' state='off' top='257' left='118'/>
+	<led name='immune4' state='off' top='272' left='118'/>
+	<led name='immune5' state='off' top='227' left='241'/>
+	<led name='immune6' state='off' top='242' left='241'/>
+	<led name='immune7' state='off' top='257' left='241'/>
+	<led name='immune8' state='off' top='272' left='241'/>
+	<button name='left' type='left' def-key='left' top='319' left='11'/>
+	<button name='right' type='right' def-key='right' top='319' left='74'/>
+	<text top='288' left='10' width='305' height='28'>(To make monsters appear in roster menu, cast Scry Monster on them.)</text>
+	<text name='abil2' framed='true' top='188' left='67' width='238' height='16'/>
 </dialog>
\ No newline at end of file
diff --git a/rsrc/dialogs/pc-info.xml b/rsrc/dialogs/pc-info.xml
index c9fb3188..25a2f61c 100644
--- a/rsrc/dialogs/pc-info.xml
+++ b/rsrc/dialogs/pc-info.xml
@@ -33,7 +33,7 @@
 	<text name='lbl7' top='183' left='24' width='97' height='16'/>
 	<text name='thrown' top='183' left='128' width='38' height='16'/>
 	<text name='lbl8' top='201' left='24' width='97' height='16'/>
-	<text nane='bow' top='201' left='128' width='38' height='16'/>
+	<text name='bow' top='201' left='128' width='38' height='16'/>
 	<text name='lbl9' top='219' left='24' width='97' height='16'/>
 	<text name='def' top='219' left='128' width='38' height='16'/>
 	<text name='lbl10' top='70' left='171' width='92' height='16'/>