New upstream version 4.2.4aupstream/4.2.4a

1 files changed, 18 insertions, 18 deletions

diff --git a/app/lib/params/On30-Guy.xtp b/app/lib/params/On30-Guy.xtp
index 2342060..8e24a6c 100644
--- a/app/lib/params/On30-Guy.xtp
+++ b/app/lib/params/On30-Guy.xtp
@@ -1,5 +1,5 @@
 CONTENTS On30Guy Track Sections
-TURNOUT On2½ "On30Guy	LH Ind Switch	"
+TURNOUT On30 "On30Guy	LH Ind Switch	"
 	U "Regular Turnout" "" "On30Guy" "LH Ind Switch" "" "RH Ind Switch" "" 5.365560 30.000000 1.235150 6.175790 0.000000 0.000000 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -11,7 +11,7 @@ TURNOUT On2½ "On30Guy	LH Ind Switch	"
 	C 0 0.000000 -6.798637 1.404551 6.798637 149.999924 30.000152
 	S 0 0.000000 4.803873 0.910852 5.365560 1.235150
 	END
-TURNOUT On2½ "On30Guy	RH Ind Switch	"
+TURNOUT On30 "On30Guy	RH Ind Switch	"
 	U "Regular Turnout" "" "On30Guy" "LH Ind Switch" "" "RH Ind Switch" "" 5.365560 30.000000 1.235150 6.175790 0.000000 0.000000 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -23,7 +23,7 @@ TURNOUT On2½ "On30Guy	RH Ind Switch	"
 	C 0 0.000000 6.798637 1.404515 -6.798637 0.000076 30.000152
 	S 0 0.000000 4.803873 -0.910852 5.365560 -1.235150
 	END
-TURNOUT On2½ "On30Guy	9"" Y Ind Switch	"
+TURNOUT On30 "On30Guy	9"" Y Ind Switch	"
 	U "Wye Turnout" "" "On30Guy" "9"" Y Ind Switch" "" 5.406000 30.000000 1.195500 1.195500 30.000000 5.406000 0.000000 0.000000 0
 	P "Left" 1 2 3
 	P "Right" 1 4 5
@@ -36,28 +36,28 @@ TURNOUT On2½ "On30Guy	9"" Y Ind Switch	"
 	C 0 0.000000 6.502684 1.592932 -6.502684 0.000076 30.000152
 	S 0 0.000000 4.844312 -0.871202 5.406000 -1.195500
 	END
-TURNOUT On2½ "On30Guy	12"" Industrial Curve	"
+TURNOUT On30 "On30Guy	12"" Industrial Curve	"
 	U "Curved Section" "" "On30Guy" "12"" Industrial Curve" "" 12.000000 30.000000 0.000000 0.000000 0
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 5.999995 1.607693 60.000000
 	C 0 0.000000 -12.000000 0.000016 12.000000 150.000076 30.000000
 	END
-TURNOUT On2½ "On30Guy	9"" Industrial Curve	"
+TURNOUT On30 "On30Guy	9"" Industrial Curve	"
 	U "Curved Section" "" "On30Guy" "9"" Industrial Curve" "" 9.000000 30.000000 0.000000 0.000000 0
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 4.499997 1.205769 60.000000
 	C 0 0.000000 -9.000000 0.000012 9.000000 150.000076 30.000000
 	END
-TURNOUT On2½ "On30Guy	4"" Ind Straight	"
+TURNOUT On30 "On30Guy	4"" Ind Straight	"
 	U "Straight Section" "" "On30Guy" "4"" Ind Straight" "" 4.000000 0.000000 0.000000 0
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 4.000000 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 4.000000 0.000000
 	END
-TURNOUT On2½ "On30Guy	60deg Ind. Crossing	"
+TURNOUT On30 "On30Guy	60deg Ind. Crossing	"
 	U "Crossing" "" "On30Guy" "60deg Ind. Crossing" "" 6.000000 60.000000 6.000000 0.000000 0.000000 0
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
@@ -67,7 +67,7 @@ TURNOUT On2½ "On30Guy	60deg Ind. Crossing	"
 	S 0 0.000000 0.000000 0.000000 6.000000 0.000000
 	S 0 0.000000 1.499994 2.598073 4.500006 -2.598073
 	END
-TURNOUT On2½ "On30Guy	90deg Ind. Crossing	"
+TURNOUT On30 "On30Guy	90deg Ind. Crossing	"
 	U "Crossing" "" "On30Guy" "90deg Ind. Crossing" "" 4.000000 90.000000 4.000000 0.000000 0.000000 0
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
@@ -77,7 +77,7 @@ TURNOUT On2½ "On30Guy	90deg Ind. Crossing	"
 	S 0 0.000000 0.000000 0.000000 4.000000 0.000000
 	S 0 0.000000 2.000005 2.000000 1.999995 -2.000000
 	END
-TURNOUT On2½ "On30Guy	30deg Ind. Crossing	"
+TURNOUT On30 "On30Guy	30deg Ind. Crossing	"
 	U "Crossing" "" "On30Guy" "30deg Ind. Crossing" "" 6.000000 30.000000 6.000000 0.000000 0.000000 0
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
@@ -87,7 +87,7 @@ TURNOUT On2½ "On30Guy	30deg Ind. Crossing	"
 	S 0 0.000000 0.000000 0.000000 6.000000 0.000000
 	S 0 0.000000 0.401921 1.499995 5.598079 -1.499995
 	END
-TURNOUT On2½ "On30Guy	45deg Ind. Crossing	"
+TURNOUT On30 "On30Guy	45deg Ind. Crossing	"
 	U "Crossing" "" "On30Guy" "45deg Ind. Crossing" "" 6.000000 45.000000 6.000000 0.000000 0.000000 0
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
@@ -97,7 +97,7 @@ TURNOUT On2½ "On30Guy	45deg Ind. Crossing	"
 	S 0 0.000000 0.000000 0.000000 6.000000 0.000000
 	S 0 0.000000 0.878675 2.121316 5.121325 -2.121316
 	END
-TURNOUT On2½ "On30Guy	12"" Ind. LH Switch	"
+TURNOUT On30 "On30Guy	12"" Ind. LH Switch	"
 	U "Regular Turnout" "" "On30Guy" "12"" Ind. LH Switch" "" "12"" Ind. RH Switch" "" 5.840000 30.000000 1.550000 6.000000 0.000000 0.000000 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -109,7 +109,7 @@ TURNOUT On2½ "On30Guy	12"" Ind. LH Switch	"
 	C 0 0.000000 -9.148708 0.703959 9.148708 149.999924 30.000152
 	S 0 0.000000 5.278319 1.225705 5.840000 1.550000
 	END
-TURNOUT On2½ "On30Guy	12"" Ind. RH Switch	"
+TURNOUT On30 "On30Guy	12"" Ind. RH Switch	"
 	U "Regular Turnout" "" "On30Guy" "12"" Ind. LH Switch" "" "12"" Ind. RH Switch" "" 5.840000 30.000000 1.550000 6.000000 0.000000 0.000000 0
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
@@ -121,7 +121,7 @@ TURNOUT On2½ "On30Guy	12"" Ind. RH Switch	"
 	C 0 0.000000 9.148708 0.703911 -9.148708 0.000076 30.000152
 	S 0 0.000000 5.278319 -1.225705 5.840000 -1.550000
 	END
-TURNOUT On2½ "On30Guy	12"" Ind. Y Switch	"
+TURNOUT On30 "On30Guy	12"" Ind. Y Switch	"
 	U "Wye Turnout" "" "On30Guy" "12"" Ind. Y Switch" "" 5.840000 30.000000 1.550000 1.550000 30.000000 5.840000 0.000000 0.000000 0
 	P "Left" 1 2 3
 	P "Right" 1 4 5
@@ -134,35 +134,35 @@ TURNOUT On2½ "On30Guy	12"" Ind. Y Switch	"
 	C 0 0.000000 9.148708 0.703911 -9.148708 0.000076 30.000152
 	S 0 0.000000 5.278319 -1.225705 5.840000 -1.550000
 	END
-TURNOUT On2½ "On30Guy	8"" Ind. Straight	"
+TURNOUT On30 "On30Guy	8"" Ind. Straight	"
 	U "Straight Section" "" "On30Guy" "8"" Ind. Straight" "" 8.000000 0.000000 0.000000 0
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 8.000000 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 8.000000 0.000000
 	END
-TURNOUT On2½ "On30Guy	9"" Ind. Half Curve	"
+TURNOUT On30 "On30Guy	9"" Ind. Half Curve	"
 	U "Curved Section" "" "On30Guy" "9"" Ind. Half Curve" "" 9.000000 15.000000 0.000000 0.000000 0
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 2.329369 0.306667 75.000000
 	C 0 0.000000 -9.000000 0.000012 9.000000 165.000076 15.000000
 	END
-TURNOUT On2½ "On30Guy	12"" Ind. Half Curve	"
+TURNOUT On30 "On30Guy	12"" Ind. Half Curve	"
 	U "Curved Section" "" "On30Guy" "12"" Ind. Half Curve" "" 12.000000 15.000000 0.000000 0.000000 0
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 3.105826 0.408889 75.000000
 	C 0 0.000000 -12.000000 0.000016 12.000000 165.000076 15.000000
 	END
-TURNOUT On2½ "On30Guy	6"" Industrial Straight	"
+TURNOUT On30 "On30Guy	6"" Industrial Straight	"
 	U "Straight Section" "" "On30Guy" "6"" Industrial Straight" "" 6.000000 0.000000 0.000000 0
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 6.000000 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 6.000000 0.000000
 	END
-TURNOUT On2½ "On30Guy	2"" Industrial Straight	"
+TURNOUT On30 "On30Guy	2"" Industrial Straight	"
 	U "Straight Section" "" "On30Guy" "2"" Industrial Straight" "" 2.000000 0.000000 0.000000 0
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000