Merge branch 'release/debian/1%5.2.0Beta2.1-1' into masterdebian/1%5.2.0Beta2.1-1

1 files changed, 215 insertions, 21 deletions

diff --git a/app/lib/demos/dmconn2.xtr b/app/lib/demos/dmconn2.xtr
index d233edc..720c677 100644
--- a/app/lib/demos/dmconn2.xtr
+++ b/app/lib/demos/dmconn2.xtr
@@ -2,7 +2,7 @@ VERSION 7
 DEMOINIT
 ORIG 8.000 5.000 0.000
 PARAMETER display description-fontsize 24
-TURNOUT  1 0 0 0 0 N -1 17.157895 20.894737 0.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  1 0 0 0 0 N 2 17.157895 20.894737 0.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 2 17.157895 20.894737 270.000000
 	T 8 24.061930 18.034992 135.000000
 	D 0.000000 0.000000
@@ -11,7 +11,7 @@ TURNOUT  1 0 0 0 0 N -1 17.157895 20.894737 0.000000 "Kato Unitrack	Curve 9.75R
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  2 0 0 0 0 N -1 10.253860 18.034992 315.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  2 0 0 0 0 N 2 10.253860 18.034992 315.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 3 10.253860 18.034992 225.000000
 	T 1 17.157895 20.894737 90.000000
 	D 0.000000 0.000000
@@ -20,7 +20,7 @@ TURNOUT  2 0 0 0 0 N -1 10.253860 18.034992 315.000000 "Kato Unitrack	Curve 9.75
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  3 0 0 0 0 N -1 7.394115 11.130957 270.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  3 0 0 0 0 N 2 7.394115 11.130957 270.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 4 7.394115 11.130957 180.000000
 	T 2 10.253860 18.034992 45.000000
 	D 0.000000 0.000000
@@ -29,7 +29,7 @@ TURNOUT  3 0 0 0 0 N -1 7.394115 11.130957 270.000000 "Kato Unitrack	Curve 9.75R
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  4 0 0 0 0 N -1 10.253860 4.226922 225.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  4 0 0 0 0 N 2 10.253860 4.226922 225.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 5 10.253860 4.226922 135.000000
 	T 3 7.394115 11.130957 0.000000
 	D 0.000000 0.000000
@@ -38,7 +38,7 @@ TURNOUT  4 0 0 0 0 N -1 10.253860 4.226922 225.000000 "Kato Unitrack	Curve 9.75R
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  5 0 0 0 0 N -1 17.157895 1.367177 180.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  5 0 0 0 0 N 2 17.157895 1.367177 180.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 6 17.157895 1.367177 90.000000
 	T 4 10.253860 4.226922 315.000000
 	D 0.000000 0.000000
@@ -47,7 +47,7 @@ TURNOUT  5 0 0 0 0 N -1 17.157895 1.367177 180.000000 "Kato Unitrack	Curve 9.75R
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  6 0 0 0 0 N -1 24.061930 4.226922 135.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  6 0 0 0 0 N 2 24.061930 4.226922 135.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 7 24.061930 4.226922 45.000000
 	T 5 17.157895 1.367177 270.000000
 	D 0.000000 0.000000
@@ -56,7 +56,7 @@ TURNOUT  6 0 0 0 0 N -1 24.061930 4.226922 135.000000 "Kato Unitrack	Curve 9.75R
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  7 0 0 0 0 N -1 29.239955 9.404947 135.000000 "Kato Unitrack	Straight 7 5/16 186mm	20-010"
+TURNOUT  7 0 0 0 0 N 2 29.239955 9.404947 135.000000 "Kato Unitrack	Straight 7 5/16 186mm	20-010"
 	T 10 29.239955 9.404947 45.000000
 	T 6 24.061930 4.226922 225.000000
 	D 0.000000 0.000000
@@ -65,7 +65,7 @@ TURNOUT  7 0 0 0 0 N -1 29.239955 9.404947 135.000000 "Kato Unitrack	Straight 7
 	L 11579568 0.053333 0.000000 0.473340 7.322834 0.473340
 	L 11579568 0.053333 0.000000 -0.473340 7.322834 -0.473340
 	END
-TURNOUT  8 0 0 0 0 N -1 29.239955 12.856966 225.000000 "Kato Unitrack	Straight 7 5/16 186mm	20-010"
+TURNOUT  8 0 0 0 0 N 2 29.239955 12.856966 225.000000 "Kato Unitrack	Straight 7 5/16 186mm	20-010"
 	T 9 29.239955 12.856966 135.000000
 	T 1 24.061930 18.034992 315.000000
 	D 0.000000 0.000000
@@ -74,7 +74,7 @@ TURNOUT  8 0 0 0 0 N -1 29.239955 12.856966 225.000000 "Kato Unitrack	Straight 7
 	L 11579568 0.053333 0.000000 0.473340 7.322834 0.473340
 	L 11579568 0.053333 0.000000 -0.473340 7.322834 -0.473340
 	END
-TURNOUT  9 0 0 0 0 N -1 31.026851 11.070071 225.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
+TURNOUT  9 0 0 0 0 N 2 31.026851 11.070071 225.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
 	T 12 31.026851 11.070071 135.000000
 	T 8 29.239955 12.856966 315.000000
 	D 0.000000 0.000000
@@ -83,7 +83,7 @@ TURNOUT  9 0 0 0 0 N -1 31.026851 11.070071 225.000000 "Kato Unitrack	Straight 2
 	L 11579568 0.053333 0.000000 0.473340 2.527052 0.473340
 	L 11579568 0.053333 0.000000 -0.473340 2.527052 -0.473340
 	END
-TURNOUT  10 0 0 0 0 N -1 31.026851 11.191843 135.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
+TURNOUT  10 0 0 0 0 N 2 31.026851 11.191843 135.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
 	T 11 31.026851 11.191843 45.000000
 	T 7 29.239955 9.404947 225.000000
 	D 0.000000 0.000000
@@ -92,7 +92,7 @@ TURNOUT  10 0 0 0 0 N -1 31.026851 11.191843 135.000000 "Kato Unitrack	Straight
 	L 11579568 0.053333 0.000000 0.473340 2.527052 0.473340
 	L 11579568 0.053333 0.000000 -0.473340 2.527052 -0.473340
 	END
-TURNOUT  11 0 0 0 0 N -1 32.813746 12.978739 135.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
+TURNOUT  11 0 0 0 0 N 2 32.813746 12.978739 135.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
 	E 32.813746 12.978739 45.000000
 	T 10 31.026851 11.191843 225.000000
 	D 0.000000 0.000000
@@ -101,7 +101,7 @@ TURNOUT  11 0 0 0 0 N -1 32.813746 12.978739 135.000000 "Kato Unitrack	Straight
 	L 11579568 0.053333 0.000000 0.473340 2.527052 0.473340
 	L 11579568 0.053333 0.000000 -0.473340 2.527052 -0.473340
 	END
-TURNOUT  12 0 0 0 0 N -1 32.813747 9.283175 225.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
+TURNOUT  12 0 0 0 0 N 2 32.813747 9.283175 225.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
 	T 13 32.813747 9.283175 135.000000
 	T 9 31.026851 11.070071 315.000000
 	D 0.000000 0.000000
@@ -110,7 +110,7 @@ TURNOUT  12 0 0 0 0 N -1 32.813747 9.283175 225.000000 "Kato Unitrack	Straight 2
 	L 11579568 0.053333 0.000000 0.473340 2.527052 0.473340
 	L 11579568 0.053333 0.000000 -0.473340 2.527052 -0.473340
 	END
-TURNOUT  13 0 0 0 0 N -1 32.813747 9.283175 45.000000 "Kato Unitrack	Turnout	6-R	20-203"
+TURNOUT  13 0 0 0 0 N 2 32.813747 9.283175 45.000000 "Kato Unitrack	Turnout	6-R	20-203"
 	T 12 32.813747 9.283175 315.000000
 	T 15 37.991772 4.105149 135.000000
 	T 14 37.310072 3.423450 150.000000
@@ -122,7 +122,7 @@ TURNOUT  13 0 0 0 0 N -1 32.813747 9.283175 45.000000 "Kato Unitrack	Turnout	6-R
 	L 11579568 0.053333 0.000000 0.473340 7.322834 0.473340
 	A 11579568 0.053333 27.794666 0.003000 -28.268000 359.993000 15.014000
 	END
-TURNOUT  14 0 0 0 0 N -1 37.310072 3.423450 60.000000 "Kato Unitrack	S60L {incl w/4}	"
+TURNOUT  14 0 0 0 0 N 2 37.310072 3.423450 60.000000 "Kato Unitrack	S60L {incl w/4}	"
 	T 13 37.310072 3.423450 330.000000
 	E 38.491174 1.377721 150.000000
 	D 0.000000 0.000000
@@ -131,7 +131,7 @@ TURNOUT  14 0 0 0 0 N -1 37.310072 3.423450 60.000000 "Kato Unitrack	S60L {incl
 	L 11579568 0.053333 0.000000 0.473340 2.362204 0.473340
 	L 11579568 0.053333 0.000000 -0.473340 2.362204 -0.473340
 	END
-TURNOUT  15 0 0 0 0 N -1 44.895807 1.245404 180.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  15 0 0 0 0 N 2 44.895807 1.245404 180.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 16 44.895807 1.245404 90.000000
 	T 13 37.991772 4.105149 315.000000
 	D 0.000000 0.000000
@@ -140,7 +140,7 @@ TURNOUT  15 0 0 0 0 N -1 44.895807 1.245404 180.000000 "Kato Unitrack	Curve 9.75
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  16 0 0 0 0 N -1 51.799842 4.105149 135.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  16 0 0 0 0 N 2 51.799842 4.105149 135.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 17 51.799842 4.105149 45.000000
 	T 15 44.895807 1.245404 270.000000
 	D 0.000000 0.000000
@@ -149,7 +149,7 @@ TURNOUT  16 0 0 0 0 N -1 51.799842 4.105149 135.000000 "Kato Unitrack	Curve 9.75
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  17 0 0 0 0 N -1 54.659587 11.009184 90.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  17 0 0 0 0 N 2 54.659587 11.009184 90.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 18 54.659587 11.009184 0.000000
 	T 16 51.799842 4.105149 225.000000
 	D 0.000000 0.000000
@@ -158,7 +158,7 @@ TURNOUT  17 0 0 0 0 N -1 54.659587 11.009184 90.000000 "Kato Unitrack	Curve 9.75
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  18 0 0 0 0 N -1 51.799842 17.913219 45.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  18 0 0 0 0 N 2 51.799842 17.913219 45.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 19 51.799842 17.913219 315.000000
 	T 17 54.659587 11.009184 180.000000
 	D 0.000000 0.000000
@@ -167,7 +167,7 @@ TURNOUT  18 0 0 0 0 N -1 51.799842 17.913219 45.000000 "Kato Unitrack	Curve 9.75
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  19 0 0 0 0 N -1 44.895807 20.772964 0.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  19 0 0 0 0 N 2 44.895807 20.772964 0.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 20 44.895807 20.772964 270.000000
 	T 18 51.799842 17.913219 135.000000
 	D 0.000000 0.000000
@@ -176,7 +176,7 @@ TURNOUT  19 0 0 0 0 N -1 44.895807 20.772964 0.000000 "Kato Unitrack	Curve 9.75R
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  20 0 0 0 0 N -1 37.991772 17.913220 315.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
+TURNOUT  20 0 0 0 0 N 2 37.991772 17.913220 315.000000 "Kato Unitrack	Curve 9.75R 249mm 45°	20-100"
 	T 21 37.991772 17.913220 225.000000
 	T 19 44.895807 20.772964 90.000000
 	D 0.000000 0.000000
@@ -185,7 +185,7 @@ TURNOUT  20 0 0 0 0 N -1 37.991772 17.913220 315.000000 "Kato Unitrack	Curve 9.7
 	A 11579568 0.053333 9.290666 0.000000 -9.764000 0.000000 45.000000
 	A 11579568 0.053333 10.237334 0.000000 -9.764000 0.000000 45.000000
 	END
-TURNOUT  21 0 0 0 0 N -1 32.813747 12.735194 315.000000 "Kato Unitrack	Straight 7 5/16 186mm	20-010"
+TURNOUT  21 0 0 0 0 N 2 32.813747 12.735194 315.000000 "Kato Unitrack	Straight 7 5/16 186mm	20-010"
 	E 32.813747 12.735194 225.000000
 	T 20 37.991772 17.913220 45.000000
 	D 0.000000 0.000000
@@ -238,5 +238,199 @@ ORIG 2 4.0 9.0
 MESSAGE
 =========================================
 END
+REGRESSION START 10 - figure 8 connect
+TURNOUT  1 0 0 0 0 N 2 17.157895 20.894737 0 0.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 2 17.157895 20.894737 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 8 24.061930 18.034992 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  2 0 0 0 0 N 2 10.253484 18.030856 0 315.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 3 10.253484 18.030856 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 1 17.157519 20.890601 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  3 0 0 0 0 N 2 7.395159 11.119313 0 270.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 4 7.395159 11.119313 180.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 2 10.254904 18.023348 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  4 0 0 0 0 N 2 10.252098 4.145742 0 225.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 5 10.252098 4.145742 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 7.392353 11.049777 0.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  5 0 0 0 0 N 2 17.154956 1.248960 0 180.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 6 17.154956 1.248960 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 10.250921 4.108705 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  6 0 0 0 0 N 2 24.058991 4.108705 0 135.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 7 24.058991 4.108705 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 5 17.154956 1.248960 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  7 0 0 0 0 N 2 29.237016 9.286730 0 135.000000 "Kato Unitrack	Straight 7 5/16 186mm	20-010"
+	T4 10 29.237016 9.286730 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 6 24.058991 4.108705 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	S 0 0.000000 0.000000 0.000000 7.322834 0.000000
+	L3 11579568 0.053333 0.000000 0.473340 0 7.322834 0.473340 0
+	L3 11579568 0.053333 0.000000 -0.473340 0 7.322834 -0.473340 0
+	END
+TURNOUT  8 0 0 0 0 N 2 29.239955 12.856966 0 225.000000 "Kato Unitrack	Straight 7 5/16 186mm	20-010"
+	T4 9 29.239955 12.856966 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 1 24.061930 18.034992 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	S 0 0.000000 0.000000 0.000000 7.322834 0.000000
+	L3 11579568 0.053333 0.000000 0.473340 0 7.322834 0.473340 0
+	L3 11579568 0.053333 0.000000 -0.473340 0 7.322834 -0.473340 0
+	END
+TURNOUT  9 0 0 0 0 N 2 31.026851 11.070071 0 225.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
+	T4 12 31.026851 11.070071 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 8 29.239955 12.856966 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	S 0 0.000000 0.000000 0.000000 2.527052 0.000000
+	L3 11579568 0.053333 0.000000 0.473340 0 2.527052 0.473340 0
+	L3 11579568 0.053333 0.000000 -0.473340 0 2.527052 -0.473340 0
+	END
+TURNOUT  10 0 0 0 0 N 2 31.023912 11.073626 0 135.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
+	T4 11 31.023912 11.073626 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 7 29.237016 9.286730 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	S 0 0.000000 0.000000 0.000000 2.527052 0.000000
+	L3 11579568 0.053333 0.000000 0.473340 0 2.527052 0.473340 0
+	L3 11579568 0.053333 0.000000 -0.473340 0 2.527052 -0.473340 0
+	END
+TURNOUT  11 0 0 0 0 N 2 32.810807 12.860522 0 135.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
+	T4 21 32.810807 12.860522 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 10 31.023912 11.073626 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	S 0 0.000000 0.000000 0.000000 2.527052 0.000000
+	L3 11579568 0.053333 0.000000 0.473340 0 2.527052 0.473340 0
+	L3 11579568 0.053333 0.000000 -0.473340 0 2.527052 -0.473340 0
+	END
+TURNOUT  12 0 0 0 0 N 2 32.813747 9.283175 0 225.000000 "Kato Unitrack	Straight 2 1/2 64mm	20-030"
+	T4 13 32.813747 9.283175 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 9 31.026851 11.070071 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	S 0 0.000000 0.000000 0.000000 2.527052 0.000000
+	L3 11579568 0.053333 0.000000 0.473340 0 2.527052 0.473340 0
+	L3 11579568 0.053333 0.000000 -0.473340 0 2.527052 -0.473340 0
+	END
+TURNOUT  13 0 0 0 0 N 2 32.813747 9.283175 0 45.000000 "Kato Unitrack	Turnout	6-R	20-203"
+	T4 12 32.813747 9.283175 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 15 37.991772 4.105149 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 14 37.310072 3.423450 150.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	P "Reverse" 2
+	S 0 0.000000 0.000000 0.000000 7.322834 0.000000
+	C 0 0.000000 28.268000 0.003000 -28.268000 359.993000 15.014000
+	L3 11579568 0.053333 0.000000 0.473340 0 7.322834 0.473340 0
+	A3 11579568 0.053333 27.794666 0.003000 -28.268000 0 359.993000 15.014000
+	END
+TURNOUT  14 0 0 0 0 N 2 37.310072 3.423450 0 60.000000 "Kato Unitrack	S60L {incl w/4}	"
+	T4 13 37.310072 3.423450 330.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 38.491174 1.377721 150.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	S 0 0.000000 0.000000 0.000000 2.362204 0.000000
+	L3 11579568 0.053333 0.000000 0.473340 0 2.362204 0.473340 0
+	L3 11579568 0.053333 0.000000 -0.473340 0 2.362204 -0.473340 0
+	END
+TURNOUT  15 0 0 0 0 N 2 44.895807 1.245404 0 180.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 16 44.895807 1.245404 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 13 37.991772 4.105149 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  16 0 0 0 0 N 2 51.802848 4.122625 0 135.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 17 51.802848 4.122625 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 15 44.898813 1.262880 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  17 0 0 0 0 N 2 54.661844 11.035350 0 90.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 18 54.661844 11.035350 0.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 16 51.802099 4.131315 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  18 0 0 0 0 N 2 51.804905 18.008920 0 45.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 19 51.804905 18.008920 315.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 17 54.664650 11.104885 180.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  19 0 0 0 0 N 2 44.892867 20.886695 0 0.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 20 44.892867 20.886695 270.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 18 51.796902 18.026950 135.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  20 0 0 0 0 N 2 37.988832 18.026951 0 315.000000 "Kato Unitrack	Curve 9.75R 249mm 45?	20-100"
+	T4 21 37.988832 18.026951 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 19 44.892867 20.886695 90.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	C 0 0.000000 9.764000 0.000000 -9.764000 0.000000 45.000000
+	A3 11579568 0.053333 9.290666 0.000000 -9.764000 0 0.000000 45.000000
+	A3 11579568 0.053333 10.237334 0.000000 -9.764000 0 0.000000 45.000000
+	END
+TURNOUT  21 0 0 0 0 N 2 32.810807 12.848925 0 315.000000 "Kato Unitrack	Straight 7 5/16 186mm	20-010"
+	T4 11 32.810807 12.848925 225.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 20 37.988832 18.026951 45.000000 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	S 0 0.000000 0.000000 0.000000 7.322834 0.000000
+	L3 11579568 0.053333 0.000000 0.473340 0 7.322834 0.473340 0
+	L3 11579568 0.053333 0.000000 -0.473340 0 7.322834 -0.473340 0
+	END
+REGRESSION END
 STEP
 CLEAR