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

1 files changed, 47 insertions, 5 deletions

diff --git a/app/lib/demos/dmexcept.xtr b/app/lib/demos/dmexcept.xtr
index a507771..ae1c8aa 100644
--- a/app/lib/demos/dmexcept.xtr
+++ b/app/lib/demos/dmexcept.xtr
@@ -6,23 +6,23 @@ ORIG 4.000 0.000 0.000
 PARAMETER display description-fontsize 64
 PARAMETER layout mintrackradius 9.000000
 PARAMETER layout maxtrackgrade 5.000000
-CURVE 1 0 128 0 0 N 2 9.328210 12.681510 0 9.000000 0 -0.662481 0.508964
+CURVE 1 0 128 0 0 DEMO 2 9.328210 12.681510 0 9.000000 0 -0.662481 0.508964
 	T 3 10.311823 3.735421 83.725592
 	E 0.736918 15.362872 17.333261
 	END
-STRAIGHT 2 0 0 0 0 N 2
+STRAIGHT 2 0 0 0 0 DEMO 2
 	T 3 18.591303 5.367316 253.974133
 	E 23.914162 6.896222 73.974133
 	END
-CURVE 3 0 0 0 0 N 2 4.886341 53.080886 0 49.642831 0 0.000000 0.000000
+CURVE 3 0 0 0 0 DEMO 2 4.886341 53.080886 0 49.642831 0 0.000000 0.000000
 	T 2 18.591303 5.367316 73.974133
 	T 1 10.311823 3.735421 263.725592
 	END
-STRAIGHT 4 0 0 0 0 N 2
+STRAIGHT 4 0 0 0 0 DEMO 2
 	E 4.698097 0.130693 253.974133 9 -0.010597 0.869307 1.000000
 	T 5 14.456557 2.933654 73.974133 11 0.855943 -1.308654
 	END
-STRAIGHT 5 0 0 0 0 N 2
+STRAIGHT 5 0 0 0 0 DEMO 2
 	E 23.748581 5.602640 73.974133 9 -1.123581 -1.415140 1.750000
 	T 4 14.456557 2.933654 253.974133 11 0.855943 -1.308654
 	END
@@ -86,4 +86,46 @@ MESSAGE
 =========================================
 END
 STEP
+REGRESSION START 10 - exception tracks
+CURVE 1 0 128 0 0 DEMO 2 9.437500 11.687500 0 8.000000 0 -0.662481 0.508964
+	T4 3 10.311823 3.735421 83.725592 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 1.800796 14.070933 17.333261 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 2 0 0 0 0 DEMO 2
+	T4 3 18.591303 5.367316 253.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 23.914162 6.896222 73.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 3 0 0 0 0 DEMO 2 4.886341 53.080886 0 49.642831 0 0.000000 0.000000
+	T4 2 18.591303 5.367316 73.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 1 10.311823 3.735421 263.725592 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 4 0 0 0 0 DEMO 2
+	E4 4.698097 0.130693 253.974133 9 -0.010597 0.869307 1.000000 1.000000 1 1 0 1.320151 
+	T4 5 14.456557 2.933654 73.974133 11 0.855943 -1.308654 0.0 0.0 1 3 0 1.320151 
+	END
+STRAIGHT 5 0 0 0 0 DEMO 2
+	E4 23.748581 5.602640 73.974130 9 -1.123581 -1.415140 2.250000 2.250000 1 1 0 1.945151 
+	T4 4 14.456557 2.933654 253.974133 11 0.855943 -1.308654 0.0 0.0 1 3 0 1.945151 
+	END
+CURVE 1 0 128 0 0 DEMO 2 9.437500 11.687500 0 8.000000 0 -0.662481 0.508964
+	T4 3 10.311823 3.735421 83.725592 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 1.800796 14.070933 17.333261 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 2 0 0 0 0 DEMO 2
+	T4 3 18.591303 5.367316 253.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 23.914162 6.896222 73.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 3 0 0 0 0 DEMO 2 4.886341 53.080886 0 49.642831 0 0.000000 0.000000
+	T4 2 18.591303 5.367316 73.974133 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 1 10.311823 3.735421 263.725592 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 4 0 0 0 0 DEMO 2
+	E4 4.698097 0.130693 253.974133 9 -0.010597 0.869307 1.000000 1.000000 1 1 0 1.320151 
+	T4 5 14.456557 2.933654 73.974133 11 0.855943 -1.308654 0.0 0.0 1 3 0 1.320151 
+	END
+STRAIGHT 5 0 0 0 0 DEMO 2
+	E4 23.748581 5.602640 73.974130 9 -1.123581 -1.415140 2.250000 2.250000 1 1 0 1.945151 
+	T4 4 14.456557 2.933654 253.974133 11 0.855943 -1.308654 0.0 0.0 1 3 0 1.945151 
+	END
+REGRESSION END
 CLEAR