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

1 files changed, 118 insertions, 16 deletions

diff --git a/app/lib/demos/dmtrkwid.xtr b/app/lib/demos/dmtrkwid.xtr
index 20c5261..1b7ff0f 100644
--- a/app/lib/demos/dmtrkwid.xtr
+++ b/app/lib/demos/dmtrkwid.xtr
@@ -1,16 +1,16 @@
 # XTrkCad Version: 3.0.1, Date: Sat Sep 23 20:43:53 2000
 VERSION 10
 DEMOINIT
-ORIG 8.000 0.000 0.000
-STRAIGHT 1 0 0 0 0 N 2
+ORIG 6.000 0.000 0.000
+STRAIGHT 1 0 0 0 0 DEMO 2
 	T 3 42.054708 20.137016 244.163246
 	E 51.919948 24.913870 64.163246
 	END
-STRAIGHT 2 0 0 0 0 N 2
+STRAIGHT 2 0 0 0 0 DEMO 2
 	T 5 34.508258 16.482946 244.163246
 	T 3 37.189995 17.781471 64.163246
 	END
-TURNOUT  3 0 0 0 0 N 2 42.054708 20.137016 0 154.163246 "Peco-55	Medium Right	SL-E395F"
+TURNOUT  3 0 0 0 0 DEMO 2 42.054708 20.137016 0 154.163246 "Peco-55	Medium Right	SL-E395F"
 	T 1 42.054708 20.137016 64.163246
 	T 2 37.189995 17.781471 244.163246
 	T 8 36.994004 18.266545 253.849246
@@ -22,11 +22,11 @@ TURNOUT  3 0 0 0 0 N 2 42.054708 20.137016 0 154.163246 "Peco-55	Medium Right	SL
 	C 0 0.000000 23.136000 0.351000 -23.136000 0.004000 9.700000
 	S 0 0.000000 4.251000 -0.331000 5.370000 -0.522000
 	END
-STRAIGHT 4 0 0 0 0 N 2
+STRAIGHT 4 0 0 0 0 DEMO 2
 	E 0.187643 -0.135457 244.163246
 	T 13 3.966453 1.694282 64.163246
 	END
-TURNOUT  5 0 0 0 0 N 2 34.508258 16.482946 0 154.163246 "Peco-55	Medium Left	SL-E396F"
+TURNOUT  5 0 0 0 0 DEMO 2 34.508258 16.482946 0 154.163246 "Peco-55	Medium Left	SL-E396F"
 	T 2 34.508258 16.482946 64.163246
 	T 12 29.643545 14.127401 244.163246
 	T 11 29.902538 13.672833 234.477246
@@ -38,35 +38,35 @@ TURNOUT  5 0 0 0 0 N 2 34.508258 16.482946 0 154.163246 "Peco-55	Medium Left	SL-
 	C 0 0.000000 -23.136000 0.351000 23.136000 170.297000 9.700000
 	S 0 0.000000 4.251000 0.331000 5.370000 0.522000
 	END
-STRAIGHT 6 0 0 0 0 N 2
+STRAIGHT 6 0 0 0 0 DEMO 2
 	T 14 13.474033 7.686781 244.163246
 	T 7 31.510368 16.420164 64.163246
 	END
-CURVE 7 0 0 0 0 N 2 39.096711 0.752716 0 17.407514 0 0.000000 0.000000
+CURVE 7 0 0 0 0 DEMO 2 39.096711 0.752716 0 17.407514 0 0.000000 0.000000
 	T 6 31.510368 16.420164 244.163246
 	T 8 34.254539 17.473210 73.849246
 	END
-STRAIGHT 8 0 0 0 0 N 2
+STRAIGHT 8 0 0 0 0 DEMO 2
 	T 3 36.994004 18.266545 73.849246
 	T 7 34.254539 17.473210 253.849246
 	END
-STRAIGHT 9 0 0 0 0 N 2
+STRAIGHT 9 0 0 0 0 DEMO 2
 	E 10.161432 3.305128 244.163246
 	T 10 25.105135 10.541027 64.163246
 	END
-CURVE 10 0 0 0 0 N 2 17.814223 25.598343 0 16.729620 0 0.000000 0.000000
+CURVE 10 0 0 0 0 DEMO 2 17.814223 25.598343 0 16.729620 0 0.000000 0.000000
 	T 11 27.534571 11.982359 54.477246
 	T 9 25.105135 10.541027 244.163246
 	END
-STRAIGHT 11 0 0 0 0 N 2
+STRAIGHT 11 0 0 0 0 DEMO 2
 	T 5 29.902538 13.672833 54.477246
 	T 10 27.534571 11.982359 234.477246
 	END
-STRAIGHT 12 0 0 0 0 N 2
+STRAIGHT 12 0 0 0 0 DEMO 2
 	T 5 29.643545 14.127401 64.163246
 	T 13 8.831166 4.049828 244.163246
 	END
-TURNOUT  13 0 0 0 0 N 2 3.966453 1.694282 0 334.163246 "Peco-55	Medium Left	SL-E396F"
+TURNOUT  13 0 0 0 0 DEMO 2 3.966453 1.694282 0 334.163246 "Peco-55	Medium Left	SL-E396F"
 	T 4 3.966453 1.694282 244.163246
 	T 12 8.831166 4.049828 64.163246
 	T 15 8.572172 4.504395 54.477246
@@ -78,11 +78,11 @@ TURNOUT  13 0 0 0 0 N 2 3.966453 1.694282 0 334.163246 "Peco-55	Medium Left	SL-E
 	C 0 0.000000 -23.136000 0.351000 23.136000 170.297000 9.700000
 	S 0 0.000000 4.251000 0.331000 5.370000 0.522000
 	END
-CURVE 14 0 0 0 0 N 2 21.361899 -8.603379 0 18.099385 0 0.000000 0.000000
+CURVE 14 0 0 0 0 DEMO 2 21.361899 -8.603379 0 18.099385 0 0.000000 0.000000
 	T 15 10.845682 6.127436 234.477246
 	T 6 13.474033 7.686781 64.163246
 	END
-STRAIGHT 15 0 0 0 0 N 2
+STRAIGHT 15 0 0 0 0 DEMO 2
 	T 13 8.572172 4.504395 234.477246
 	T 14 10.845682 6.127436 54.477246
 	END
@@ -97,24 +97,40 @@ STEP
 COMMAND Select
 MOUSE 2 2.500 0.125
 MOUSE 4 2.500 0.125
+KEYSTATE 4
 MOUSE 2 6.000 3.000
+KEYSTATE 4
 MOUSE 4 6.000 3.000
+KEYSTATE 4
 MOUSE 2 16.750 7.625
+KEYSTATE 4
 MOUSE 4 16.750 7.625
+KEYSTATE 4
 MOUSE 3 32.500 15.500
+KEYSTATE 4
 MOUSE 2 32.500 15.500
+KEYSTATE 4
 MOUSE 4 32.500 15.500
+KEYSTATE 4
 MOUSE 2 36.125 17.750
+KEYSTATE 4
 MOUSE 3 36.250 17.750
+KEYSTATE 4
 MOUSE 4 36.375 17.625
+KEYSTATE 4
 MOUSE 2 39.500 19.125
+KEYSTATE 4
 MOUSE 4 39.500 19.125
+KEYSTATE 4
 MOUSE 2 47.000 22.750
+KEYSTATE 4
 MOUSE 4 47.000 22.750
 MESSAGE
 _________________________________________
 
 And then select Medium Tracks from the Edit menu.
+
+We can't show the Edit menu, but we can show the effect.
 END
 STEP
 PARAMETER misc cmdWidth2
@@ -133,4 +149,90 @@ MESSAGE
 =========================================
 END
 STEP
+REGRESSION START 10 - track width
+STRAIGHT 1 0 3 0 0 DEMO 2
+	T4 3 42.054708 20.137016 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 51.919948 24.913870 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 2 0 3 0 0 DEMO 2
+	T4 5 34.508258 16.482946 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 37.189995 17.781471 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  3 0 3 0 0 DEMO 2 42.054708 20.137016 0 154.163246 "Peco-55	Medium Right	SL-E395F"
+	T4 1 42.054708 20.137016 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 2 37.189995 17.781471 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 8 36.994004 18.266545 253.849246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	S 0 0.000000 0.000000 0.000000 0.353000 0.000000
+	S 0 0.000000 0.353000 0.000000 5.405000 0.000000
+	C 0 0.000000 23.136000 0.351000 -23.136000 0.004000 9.700000
+	S 0 0.000000 4.251000 -0.331000 5.370000 -0.522000
+	END
+STRAIGHT 4 0 3 0 0 DEMO 2
+	E4 0.187643 -0.135457 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 13 3.966453 1.694282 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  5 0 3 0 0 DEMO 2 34.508258 16.482946 0 154.163246 "Peco-55	Medium Left	SL-E396F"
+	T4 2 34.508258 16.482946 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 12 29.643545 14.127401 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 11 29.902538 13.672833 234.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	S 0 0.000000 0.000000 0.000000 0.353000 0.000000
+	S 0 0.000000 0.353000 0.000000 5.405000 0.000000
+	C 0 0.000000 -23.136000 0.351000 23.136000 170.297000 9.700000
+	S 0 0.000000 4.251000 0.331000 5.370000 0.522000
+	END
+STRAIGHT 6 0 0 0 0 DEMO 2
+	T4 14 13.474033 7.686781 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 7 31.510368 16.420164 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 7 0 0 0 0 DEMO 2 39.096711 0.752716 0 17.407514 0 0.000000 0.000000
+	T4 6 31.510368 16.420164 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 8 34.254539 17.473210 73.849246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 8 0 0 0 0 DEMO 2
+	T4 3 36.994004 18.266545 73.849246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 7 34.254539 17.473210 253.849246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 9 0 0 0 0 DEMO 2
+	E4 10.161432 3.305128 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 10 25.105135 10.541027 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 10 0 0 0 0 DEMO 2 17.814223 25.598343 0 16.729620 0 0.000000 0.000000
+	T4 11 27.534571 11.982359 54.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 9 25.105135 10.541027 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 11 0 0 0 0 DEMO 2
+	T4 5 29.902538 13.672833 54.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 10 27.534571 11.982359 234.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 12 0 3 0 0 DEMO 2
+	T4 5 29.643545 14.127401 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 13 8.831166 4.049828 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  13 0 3 0 0 DEMO 2 3.966453 1.694282 0 334.163246 "Peco-55	Medium Left	SL-E396F"
+	T4 4 3.966453 1.694282 244.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 12 8.831166 4.049828 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 15 8.572172 4.504395 54.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	S 0 0.000000 0.000000 0.000000 0.353000 0.000000
+	S 0 0.000000 0.353000 0.000000 5.405000 0.000000
+	C 0 0.000000 -23.136000 0.351000 23.136000 170.297000 9.700000
+	S 0 0.000000 4.251000 0.331000 5.370000 0.522000
+	END
+CURVE 14 0 0 0 0 DEMO 2 21.361899 -8.603379 0 18.099385 0 0.000000 0.000000
+	T4 15 10.845682 6.127436 234.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 6 13.474033 7.686781 64.163246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 15 0 0 0 0 DEMO 2
+	T4 13 8.572172 4.504395 234.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 14 10.845682 6.127436 54.477246 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+REGRESSION END
 CLEAR