New upstream version 5.2.0Beta2.1upstream/5.2.0Beta2.1

1 files changed, 52 insertions, 7 deletions

diff --git a/app/lib/demos/dmtbledg.xtr b/app/lib/demos/dmtbledg.xtr
index d2caf81..4e00dcd 100644
--- a/app/lib/demos/dmtbledg.xtr
+++ b/app/lib/demos/dmtbledg.xtr
@@ -1,20 +1,20 @@
 VERSION 7
 DEMOINIT
-ORIG 10.000 0.000 0.000
+ORIG 7.000 0.000 0.000
 PARAMETER display description-fontsize 24
-CURVE 1 0 0 0 0 DEMO -1 12.000000 14.555556 10.000000
+CURVE 1 0 0 0 0 DEMO 2 12.000000 14.555556 10.000000
 	T 4 18.000000 6.555556 53.130102
 	T 3 18.207029 22.396014 128.367485
 	END
-CURVE 2 0 0 0 0 DEMO -1 44.666667 14.333333 10.000000
+CURVE 2 0 0 0 0 DEMO 2 44.666667 14.333333 10.000000
 	T 4 38.666667 22.333333 233.130102
 	T 3 38.459637 6.492875 308.367485
 	END
-STRAIGHT 3 0 0 0 0 DEMO -1
+STRAIGHT 3 0 0 0 0 DEMO 2
 	T 1 18.207029 22.396014 308.140387
 	T 2 38.459637 6.492875 128.140387
 	END
-STRAIGHT 4 0 0 0 0 DEMO -1
+STRAIGHT 4 0 0 0 0 DEMO 2
 	T 1 18.000000 6.555556 232.640407
 	T 2 38.666667 22.333333 52.640407
 	END
@@ -36,11 +36,14 @@ MOUSE 3 36.500 2.667
 MOUSE 4 36.500 2.667
 MOUSE 2 36.500 2.667
 MOUSE 3 58.000 2.667
+STEP
 MOUSE 4 58.000 2.667
 BIGPAUSE
 MOUSE 2 0.000 26.167
 MOUSE 3 58.000 26.167
+STEP
 MOUSE 4 58.000 26.167
+MOUSE 1 58.000 26.167
 MESSAGE
 _________________________________________
 
@@ -124,8 +127,8 @@ MOUSE 3 58.167 1.667
 MOUSE 3 58.167 1.833
 MOUSE 3 58.000 1.833
 MOUSE 3 57.833 1.833
-MOUSE 3 57.667 1.833
-MOUSE 4 57.667 1.833
+MOUSE 3 57.667 2.000
+MOUSE 4 57.667 2.000
 MESSAGE
 _________________________________________
 
@@ -135,6 +138,8 @@ END
 STEP
 COMMAND Modify
 MOUSE 2 27.667 9.333
+MOUSE 4 27.667 9.333
+MOUSE 2 27.667 9.333
 MOUSE 3 28.333 8.667
 MOUSE 3 29.000 8.000
 MOUSE 3 29.167 7.667
@@ -171,12 +176,15 @@ MOUSE 3 28.333 5.667
 MOUSE 3 28.333 5.833
 MOUSE 3 28.333 6.000
 MOUSE 4 28.333 6.000
+MOUSE 8200 28.333 6.000
 MESSAGE
 _________________________________________
 
 If you hold down the Control key while dragging then the Table Edge will be attracted to other objects.
 END
 STEP
+MOUSE 2 28.167 9.333
+MOUSE 4 28.167 9.333
 KEYSTATE 4
 MOUSE 2 28.167 9.333
 KEYSTATE 4
@@ -205,9 +213,46 @@ KEYSTATE 4
 MOUSE 3 28.333 6.000
 KEYSTATE 4
 MOUSE 4 28.167 5.667
+MOUSE 8200 28.167 5.667
 STEP
 MESSAGE
 =========================================
 END
+REGRESSION START 10 - table edge
+CURVE 1 0 0 0 0 DEMO 2 12.000000 14.555556 0 10.000000 0 0.000000 0.000000
+	T4 4 18.000000 6.555556 53.130102 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 18.207029 22.396014 128.367485 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 2 0 0 0 0 DEMO 2 44.666667 14.333333 0 10.000000 0 0.000000 0.000000
+	T4 4 38.666667 22.333333 233.130102 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 38.459637 6.492875 308.367485 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 3 0 0 0 0 DEMO 2
+	T4 1 18.207029 22.396014 308.140387 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 2 38.459637 6.492875 128.140387 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 4 0 0 0 0 DEMO 2
+	T4 1 18.000000 6.555556 232.640407 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 2 38.666667 22.333333 52.640407 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+DRAW 5 0 0 0 0 0.000000 0.000000 0 0.000000
+	Q3 0 0.291667 0.000000 2.667000 0 19.833000 2.667000 0
+	END
+DRAW 6 0 0 0 0 0.000000 0.000000 0 0.000000
+	Q3 0 0.291667 19.833000 2.667000 0 28.333000 6.000000 0
+	END
+DRAW 7 0 0 0 0 0.000000 0.000000 0 0.000000
+	Q3 0 0.291667 28.333000 6.000000 0 36.500000 2.667000 0
+	END
+DRAW 8 0 0 0 0 0.000000 0.000000 0 0.000000
+	Q3 0 0.291667 36.500000 2.667000 0 58.000000 2.667000 0
+	END
+DRAW 9 0 0 0 0 0.000000 0.000000 0 0.000000
+	Q3 0 0.291667 0.000000 26.167000 0 58.000000 26.167000 0
+	END
+DRAW 10 0 0 0 0 0.000000 0.000000 0 0.000000
+	Q3 0 0.291667 58.000000 26.167000 0 58.000000 2.667000 0
+	END
+REGRESSION END
 STEP
 CLEAR