New upstream version 5.3.1Beta2upstream/5.3.1Beta2

11 files changed, 26 insertions, 22 deletions

diff --git a/app/lib/demos/dmbench.xtr b/app/lib/demos/dmbench.xtr
index 252703b..6297928 100644
--- a/app/lib/demos/dmbench.xtr
+++ b/app/lib/demos/dmbench.xtr
@@ -58,7 +58,7 @@ Change the Orientation to Right.
 END
 STEP
 PARAMETER describe L2 1 Right
-PARAMETER describe ok
+PARAMETER describe cancel
 RESET
 MESSAGE
 _________________________________________
diff --git a/app/lib/demos/dmctlpnl.xtr b/app/lib/demos/dmctlpnl.xtr
index f06f1a3..7bc5b44 100644
--- a/app/lib/demos/dmctlpnl.xtr
+++ b/app/lib/demos/dmctlpnl.xtr
@@ -1126,14 +1126,18 @@ STRUCTURE 44 0 0 0 0 DEMO 2 1.000000 6.250000 0 180.000000 "Symbols	Arrow	 "
 		0.000000 0.000000 0
 		0.378906 0.250000 0
 	END
-DRAW 45 0 0 0 0 0.000000 0.000000 0 0.000000
-	Z 0 3.937000 6.625000 0.000000 0 48.000000 "Summit"
+DRAW 45 0 0 0 0 3.937000 6.625000 0 0.000000
+	Z 0 0.000000 0.0000000.000000 0 48.000000 "Summit"
 	END$SEGS
-DRAW 46 0 0 0 0 0.000000 0.000000 0 0.000000
-	Z 0 0.641000 5.016000 0.000000 0 24.000000 "Seattle"
+DRAW 46 0 0 0 0 0.641000 5.016000 0 0.000000
+	Z 0 0.000000 0.000000 0.000000 0 24.000000 "Seattle"
+#DRAW 46 0 0 0 0 0.000000 0.000000 0 0.000000
+#	Z 0 0.641000 5.016000 0.000000 0 24.000000 "Seattle"
 	END$SEGS
-DRAW 47 0 0 0 0 0.000000 0.000000 0 0.000000
-	Z 0 8.641000 5.000000 0.000000 0 24.000000 "Chicago"
+DRAW 47 0 0 0 0 8.641000 5.000000 0 0.000000
+	Z 0 0.000000 0.000000 0.000000 0 24.000000 "Chicago"
+#DRAW 47 0 0 0 0 0.000000 0.000000 0 0.000000
+#	Z 0 8.641000 5.000000 0.000000 0 24.000000 "Chicago"
 	END$SEGS
 #DRAW 45 0 0 0 0 3.937000 6.625000 0 0.000000
 #	Z 0 0.000000 0.000000 0.000000 0 48.000000 "Summit"
diff --git a/app/lib/demos/dmdimlin.xtr b/app/lib/demos/dmdimlin.xtr
index 071e9f8..cdb8344 100644
--- a/app/lib/demos/dmdimlin.xtr
+++ b/app/lib/demos/dmdimlin.xtr
@@ -157,7 +157,7 @@ STEP
 #DESCRIBE Size	1
 PARAMETER describe L1 1 Small
 #DESCRIBE OK
-PARAMETER describe ok
+PARAMETER describe cancel
 RESET
 MESSAGE
 =========================================
diff --git a/app/lib/demos/dmelev.xtr b/app/lib/demos/dmelev.xtr
index 623c858..34af839 100644
--- a/app/lib/demos/dmelev.xtr
+++ b/app/lib/demos/dmelev.xtr
@@ -178,7 +178,7 @@ MOUSE 2 74.307 14.173
 #MOUSE 3 74.227 13.453
 KEYSTATE 4
 MOUSE 4 74.227 12.453
-#PARAMETER elev ok
+#PARAMETER elev done
 MESSAGE
 _________________________________________
 
@@ -204,7 +204,7 @@ KEYSTATE 4
 MOUSE 3 38.240 3.480
 KEYSTATE 4
 MOUSE 4 38.240 3.480
-#PARAMETER elev ok
+#PARAMETER elev close
 BIGPAUSE
 MESSAGE
 =========================================
@@ -298,7 +298,7 @@ MOUSE 3 25.320 10.000
 KEYSTATE 4
 MOUSE 4 25.320 10.000
 BIGPAUSE
-#PARAMETER elev ok
+#PARAMETER elev cancel
 MESSAGE
 _________________________________________
 
@@ -331,7 +331,7 @@ MOUSE 3 25.680 5.1
 KEYSTATE 4
 MOUSE 4 25.680 5.1
 BIGPAUSE
-#PARAMETER elev ok
+#PARAMETER elev cancel
 MESSAGE
 _________________________________________
 
@@ -372,7 +372,7 @@ MOUSE 2 55.120 5.480
 KEYSTATE 4
 MOUSE 4 54.960 6.520
 BIGPAUSE
-PARAMETER elev ok
+PARAMETER elev cancel
 MESSAGE
 =========================================
 END
diff --git a/app/lib/demos/dmexcept.xtr b/app/lib/demos/dmexcept.xtr
index ff98734..2cd62df 100644
--- a/app/lib/demos/dmexcept.xtr
+++ b/app/lib/demos/dmexcept.xtr
@@ -72,7 +72,7 @@ PARAMETER describe F3 2.250
 REDRAW
 STEP
 #DESCRIBE OK
-PARAMETER describe ok
+PARAMETER describe cancel
 RESET
 PARAMETER misc cmdColor
 MESSAGE
diff --git a/app/lib/demos/dmflip.xtr b/app/lib/demos/dmflip.xtr
index 80921d7..23ae28c 100644
--- a/app/lib/demos/dmflip.xtr
+++ b/app/lib/demos/dmflip.xtr
@@ -182,7 +182,7 @@ STEP
 PARAMETER describe S2 Interstate Fuel - Loading Rack
 BIGPAUSE
 #DESCRIBE OK
-PARAMETER describe ok
+PARAMETER describe cancel
 REDRAW
 MESSAGE
 =========================================
diff --git a/app/lib/demos/dmgroup.xtr b/app/lib/demos/dmgroup.xtr
index 7c6c7cd..a628d22 100644
--- a/app/lib/demos/dmgroup.xtr
+++ b/app/lib/demos/dmgroup.xtr
@@ -198,7 +198,7 @@ MOUSE 2 2.359 2.266
 MOUSE 4 2.359 2.266
 BIGPAUSE
 #DESCRIBE OK
-PARAMETER describe ok
+PARAMETER describe cancel
 RESET
 MESSAGE
 _________________________________________
@@ -441,7 +441,7 @@ STEP
 #DESCRIBE Length	7.500
 PARAMETER describe F7 7.500
 #DESCRIBE OK
-PARAMETER describe ok
+PARAMETER describe cancel
 RESET
 MESSAGE
 _________________________________________
@@ -477,7 +477,7 @@ STEP
 PARAMETER describe F11 17.5
 BIGPAUSE
 #DESCRIBE OK
-PARAMETER describe ok
+PARAMETER describe cancel
 MESSAGE
 _________________________________________
 
diff --git a/app/lib/demos/dmhelix.xtr b/app/lib/demos/dmhelix.xtr
index 88707da..fdb67a9 100644
--- a/app/lib/demos/dmhelix.xtr
+++ b/app/lib/demos/dmhelix.xtr
@@ -169,7 +169,7 @@ MOUSE 2 1.250 16.000
 MOUSE 4 1.250 16.000
 PARAMETER elev mode 1
 PARAMETER elev value 13.000000
-PARAMETER elev ok
+PARAMETER elev cancel
 BIGPAUSE
 RESET
 REDRAW
diff --git a/app/lib/demos/dmhndld.xtr b/app/lib/demos/dmhndld.xtr
index cf3c477..705b124 100644
--- a/app/lib/demos/dmhndld.xtr
+++ b/app/lib/demos/dmhndld.xtr
@@ -102,7 +102,7 @@ BIGPAUSE
 MOUSE 2 26.656 11.094
 MOUSE 4 26.656 11.094
 #DESCRIBE OK
-PARAMETER describe ok
+PARAMETER describe cancel
 RESET
 MESSAGE
 =========================================
diff --git a/app/lib/demos/dmrescal.xtr b/app/lib/demos/dmrescal.xtr
index c4ac3a6..a01c441 100644
--- a/app/lib/demos/dmrescal.xtr
+++ b/app/lib/demos/dmrescal.xtr
@@ -175,7 +175,7 @@ Note that the Title of the turnout did not change.
 END
 STEP
 #DESCRIBE OK
-PARAMETER describe ok
+PARAMETER describe cancel
 MESSAGE
 =========================================
 END
diff --git a/app/lib/demos/dmtotrim.xtr b/app/lib/demos/dmtotrim.xtr
index 03a549e..be709f1 100644
--- a/app/lib/demos/dmtotrim.xtr
+++ b/app/lib/demos/dmtotrim.xtr
@@ -88,7 +88,7 @@ STEP
 MOUSE 2 5.453 1.875
 MOUSE 4 5.453 1.875
 #DESCRIBE OK
-PARAMETER describe ok
+PARAMETER describe cancel
 MESSAGE
 =========================================
 END