From ed74d350a1c36e549852e6f72ef2bd5ac1e94d48 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 27 Jun 2010 09:45:35 +0100
Subject: [PATCH] Use hyphens in layout schema

---
 layouts/editor.xml             | 42 +++++++++---------
 layouts/game.xml               |  4 +-
 maps/coal_mine/coal_mine.xml   | 32 +++++++-------
 maps/demo/demo.xml             | 32 +++++++-------
 maps/figure8/figure8.xml       | 12 ++---
 maps/goods_demo/goods_demo.xml | 32 +++++++-------
 maps/long_map/long_map.xml     | 80 +++++++++++++++++-----------------
 maps/points/points.xml         | 52 +++++++++++-----------
 maps/sbends/sbends.xml         |  8 ++--
 maps/uphill/uphill.xml         | 32 +++++++-------
 maps/villages/villages.xml     | 18 ++++----
 schemas/layout.xsd             | 62 +++++++++++++-------------
 schemas/map.xsd                |  4 +-
 src/Map.cpp                    |  4 +-
 src/Train.cpp                  |  2 +-
 src/gui/Layout.cpp             | 14 +++---
 16 files changed, 215 insertions(+), 215 deletions(-)

diff --git a/layouts/editor.xml b/layouts/editor.xml
index bcc69c3..1aff3c3 100644
--- a/layouts/editor.xml
+++ b/layouts/editor.xml
@@ -2,7 +2,7 @@
 <layout>
   <font name="small-font"
         file="fonts/Vera.ttf"
-        dropShadow="true"
+        drop-shadow="true"
         size="14" />
 
   <window x="10" y="10" border="5" name="tool_wnd">
@@ -10,27 +10,27 @@
            name="tool_label"
            x="0" y="0"/>
 
-    <toggleBar name="tools" x="60" y="0">
-      <toggleButton name="track" image="images/track_icon.png"/>
-      <toggleButton name="raise" image="images/raise_icon.png"/>
-      <toggleButton name="lower" image="images/lower_icon.png"/>
-      <toggleButton name="level" image="images/level_icon.png"/>
-      <toggleButton name="smooth" image="images/icons/smooth.png"/>
-      <toggleButton name="delete" image="images/delete_icon.png"/>
-      <toggleButton name="start" image="images/start_icon2.png"/>
-      <toggleButton name="station" image="images/station_icon.png"/>
-      <toggleButton name="building" image="images/buildings_icon.png"/>
-      <toggleButton name="tree" image="images/icons/tree.png"/>
-    </toggleBar>
+    <toggle-bar name="tools" x="60" y="0">
+      <toggle-button name="track" image="images/track_icon.png"/>
+      <toggle-button name="raise" image="images/raise_icon.png"/>
+      <toggle-button name="lower" image="images/lower_icon.png"/>
+      <toggle-button name="level" image="images/level_icon.png"/>
+      <toggle-button name="smooth" image="images/icons/smooth.png"/>
+      <toggle-button name="delete" image="images/delete_icon.png"/>
+      <toggle-button name="start" image="images/start_icon2.png"/>
+      <toggle-button name="station" image="images/station_icon.png"/>
+      <toggle-button name="building" image="images/buildings_icon.png"/>
+      <toggle-button name="tree" image="images/icons/tree.png"/>
+    </toggle-bar>
   </window>
 
   <window x="10" y="60" border="5" visible="false"
           name="building_wnd">
-    <imageButton name="prev" x="5" y="5" width="32" height="32"
+    <image-button name="prev" x="5" y="5" width="32" height="32"
                  image="images/icons/prev.png"/>
-    <imageButton name="next" x="37" y="5" width="32" height="32"
+    <image-button name="next" x="37" y="5" width="32" height="32"
                  image="images/icons/next.png"/>
-    <imageButton name="rotate" x="69" y="5" width="32" height="32"
+    <image-button name="rotate" x="69" y="5" width="32" height="32"
                  image="images/icons/rotate.png"/>
     
     <canvas3d name="preview" x="10" y="40" width="170" height="120"
@@ -42,9 +42,9 @@
 
   <window x="10" y="60" border="5" visible="false"
           name="tree_wnd">
-    <imageButton name="prev" x="5" y="5" width="32" height="32"
+    <image-button name="prev" x="5" y="5" width="32" height="32"
                  image="images/icons/prev.png"/>
-    <imageButton name="next" x="37" y="5" width="32" height="32"
+    <image-button name="next" x="37" y="5" width="32" height="32"
                  image="images/icons/next.png"/>
     
     <canvas3d name="preview" x="10" y="40" width="170" height="120"
@@ -54,14 +54,14 @@
            font="small-font"/>
   </window>
 
-  <fromBottom offset="53" name="lower">
+  <from-bottom offset="53" name="lower">
     <window x="5" y="0" border="5"
             name="action_wnd">
       <label text="Actions"
              name="action_label"
              x="0" y="0"/>
-      <imageButton name="save" x="70" y="0" width="32" height="32"
+      <image-button name="save" x="70" y="0" width="32" height="32"
                    image="images/icons/save.png"/>
     </window>
-  </fromBottom>
+  </from-bottom>
 </layout>
diff --git a/layouts/game.xml b/layouts/game.xml
index be6b616..9e36925 100644
--- a/layouts/game.xml
+++ b/layouts/game.xml
@@ -2,7 +2,7 @@
 <layout>
   <font name="status-font"
         file="fonts/Vera.ttf"
-        dropShadow="true"
+        drop-shadow="true"
         size="20" />
 
   <!-- Status area -->
@@ -10,7 +10,7 @@
          name="speed_label"
          font="status-font"
          x="10" y="10" />
-  <throttleMeter font="status-font"
+  <throttle-meter font="status-font"
                  name="throttle_meter"
                  x="10" y="35"/>
   <label text="Brake on"
diff --git a/maps/coal_mine/coal_mine.xml b/maps/coal_mine/coal_mine.xml
index d4058f7..4609760 100644
--- a/maps/coal_mine/coal_mine.xml
+++ b/maps/coal_mine/coal_mine.xml
@@ -60,11 +60,11 @@
 </tile>
 
 <tile x="2" y="20">
-<curved-track startAngle="270" finishAngle="360" radius="4"/>
+<curved-track start-angle="270" finish-angle="360" radius="4"/>
 </tile>
 
 <tile x="5" y="6">
-<curved-track startAngle="180" finishAngle="270" radius="4"/>
+<curved-track start-angle="180" finish-angle="270" radius="4"/>
 </tile>
 
 <tile x="6" y="6">
@@ -80,7 +80,7 @@
 </tile>
 
 <tile x="8" y="25">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="8" y="26">
@@ -164,7 +164,7 @@
 </tile>
 
 <tile x="8" y="46">
-<curved-track startAngle="270" finishAngle="360" radius="5"/>
+<curved-track start-angle="270" finish-angle="360" radius="5"/>
 </tile>
 
 <tile x="9" y="6">
@@ -204,7 +204,7 @@
 </tile>
 
 <tile x="13" y="50">
-<curved-track startAngle="0" finishAngle="90" radius="5"/>
+<curved-track start-angle="0" finish-angle="90" radius="5"/>
 </tile>
 
 <tile x="14" y="6">
@@ -312,7 +312,7 @@
 </tile>
 
 <tile x="22" y="34">
-<curved-track startAngle="180" finishAngle="270" radius="6"/>
+<curved-track start-angle="180" finish-angle="270" radius="6"/>
 </tile>
 
 <tile x="23" y="34">
@@ -324,11 +324,11 @@
 </tile>
 
 <tile x="26" y="9">
-<curved-track startAngle="90" finishAngle="180" radius="4"/>
+<curved-track start-angle="90" finish-angle="180" radius="4"/>
 </tile>
 
 <tile x="26" y="10">
-<curved-track startAngle="270" finishAngle="360" radius="5"/>
+<curved-track start-angle="270" finish-angle="360" radius="5"/>
 </tile>
 
 <tile x="26" y="34">
@@ -420,7 +420,7 @@
 </tile>
 
 <tile x="33" y="38">
-<curved-track startAngle="90" finishAngle="180" radius="4"/>
+<curved-track start-angle="90" finish-angle="180" radius="4"/>
 </tile>
 
 <tile x="33" y="39">
@@ -502,7 +502,7 @@
 </tile>
 
 <tile x="33" y="58">
-<curved-track startAngle="270" finishAngle="360" radius="4"/>
+<curved-track start-angle="270" finish-angle="360" radius="4"/>
 </tile>
 
 <tile x="34" y="14">
@@ -736,11 +736,11 @@
 </tile>
 
 <tile x="41" y="17">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="41" y="18">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="41" y="34">
@@ -904,7 +904,7 @@
 </tile>
 
 <tile x="50" y="61">
-<curved-track startAngle="0" finishAngle="90" radius="5"/>
+<curved-track start-angle="0" finish-angle="90" radius="5"/>
 </tile>
 
 <tile x="51" y="14">
@@ -944,7 +944,7 @@
 </tile>
 
 <tile x="54" y="41">
-<curved-track startAngle="90" finishAngle="180" radius="8"/>
+<curved-track start-angle="90" finish-angle="180" radius="8"/>
 </tile>
 
 <tile x="54" y="42">
@@ -1008,11 +1008,11 @@
 </tile>
 
 <tile x="55" y="20">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="57" y="17">
-<curved-track startAngle="90" finishAngle="180" radius="4"/>
+<curved-track start-angle="90" finish-angle="180" radius="4"/>
 </tile>
 
 <tile x="63" y="54">
diff --git a/maps/demo/demo.xml b/maps/demo/demo.xml
index bde13d1..f83c869 100644
--- a/maps/demo/demo.xml
+++ b/maps/demo/demo.xml
@@ -24,7 +24,7 @@
 
 <tileset>
 <tile x="0" y="4">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="0" y="55">
@@ -76,7 +76,7 @@
 </tile>
 
 <tile x="1" y="24">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="1" y="57">
@@ -84,7 +84,7 @@
 </tile>
 
 <tile x="2" y="1">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="2" y="4">
@@ -134,7 +134,7 @@
 </tile>
 
 <tile x="3" y="12">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="3" y="14">
@@ -234,7 +234,7 @@
 </tile>
 
 <tile x="5" y="60">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="6" y="0">
@@ -378,7 +378,7 @@
 </tile>
 
 <tile x="8" y="55">
-<curved-track startAngle="180" finishAngle="270" radius="4"/>
+<curved-track start-angle="180" finish-angle="270" radius="4"/>
 </tile>
 
 <tile x="8" y="60">
@@ -430,7 +430,7 @@
 </tile>
 
 <tile x="9" y="62">
-<curved-track startAngle="0" finishAngle="90" radius="4"/>
+<curved-track start-angle="0" finish-angle="90" radius="4"/>
 </tile>
 
 <tile x="10" y="1">
@@ -450,7 +450,7 @@
 </tile>
 
 <tile x="10" y="28">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="10" y="32">
@@ -506,7 +506,7 @@
 </tile>
 
 <tile x="11" y="14">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="11" y="15">
@@ -882,7 +882,7 @@
 </tile>
 
 <tile x="14" y="29">
-<curved-track startAngle="180" finishAngle="270" radius="2"/>
+<curved-track start-angle="180" finish-angle="270" radius="2"/>
 </tile>
 
 <tile x="14" y="32">
@@ -1086,11 +1086,11 @@
 </tile>
 
 <tile x="18" y="29">
-<curved-track startAngle="0" finishAngle="90" radius="2"/>
+<curved-track start-angle="0" finish-angle="90" radius="2"/>
 </tile>
 
 <tile x="18" y="55">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="18" y="62">
@@ -1106,7 +1106,7 @@
 </tile>
 
 <tile x="19" y="31">
-<curved-track startAngle="90" finishAngle="180" radius="2"/>
+<curved-track start-angle="90" finish-angle="180" radius="2"/>
 </tile>
 
 <tile x="19" y="32">
@@ -1118,7 +1118,7 @@
 </tile>
 
 <tile x="20" y="4">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="20" y="5">
@@ -1350,7 +1350,7 @@
 </tile>
 
 <tile x="23" y="35">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="23" y="45">
@@ -1398,7 +1398,7 @@
 </tile>
 
 <tile x="24" y="35">
-<curved-track startAngle="0" finishAngle="90" radius="2"/>
+<curved-track start-angle="0" finish-angle="90" radius="2"/>
 </tile>
 
 <tile x="24" y="45">
diff --git a/maps/figure8/figure8.xml b/maps/figure8/figure8.xml
index 7928c1b..fd170b9 100644
--- a/maps/figure8/figure8.xml
+++ b/maps/figure8/figure8.xml
@@ -88,7 +88,7 @@
 </tile>
 
 <tile x="3" y="14">
-<curved-track startAngle="270" finishAngle="360" radius="4"/>
+<curved-track start-angle="270" finish-angle="360" radius="4"/>
 </tile>
 
 <tile x="3" y="19">
@@ -112,7 +112,7 @@
 </tile>
 
 <tile x="6" y="2">
-<curved-track startAngle="180" finishAngle="270" radius="4"/>
+<curved-track start-angle="180" finish-angle="270" radius="4"/>
 </tile>
 
 <tile x="6" y="3">
@@ -264,7 +264,7 @@
 </tile>
 
 <tile x="14" y="4">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="14" y="5">
@@ -348,7 +348,7 @@
 </tile>
 
 <tile x="14" y="25">
-<curved-track startAngle="270" finishAngle="360" radius="5"/>
+<curved-track start-angle="270" finish-angle="360" radius="5"/>
 </tile>
 
 <tile x="14" y="31">
@@ -412,7 +412,7 @@
 </tile>
 
 <tile x="19" y="29">
-<curved-track startAngle="0" finishAngle="90" radius="6"/>
+<curved-track start-angle="0" finish-angle="90" radius="6"/>
 </tile>
 
 <tile x="19" y="31">
@@ -476,7 +476,7 @@
 </tile>
 
 <tile x="24" y="22">
-<curved-track startAngle="90" finishAngle="180" radius="6"/>
+<curved-track start-angle="90" finish-angle="180" radius="6"/>
 </tile>
 
 <tile x="24" y="23">
diff --git a/maps/goods_demo/goods_demo.xml b/maps/goods_demo/goods_demo.xml
index b192edb..500ebcf 100644
--- a/maps/goods_demo/goods_demo.xml
+++ b/maps/goods_demo/goods_demo.xml
@@ -172,7 +172,7 @@
 </tile>
 
 <tile x="2" y="27">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="3" y="10">
@@ -204,7 +204,7 @@
 </tile>
 
 <tile x="4" y="2">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="4" y="5">
@@ -280,7 +280,7 @@
 </tile>
 
 <tile x="6" y="12">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="6" y="16">
@@ -308,7 +308,7 @@
 </tile>
 
 <tile x="7" y="3">
-<curved-track startAngle="180" finishAngle="270" radius="2"/>
+<curved-track start-angle="180" finish-angle="270" radius="2"/>
 </tile>
 
 <tile x="7" y="16">
@@ -350,7 +350,7 @@
 </tile>
 
 <tile x="9" y="28">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="9" y="29">
@@ -460,7 +460,7 @@
 </tile>
 
 <tile x="13" y="6">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="13" y="14">
@@ -468,7 +468,7 @@
 </tile>
 
 <tile x="13" y="20">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="14" y="0">
@@ -512,7 +512,7 @@
 </tile>
 
 <tile x="15" y="3">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="15" y="20">
@@ -558,7 +558,7 @@
 </tile>
 
 <tile x="16" y="20">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="16" y="23">
@@ -618,7 +618,7 @@
 </tile>
 
 <tile x="18" y="10">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="18" y="11">
@@ -714,7 +714,7 @@
 </tile>
 
 <tile x="19" y="28">
-<curved-track startAngle="0" finishAngle="90" radius="2"/>
+<curved-track start-angle="0" finish-angle="90" radius="2"/>
 </tile>
 
 <tile x="19" y="29">
@@ -722,7 +722,7 @@
 </tile>
 
 <tile x="20" y="6">
-<curved-track startAngle="90" finishAngle="180" radius="4"/>
+<curved-track start-angle="90" finish-angle="180" radius="4"/>
 </tile>
 
 <tile x="20" y="7">
@@ -814,7 +814,7 @@
 </tile>
 
 <tile x="21" y="24">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="21" y="29">
@@ -922,7 +922,7 @@
 </tile>
 
 <tile x="26" y="26">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="26" y="28">
@@ -942,7 +942,7 @@
 </tile>
 
 <tile x="27" y="29">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="28" y="11">
@@ -970,7 +970,7 @@
 </tile>
 
 <tile x="29" y="7">
-<curved-track startAngle="90" finishAngle="180" radius="6"/>
+<curved-track start-angle="90" finish-angle="180" radius="6"/>
 </tile>
 
 <tile x="29" y="8">
diff --git a/maps/long_map/long_map.xml b/maps/long_map/long_map.xml
index ef410f1..48e36e9 100644
--- a/maps/long_map/long_map.xml
+++ b/maps/long_map/long_map.xml
@@ -12,11 +12,11 @@
 
 <tileset>
 <tile x="0" y="4">
-<curved-track startAngle="270" finishAngle="360" radius="4"/>
+<curved-track start-angle="270" finish-angle="360" radius="4"/>
 </tile>
 
 <tile x="3" y="0">
-<curved-track startAngle="180" finishAngle="270" radius="4"/>
+<curved-track start-angle="180" finish-angle="270" radius="4"/>
 </tile>
 
 <tile x="4" y="0">
@@ -40,7 +40,7 @@
 </tile>
 
 <tile x="6" y="7">
-<curved-track startAngle="0" finishAngle="90" radius="2"/>
+<curved-track start-angle="0" finish-angle="90" radius="2"/>
 </tile>
 
 <tile x="7" y="0">
@@ -64,7 +64,7 @@
 </tile>
 
 <tile x="11" y="1">
-<curved-track startAngle="180" finishAngle="270" radius="5"/>
+<curved-track start-angle="180" finish-angle="270" radius="5"/>
 </tile>
 
 <tile x="12" y="0">
@@ -300,11 +300,11 @@
 </tile>
 
 <tile x="67" y="4">
-<curved-track startAngle="90" finishAngle="180" radius="4"/>
+<curved-track start-angle="90" finish-angle="180" radius="4"/>
 </tile>
 
 <tile x="67" y="5">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="70" y="7">
@@ -360,7 +360,7 @@
 </tile>
 
 <tile x="81" y="7">
-<curved-track startAngle="0" finishAngle="90" radius="4"/>
+<curved-track start-angle="0" finish-angle="90" radius="4"/>
 </tile>
 
 <tile x="82" y="4">
@@ -372,7 +372,7 @@
 </tile>
 
 <tile x="86" y="1">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="86" y="3">
@@ -524,11 +524,11 @@
 </tile>
 
 <tile x="119" y="2">
-<curved-track startAngle="90" finishAngle="180" radius="2"/>
+<curved-track start-angle="90" finish-angle="180" radius="2"/>
 </tile>
 
 <tile x="119" y="3">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="122" y="5">
@@ -1104,7 +1104,7 @@
 </tile>
 
 <tile x="246" y="5">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="246" y="7">
@@ -1120,7 +1120,7 @@
 </tile>
 
 <tile x="250" y="0">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="251" y="0">
@@ -1192,11 +1192,11 @@
 </tile>
 
 <tile x="260" y="2">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="260" y="3">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="263" y="5">
@@ -1564,11 +1564,11 @@
 </tile>
 
 <tile x="322" y="5">
-<curved-track startAngle="0" finishAngle="90" radius="2"/>
+<curved-track start-angle="0" finish-angle="90" radius="2"/>
 </tile>
 
 <tile x="325" y="1">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="326" y="1">
@@ -1636,11 +1636,11 @@
 </tile>
 
 <tile x="344" y="3">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="344" y="4">
-<curved-track startAngle="270" finishAngle="360" radius="4"/>
+<curved-track start-angle="270" finish-angle="360" radius="4"/>
 </tile>
 
 <tile x="348" y="7">
@@ -1756,11 +1756,11 @@
 </tile>
 
 <tile x="376" y="7">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="379" y="3">
-<curved-track startAngle="180" finishAngle="270" radius="2"/>
+<curved-track start-angle="180" finish-angle="270" radius="2"/>
 </tile>
 
 <tile x="380" y="3">
@@ -3348,11 +3348,11 @@
 </tile>
 
 <tile x="574" y="4">
-<curved-track startAngle="90" finishAngle="180" radius="2"/>
+<curved-track start-angle="90" finish-angle="180" radius="2"/>
 </tile>
 
 <tile x="574" y="5">
-<curved-track startAngle="270" finishAngle="360" radius="2"/>
+<curved-track start-angle="270" finish-angle="360" radius="2"/>
 </tile>
 
 <tile x="576" y="6">
@@ -3744,11 +3744,11 @@
 </tile>
 
 <tile x="673" y="6">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="677" y="1">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="678" y="1">
@@ -3864,11 +3864,11 @@
 </tile>
 
 <tile x="708" y="3">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="708" y="4">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="711" y="6">
@@ -4240,11 +4240,11 @@
 </tile>
 
 <tile x="803" y="6">
-<curved-track startAngle="0" finishAngle="90" radius="4"/>
+<curved-track start-angle="0" finish-angle="90" radius="4"/>
 </tile>
 
 <tile x="808" y="0">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="809" y="0">
@@ -4268,7 +4268,7 @@
 </tile>
 
 <tile x="815" y="1">
-<curved-track startAngle="90" finishAngle="180" radius="2"/>
+<curved-track start-angle="90" finish-angle="180" radius="2"/>
 </tile>
 
 <tile x="815" y="2">
@@ -4276,7 +4276,7 @@
 </tile>
 
 <tile x="815" y="3">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="816" y="0">
@@ -5844,7 +5844,7 @@
 </tile>
 
 <tile x="973" y="5">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="973" y="6">
@@ -5856,11 +5856,11 @@
 </tile>
 
 <tile x="975" y="6">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="977" y="0">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="978" y="0">
@@ -5872,7 +5872,7 @@
 </tile>
 
 <tile x="979" y="1">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="980" y="0">
@@ -5900,7 +5900,7 @@
 </tile>
 
 <tile x="982" y="6">
-<curved-track startAngle="270" finishAngle="360" radius="2"/>
+<curved-track start-angle="270" finish-angle="360" radius="2"/>
 </tile>
 
 <tile x="983" y="0">
@@ -5912,7 +5912,7 @@
 </tile>
 
 <tile x="983" y="4">
-<curved-track startAngle="180" finishAngle="270" radius="2"/>
+<curved-track start-angle="180" finish-angle="270" radius="2"/>
 </tile>
 
 <tile x="984" y="0">
@@ -6028,7 +6028,7 @@
 </tile>
 
 <tile x="990" y="4">
-<curved-track startAngle="0" finishAngle="90" radius="2"/>
+<curved-track start-angle="0" finish-angle="90" radius="2"/>
 </tile>
 
 <tile x="990" y="7">
@@ -6040,7 +6040,7 @@
 </tile>
 
 <tile x="991" y="2">
-<curved-track startAngle="90" finishAngle="180" radius="2"/>
+<curved-track start-angle="90" finish-angle="180" radius="2"/>
 </tile>
 
 <tile x="991" y="7">
@@ -6340,11 +6340,11 @@
 </tile>
 
 <tile x="1021" y="7">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="1023" y="4">
-<curved-track startAngle="90" finishAngle="180" radius="5"/>
+<curved-track start-angle="90" finish-angle="180" radius="5"/>
 </tile>
 </tileset>
 </map>
diff --git a/maps/points/points.xml b/maps/points/points.xml
index 4ac984d..30fbd9a 100644
--- a/maps/points/points.xml
+++ b/maps/points/points.xml
@@ -48,11 +48,11 @@
 </tile>
 
 <tile x="0" y="25">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="1" y="13">
-<curved-track startAngle="180" finishAngle="270" radius="2"/>
+<curved-track start-angle="180" finish-angle="270" radius="2"/>
 </tile>
 
 <tile x="2" y="13">
@@ -64,7 +64,7 @@
 </tile>
 
 <tile x="3" y="27">
-<curved-track startAngle="0" finishAngle="90" radius="2"/>
+<curved-track start-angle="0" finish-angle="90" radius="2"/>
 </tile>
 
 <tile x="4" y="13">
@@ -116,7 +116,7 @@
 </tile>
 
 <tile x="5" y="14">
-<curved-track startAngle="180" finishAngle="270" radius="2"/>
+<curved-track start-angle="180" finish-angle="270" radius="2"/>
 </tile>
 
 <tile x="5" y="28">
@@ -156,15 +156,15 @@
 </tile>
 
 <tile x="5" y="37">
-<curved-track startAngle="270" finishAngle="360" radius="4"/>
+<curved-track start-angle="270" finish-angle="360" radius="4"/>
 </tile>
 
 <tile x="6" y="22">
-<curved-track startAngle="270" finishAngle="360" radius="4"/>
+<curved-track start-angle="270" finish-angle="360" radius="4"/>
 </tile>
 
 <tile x="6" y="26">
-<curved-track startAngle="180" finishAngle="270" radius="2"/>
+<curved-track start-angle="180" finish-angle="270" radius="2"/>
 </tile>
 
 <tile x="7" y="26">
@@ -176,7 +176,7 @@
 </tile>
 
 <tile x="8" y="19">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="8" y="26">
@@ -192,7 +192,7 @@
 </tile>
 
 <tile x="9" y="40">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="10" y="13">
@@ -224,11 +224,11 @@
 </tile>
 
 <tile x="11" y="21">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="11" y="22">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="11" y="25">
@@ -268,7 +268,7 @@
 </tile>
 
 <tile x="12" y="27">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="13" y="25">
@@ -284,7 +284,7 @@
 </tile>
 
 <tile x="13" y="28">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="14" y="12">
@@ -452,11 +452,11 @@
 </tile>
 
 <tile x="25" y="17">
-<curved-track startAngle="90" finishAngle="180" radius="4"/>
+<curved-track start-angle="90" finish-angle="180" radius="4"/>
 </tile>
 
 <tile x="25" y="18">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="25" y="24">
@@ -492,11 +492,11 @@
 </tile>
 
 <tile x="31" y="23">
-<curved-track startAngle="90" finishAngle="180" radius="4"/>
+<curved-track start-angle="90" finish-angle="180" radius="4"/>
 </tile>
 
 <tile x="31" y="26">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="31" y="33">
@@ -564,11 +564,11 @@
 </tile>
 
 <tile x="31" y="49">
-<curved-track startAngle="270" finishAngle="360" radius="5"/>
+<curved-track start-angle="270" finish-angle="360" radius="5"/>
 </tile>
 
 <tile x="32" y="15">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="32" y="16">
@@ -656,15 +656,15 @@
 </tile>
 
 <tile x="32" y="47">
-<curved-track startAngle="270" finishAngle="360" radius="4"/>
+<curved-track start-angle="270" finish-angle="360" radius="4"/>
 </tile>
 
 <tile x="33" y="39">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="36" y="15">
-<curved-track startAngle="180" finishAngle="270" radius="4"/>
+<curved-track start-angle="180" finish-angle="270" radius="4"/>
 </tile>
 
 <tile x="36" y="41">
@@ -672,7 +672,7 @@
 </tile>
 
 <tile x="36" y="50">
-<curved-track startAngle="0" finishAngle="90" radius="5"/>
+<curved-track start-angle="0" finish-angle="90" radius="5"/>
 </tile>
 
 <tile x="36" y="53">
@@ -704,7 +704,7 @@
 </tile>
 
 <tile x="40" y="43">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="40" y="44">
@@ -716,11 +716,11 @@
 </tile>
 
 <tile x="40" y="53">
-<curved-track startAngle="0" finishAngle="90" radius="8"/>
+<curved-track start-angle="0" finish-angle="90" radius="8"/>
 </tile>
 
 <tile x="47" y="23">
-<curved-track startAngle="90" finishAngle="180" radius="9"/>
+<curved-track start-angle="90" finish-angle="180" radius="9"/>
 </tile>
 
 <tile x="47" y="24">
diff --git a/maps/sbends/sbends.xml b/maps/sbends/sbends.xml
index e101885..000c581 100644
--- a/maps/sbends/sbends.xml
+++ b/maps/sbends/sbends.xml
@@ -8,7 +8,7 @@
 
 <tileset>
 <tile x="1" y="26">
-<curved-track startAngle="270" finishAngle="360" radius="4"/>
+<curved-track start-angle="270" finish-angle="360" radius="4"/>
 </tile>
 
 <tile x="2" y="8">
@@ -52,7 +52,7 @@
 </tile>
 
 <tile x="7" y="2">
-<curved-track startAngle="180" finishAngle="270" radius="6"/>
+<curved-track start-angle="180" finish-angle="270" radius="6"/>
 </tile>
 
 <tile x="7" y="29">
@@ -104,7 +104,7 @@
 </tile>
 
 <tile x="21" y="30">
-<curved-track startAngle="0" finishAngle="90" radius="4"/>
+<curved-track start-angle="0" finish-angle="90" radius="4"/>
 </tile>
 
 <tile x="22" y="5">
@@ -120,7 +120,7 @@
 </tile>
 
 <tile x="25" y="7">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="25" y="8">
diff --git a/maps/uphill/uphill.xml b/maps/uphill/uphill.xml
index b67f6c4..f20a8aa 100644
--- a/maps/uphill/uphill.xml
+++ b/maps/uphill/uphill.xml
@@ -16,7 +16,7 @@
 </tile>
 
 <tile x="0" y="7">
-<curved-track startAngle="270" finishAngle="360" radius="5"/>
+<curved-track start-angle="270" finish-angle="360" radius="5"/>
 </tile>
 
 <tile x="1" y="1">
@@ -28,7 +28,7 @@
 </tile>
 
 <tile x="2" y="2">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="2" y="4">
@@ -156,7 +156,7 @@
 </tile>
 
 <tile x="11" y="13">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="11" y="14">
@@ -220,7 +220,7 @@
 </tile>
 
 <tile x="11" y="29">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="12" y="1">
@@ -232,7 +232,7 @@
 </tile>
 
 <tile x="12" y="10">
-<curved-track startAngle="270" finishAngle="360" radius="2"/>
+<curved-track start-angle="270" finish-angle="360" radius="2"/>
 </tile>
 
 <tile x="13" y="2">
@@ -252,7 +252,7 @@
 </tile>
 
 <tile x="14" y="7">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="14" y="11">
@@ -288,7 +288,7 @@
 </tile>
 
 <tile x="14" y="23">
-<curved-track startAngle="270" finishAngle="360" radius="2"/>
+<curved-track start-angle="270" finish-angle="360" radius="2"/>
 </tile>
 
 <tile x="14" y="26">
@@ -332,7 +332,7 @@
 </tile>
 
 <tile x="16" y="13">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="16" y="20">
@@ -468,7 +468,7 @@
 </tile>
 
 <tile x="21" y="7">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="21" y="11">
@@ -532,7 +532,7 @@
 </tile>
 
 <tile x="23" y="4">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="23" y="11">
@@ -604,7 +604,7 @@
 </tile>
 
 <tile x="25" y="11">
-<curved-track startAngle="0" finishAngle="90" radius="2"/>
+<curved-track start-angle="0" finish-angle="90" radius="2"/>
 </tile>
 
 <tile x="25" y="13">
@@ -668,11 +668,11 @@
 </tile>
 
 <tile x="26" y="31">
-<curved-track startAngle="0" finishAngle="90" radius="4"/>
+<curved-track start-angle="0" finish-angle="90" radius="4"/>
 </tile>
 
 <tile x="27" y="4">
-<curved-track startAngle="180" finishAngle="270" radius="2"/>
+<curved-track start-angle="180" finish-angle="270" radius="2"/>
 </tile>
 
 <tile x="27" y="7">
@@ -692,7 +692,7 @@
 </tile>
 
 <tile x="28" y="13">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="28" y="14">
@@ -720,7 +720,7 @@
 </tile>
 
 <tile x="29" y="26">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="29" y="27">
@@ -736,7 +736,7 @@
 </tile>
 
 <tile x="30" y="6">
-<curved-track startAngle="90" finishAngle="180" radius="3"/>
+<curved-track start-angle="90" finish-angle="180" radius="3"/>
 </tile>
 
 <tile x="30" y="7">
diff --git a/maps/villages/villages.xml b/maps/villages/villages.xml
index 70575ff..e78ab5d 100644
--- a/maps/villages/villages.xml
+++ b/maps/villages/villages.xml
@@ -144,7 +144,7 @@
 </tile>
 
 <tile x="2" y="41">
-<curved-track startAngle="270" finishAngle="360" radius="3"/>
+<curved-track start-angle="270" finish-angle="360" radius="3"/>
 </tile>
 
 <tile x="2" y="106">
@@ -156,7 +156,7 @@
 </tile>
 
 <tile x="2" y="108">
-<curved-track startAngle="270" finishAngle="360" radius="4"/>
+<curved-track start-angle="270" finish-angle="360" radius="4"/>
 </tile>
 
 <tile x="3" y="1">
@@ -192,11 +192,11 @@
 </tile>
 
 <tile x="4" y="2">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="4" y="103">
-<curved-track startAngle="180" finishAngle="270" radius="3"/>
+<curved-track start-angle="180" finish-angle="270" radius="3"/>
 </tile>
 
 <tile x="5" y="1">
@@ -204,15 +204,15 @@
 </tile>
 
 <tile x="5" y="43">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="5" y="103">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="6" y="111">
-<curved-track startAngle="0" finishAngle="90" radius="3"/>
+<curved-track start-angle="0" finish-angle="90" radius="3"/>
 </tile>
 
 <tile x="7" y="29">
@@ -236,7 +236,7 @@
 </tile>
 
 <tile x="8" y="5">
-<curved-track startAngle="90" finishAngle="180" radius="4"/>
+<curved-track start-angle="90" finish-angle="180" radius="4"/>
 </tile>
 
 <tile x="8" y="35">
@@ -532,7 +532,7 @@
 </tile>
 
 <tile x="9" y="4">
-<curved-track startAngle="90" finishAngle="180" radius="4"/>
+<curved-track start-angle="90" finish-angle="180" radius="4"/>
 </tile>
 
 <tile x="9" y="5">
diff --git a/schemas/layout.xsd b/schemas/layout.xsd
index 07beff6..34dd603 100644
--- a/schemas/layout.xsd
+++ b/schemas/layout.xsd
@@ -9,33 +9,33 @@
           <xs:complexType>
             <xs:attribute name="name" type="xs:string"/>
             <xs:attribute name="file" type="xs:string"/>
-            <xs:attribute name="dropShadow" type="xs:boolean"/>
+            <xs:attribute name="drop-shadow" type="xs:boolean"/>
             <xs:attribute name="size" type="xs:positiveInteger"/>
           </xs:complexType>
         </xs:element>
 
-        <xs:group ref="widgetGroup"
+        <xs:group ref="widget-group"
                   minOccurs="0" maxOccurs="unbounded"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   
   <!-- Widgets that may appear anywhere -->
-  <xs:group name="widgetGroup">
+  <xs:group name="widget-group">
     <xs:choice>
-      <xs:element name="window" type="windowType"/>
-      <xs:element name="button" type="buttonType"/>
+      <xs:element name="window" type="window-type"/>
+      <xs:element name="button" type="button-type"/>
       <xs:element name="label" type="labelType"/>
-      <xs:element name="throttleMeter" type="throttleMeterType"/>
-      <xs:element name="toggleBar" type="toggleBarType"/>
-      <xs:element name="canvas3d" type="canvas3dType"/>
-      <xs:element name="imageButton" type="imageButtonType"/>
-      <xs:element name="fromBottom" type="fromBottomType"/>
+      <xs:element name="throttle-meter" type="throttle-meter-type"/>
+      <xs:element name="toggle-bar" type="toggle-bar-type"/>
+      <xs:element name="canvas3d" type="canvas3d-type"/>
+      <xs:element name="image-button" type="image-button-type"/>
+      <xs:element name="from-bottom" type="from-bottom-type"/>
     </xs:choice>
   </xs:group>
 
   <!-- Attributes for all widgets -->
-  <xs:complexType name="widgetType">
+  <xs:complexType name="widget-type">
     <xs:attribute name="name" type="xs:string"/>
     <xs:attribute name="x" type="xs:integer"/>
     <xs:attribute name="y" type="xs:integer"/>
@@ -46,10 +46,10 @@
   </xs:complexType>
 
   <!-- Top-level windows -->
-  <xs:complexType name="windowType">
+  <xs:complexType name="window-type">
     <xs:complexContent>
-      <xs:extension base="widgetType">
-        <xs:group ref="widgetGroup"
+      <xs:extension base="widget-type">
+        <xs:group ref="widget-group"
                   minOccurs="0" maxOccurs="unbounded"/>
         <xs:attribute name="title" type="xs:string"/>
       </xs:extension>
@@ -57,10 +57,10 @@
   </xs:complexType>
 
   <!-- Alignment container relative to bottom of parent -->
-  <xs:complexType name="fromBottomType">
+  <xs:complexType name="from-bottom-type">
     <xs:complexContent>
-      <xs:extension base="widgetType">
-        <xs:group ref="widgetGroup"
+      <xs:extension base="widget-type">
+        <xs:group ref="widget-group"
                   minOccurs="0" maxOccurs="unbounded"/>
         <xs:attribute name="offset" type="xs:integer"/>
       </xs:extension>
@@ -70,7 +70,7 @@
   <!-- Text labels -->
   <xs:complexType name="labelType">
     <xs:complexContent>
-      <xs:extension base="widgetType">
+      <xs:extension base="widget-type">
         <xs:attribute name="text" type="xs:string"/>
         <xs:attribute name="font" type="xs:string"/>
         <xs:attribute name="colour" type="xs:string"/>
@@ -79,18 +79,18 @@
   </xs:complexType>
 
   <!-- Push buttons -->
-  <xs:complexType name="buttonType">
+  <xs:complexType name="button-type">
     <xs:complexContent>
-      <xs:extension base="widgetType">
+      <xs:extension base="widget-type">
         <xs:attribute name="label" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <!-- Toggle bars -->
-  <xs:complexType name="toggleBarType">
+  <xs:complexType name="toggle-bar-type">
     <xs:complexContent>
-      <xs:extension base="widgetType">
+      <xs:extension base="widget-type">
         <xs:group ref="toggleBarGroup"
                   minOccurs="0" maxOccurs="unbounded"/>
       </xs:extension>
@@ -100,41 +100,41 @@
   <!-- Widgets that may appear inside a toggle bar -->
   <xs:group name="toggleBarGroup">
     <xs:choice>
-      <xs:element name="toggleButton" type="toggleButtonType"/>
+      <xs:element name="toggle-button" type="toggle-button-type"/>
     </xs:choice>
   </xs:group>
 
   <!-- Buttons inside toggle bars -->
-  <xs:complexType name="toggleButtonType">
+  <xs:complexType name="toggle-button-type">
     <xs:complexContent>
-      <xs:extension base="widgetType">
+      <xs:extension base="widget-type">
         <xs:attribute name="image" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <!-- Buttons with an image instead of text -->
-  <xs:complexType name="imageButtonType">
+  <xs:complexType name="image-button-type">
     <xs:complexContent>
-      <xs:extension base="widgetType">
+      <xs:extension base="widget-type">
         <xs:attribute name="image" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <!-- The throttle meter -->
-  <xs:complexType name="throttleMeterType">
+  <xs:complexType name="throttle-meter-type">
     <xs:complexContent>
-      <xs:extension base="widgetType">
+      <xs:extension base="widget-type">
         <xs:attribute name="font" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <!-- 3D canvas -->
-  <xs:complexType name="canvas3dType">
+  <xs:complexType name="canvas3d-type">
     <xs:complexContent>
-      <xs:extension base="widgetType">
+      <xs:extension base="widget-type">
         <xs:attribute name="clear" type="xs:boolean"/>
       </xs:extension>
     </xs:complexContent>
diff --git a/schemas/map.xsd b/schemas/map.xsd
index b30de10..41795fe 100644
--- a/schemas/map.xsd
+++ b/schemas/map.xsd
@@ -71,9 +71,9 @@
 
                     <xs:element name="curved-track" minOccurs="0">
                       <xs:complexType>
-                        <xs:attribute name="startAngle" use="required"
+                        <xs:attribute name="start-angle" use="required"
                                       type="xs:nonNegativeInteger"/>
-                        <xs:attribute name="finishAngle" use="required"
+                        <xs:attribute name="finish-angle" use="required"
                                       type="xs:nonNegativeInteger"/>
                         <xs:attribute name="radius" use="required"
                                       type="xs:positiveInteger"/>
diff --git a/src/Map.cpp b/src/Map.cpp
index 6c9df00..7584772 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -1696,8 +1696,8 @@ private:
    void handle_curved_track(const AttributeSet& attrs)
    {
       int start_angle, finish_angle, radius;
-      attrs.get("start_angle", start_angle);
-      attrs.get("finish_angle", finish_angle);
+      attrs.get("start-angle", start_angle);
+      attrs.get("finish-angle", finish_angle);
       attrs.get("radius", radius);
 
       my_map->set_track_at(tile, make_curved_track(start_angle, finish_angle, radius));
diff --git a/src/Train.cpp b/src/Train.cpp
index 2e4fa93..e9d7fd3 100644
--- a/src/Train.cpp
+++ b/src/Train.cpp
@@ -253,7 +253,7 @@ void Train::enter_segment(Part& a_part, const track::Connection& a_connection)
    Point<int> pos;
    tie(pos, a_part.direction) = a_connection;
 
-#if 1
+#if 0
    debug() << "Train part entered segment at " << pos
            << " moving " << a_part.direction;
 #endif
diff --git a/src/gui/Layout.cpp b/src/gui/Layout.cpp
index fc2fa07..b2b1cd6 100644
--- a/src/gui/Layout.cpp
+++ b/src/gui/Layout.cpp
@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2009  Nick Gasson
+//  Copyright (C) 2009-2010  Nick Gasson
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -110,7 +110,7 @@ void Layout::start_element(const string& local_name,
    else if (local_name == "font") {
       const string name = attrs.get<string>("name");
       const string file = attrs.get<string>("file");     
-      const bool drop_shadow = attrs.get<bool>("drop_shadow", false);
+      const bool drop_shadow = attrs.get<bool>("drop-shadow", false);
       const int size = attrs.get<int>("size", 14);
 
       theme.add_font(name,
@@ -124,17 +124,17 @@ void Layout::start_element(const string& local_name,
       w = new Button(attrs);
    else if (local_name == "label")
       w = new Label(attrs);
-   else if (local_name == "throttle_meter")
+   else if (local_name == "throttle-meter")
       w = new ThrottleMeter(attrs);
-   else if (local_name == "toggle_bar")
+   else if (local_name == "toggle-bar")
       w = new ToggleBar(attrs);
-   else if (local_name == "toggle_button")
+   else if (local_name == "toggle-button")
       w = new ToggleButton(attrs);
    else if (local_name == "canvas3d")
       w = new Canvas3D(attrs);
-   else if (local_name == "image_button")
+   else if (local_name == "image-button")
       w = new ImageButton(attrs);
-   else if (local_name == "from_bottom")
+   else if (local_name == "from-bottom")
       w = new FromBottom(attrs);
    else
       throw runtime_error("Unexpected " + local_name);
-- 
2.39.2