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/dmhelix.xtr | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

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

diff --git a/app/lib/demos/dmhelix.xtr b/app/lib/demos/dmhelix.xtr
index 1a54c48..f02c1d6 100644
--- a/app/lib/demos/dmhelix.xtr
+++ b/app/lib/demos/dmhelix.xtr
@@ -3,11 +3,11 @@ DEMOINIT
 ORIG 10.000 0.000 0.000
 PARAMETER display labelscale 10
 PARAMETER display description-fontsize 144
-STRAIGHT 1 0 0 0 0 N -1
+STRAIGHT 1 0 0 0 0 DEMO 2
 	E 23.086096 1.459535 254.675892
 	E 72.500000 15.000000 74.675892
 	END
-STRAIGHT 2 0 0 0 0 N -1
+STRAIGHT 2 0 0 0 0 DEMO 2
 	E 1.770859 28.642902 189.520022
 	E 5.625000 51.625000 9.520022
 	END
@@ -104,6 +104,10 @@ MOUSE 3 15.375 20.500
 MOUSE 3 16.000 16.000
 STEP
 MOUSE 4 16.000 16.000
+PARAMETER display labelenable 1
+COMMAND MoveLabel
+MOUSE 2 16.000 16.000
+MOUSE 4 16.000 16.000
 RESET
 MESSAGE
 _________________________________________
@@ -111,7 +115,7 @@ _________________________________________
 Next, join the 2 straight tracks to the helix in the same way we join to a circle.
 END
 STEP
-COMMAND Join
+COMMAND JoinTrack
 MOUSE 2 1.875 30.000
 MOUSE 4 1.875 30.000
 MOUSE 2 1.000 17.375
@@ -182,6 +186,7 @@ _________________________________________
 
 The helix description can be moved by the <Move Label> command.
 END
+PARAMETER display labelenable 1
 COMMAND MoveLabel
 MOUSE 2 15.875 16.125
 MOUSE 3 16.125 6.250
@@ -189,5 +194,27 @@ MOUSE 4 16.125 6.250
 MESSAGE
 =========================================
 END
+REGRESSION START 10 - helix
+STRAIGHT 1 0 0 0 0 DEMO 2
+	T4 5 25.749076 2.189249 254.675892 0 0.0 0.0 0.0 0.0 0 0 0 1.000000 
+	E4 72.500000 15.000000 74.675892 0 0.0 0.0 0.0 0.0 0 0 0 1.000000 
+	END
+STRAIGHT 2 0 0 0 0 DEMO 2
+	T4 4 2.583150 33.486562 189.520022 0 0.0 0.0 0.0 0.0 0 0 0 13.000000 
+	E4 5.625000 51.625000 9.520022 0 0.0 0.0 0.0 0.0 0 0 0 13.000000 
+	END
+CURVE 3 0 0 0 0 DEMO 2 16.000000 16.000000 0 15.000000 4 0.125000 -9.750000
+	T4 5 15.375542 1.013004 92.385944 9 0.000000 0.000000 1.000000 1.000000 1 1 0 7.000000 
+	T4 4 1.002118 16.252065 0.962864 9 0.000000 0.000000 13.000000 13.000000 1 1 0 7.000000 
+	END
+CURVE 4 0 0 0 0 DEMO 2 116.974302 14.302953 0 115.988562 0 0.000000 0.000000
+	T4 3 1.002118 16.252065 180.962864 9 0.000000 0.000000 13.000000 13.000000 1 1 0 13.000000 
+	T4 2 2.583150 33.486562 9.520022 0 0.0 0.0 0.0 0.0 0 0 0 13.000000 
+	END
+CURVE 5 0 0 0 0 DEMO 2 16.787253 34.894082 0 33.910476 0 0.000000 0.000000
+	T4 1 25.749076 2.189249 74.675892 0 0.0 0.0 0.0 0.0 0 0 0 1.000000 
+	T4 3 15.375542 1.013004 272.385944 9 0.000000 0.000000 1.000000 1.000000 1 1 0 1.000000 
+	END
+REGRESSION END
 STEP
 CLEAR
-- 
cgit v1.2.3