From b623f5953691b2a0614e6f1f4def86bdbb9a4113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sat, 8 Aug 2020 11:53:00 +0200
Subject: New upstream version 5.2.0Beta2.1

---
 app/lib/demos/dmjcir.xtr | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

(limited to 'app/lib/demos/dmjcir.xtr')

diff --git a/app/lib/demos/dmjcir.xtr b/app/lib/demos/dmjcir.xtr
index 9647e39..a8735f0 100644
--- a/app/lib/demos/dmjcir.xtr
+++ b/app/lib/demos/dmjcir.xtr
@@ -1,6 +1,6 @@
 VERSION 2
 DEMOINIT
-ORIG 8.000 0.000 0.000
+ORIG 6.000 0.000 0.000
 CURVE 1 DEMO 1 12.633333 7.966667 6.000000
 	E 12.633333 13.966667 270.000000
 	E 12.633333 13.966667 90.000000
@@ -17,7 +17,7 @@ You can also join to and from circles.  This will change the circles to curves.
 In this example we will join two circles.
 END
 STEP
-COMMAND Join
+COMMAND JoinTrack
 MOUSE 2 14.083 14.083
 MOUSE 4 14.083 14.083
 MOUSE 2 28.250 12.833
@@ -133,6 +133,20 @@ MOUSE 4 34.250 13.500
 MESSAGE
 =========================================
 END
+REGRESSION START 10 - circle 1
+CURVE 1 0 0 0 0 DEMO 2 12.633333 7.966667 0 6.000000 0 0.000000 0.000000
+	E4 18.237313 10.110358 -20.933362 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 10.489642 13.570647 69.066638 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 2 0 0 0 0 DEMO 2 32.133333 7.966667 0 6.000000 0 0.000000 0.000000
+	T4 3 34.277024 13.570647 290.933362 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 26.529353 10.110358 380.933362 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 3 0 0 0 0 DEMO 2 22.383333 -17.521516 0 33.289375 0 0.000000 0.000000
+	T4 1 10.489642 13.570647 249.066638 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 2 34.277024 13.570647 110.933362 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+REGRESSION END
 STEP
 CLEAR
 MESSAGE
@@ -140,7 +154,7 @@ Now let's try a cross connection.
 END
 STEP
 PARAMETER misc cmdUndo
-COMMAND Join
+COMMAND JoinTrack
 MOUSE 2 15.500 13.333
 MOUSE 4 15.500 13.333
 MOUSE 2 27.667 4.167
@@ -236,5 +250,19 @@ Note that the connection is from different 'ends' of the circle than in the last
 =========================================
 END
 STEP
+REGRESSION START 10 - circle 2
+CURVE 1 0 0 0 0 DEMO 2 12.633333 7.966667 0 6.000000 0 0.000000 0.000000
+	E4 18.312924 6.032179 18.809012 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 14.567821 13.646258 108.809012 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 2 0 0 0 0 DEMO 2 32.133333 7.966667 0 6.000000 0 0.000000 0.000000
+	E4 28.539473 12.771266 233.203358 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 27.328734 4.372807 323.203358 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 4 0 0 0 0 DEMO 2 5.966820 -11.605994 0 26.676833 0 0.000000 0.000000
+	T4 1 14.567821 13.646258 288.809012 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 2 27.328734 4.372807 143.203358 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+REGRESSION END
 RESET
 CLEAR
-- 
cgit v1.2.3