Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6559)
+++ trunk/data/defaultpresets.xml	(revision 6562)
@@ -183,4 +183,17 @@
         <text key="width" text="Width (meters)" />
     </chunk>
+    <chunk id="railway_service">
+        <combo key="service" text="Service type" values="yard,siding,spur" />
+    </chunk>
+    <chunk id="railway_electrified">
+        <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
+        <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
+        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+    </chunk>
+    <chunk id="railway_service_gauge_electrified">
+        <reference ref="railway_service" />
+        <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
+        <reference ref="railway_electrified" />
+    </chunk>
     <chunk id="barrier_5">
         <optional text="Allowed traffic:">
@@ -1909,9 +1922,5 @@
             <optional>
                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
-                <combo key="service" text="Service type" values="yard,siding,spur" />
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
-                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
-                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+                <reference ref="railway_service_gauge_electrified" />
             </optional>
         </item>
@@ -1922,9 +1931,5 @@
             <optional>
                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
-                <combo key="service" text="Service type" values="yard,siding,spur" />
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
-                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
-                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+                <reference ref="railway_service_gauge_electrified" />
             </optional>
         </item>
@@ -1937,8 +1942,6 @@
             <key key="railway" value="monorail" />
             <optional>
-                <combo key="service" text="Service type" values="yard,siding,spur" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
-                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
-                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+                <reference ref="railway_service" />
+                <reference ref="railway_electrified" />
             </optional>
         </item>
@@ -1948,9 +1951,5 @@
             <key key="railway" value="preserved" />
             <optional>
-                <combo key="service" text="Service type" values="yard,siding,spur" />
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
-                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
-                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+                <reference ref="railway_service_gauge_electrified" />
             </optional>
         </item>
@@ -1960,9 +1959,5 @@
             <key key="railway" value="light_rail" />
             <optional>
-                <combo key="service" text="Service type" values="yard,siding,spur" />
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
-                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
-                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+                <reference ref="railway_service_gauge_electrified" />
             </optional>
         </item>
@@ -1975,9 +1970,5 @@
             <key key="railway" value="subway" />
             <optional>
-                <combo key="service" text="Service type" values="yard,siding,spur" />
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
-                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
-                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+                <reference ref="railway_service_gauge_electrified" />
             </optional>
         </item>
@@ -1992,9 +1983,5 @@
             <key key="railway" value="tram" />
             <optional>
-                <combo key="service" text="Service type" values="yard,siding,spur" />
-                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
-                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
-                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
-                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+                <reference ref="railway_service_gauge_electrified" />
             </optional>
         </item>
@@ -2021,5 +2008,5 @@
             <key key="railway" value="disused" />
             <optional>
-                <combo key="service" text="Service type" values="yard,siding,spur" />
+                <reference ref="railway_service" />
             </optional>
         </item>
@@ -2030,5 +2017,5 @@
             <key key="railway" value="abandoned" />
             <optional>
-                <combo key="service" text="Service type" values="yard,siding,spur" />
+                <reference ref="railway_service" />
             </optional>
         </item>