Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1

1 files changed, 34 insertions, 22 deletions

diff --git a/app/lib/params/Any-CTC_panel.xtp b/app/lib/params/Any-CTC_panel.xtp
index 7b73cab..7c8f8d7 100644
--- a/app/lib/params/Any-CTC_panel.xtp
+++ b/app/lib/params/Any-CTC_panel.xtp
@@ -246,7 +246,7 @@ STRUCTURE * "Signals 	2 Aspect Signal	2DS"
 	L 0 0.020000 -0.100000 0.000000 0.100000 0.000000
 	END
 SUBCONTENTS Track Symbols - Straights
-TURNOUT *  " 0.5"" Straight (adjustable to 6"""	S"
+TURNOUT *  " 0.5"" Straight (adjustable to 6)	S"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 0.500000 0.000000 90.000000
@@ -254,7 +254,7 @@ TURNOUT *  " 0.5"" Straight (adjustable to 6"""	S"
 	S 16777215 0 0.000000 0.000000 0.500000 0.000000
 	L 0 0.080000 0.000000 0.000000 0.500000 0.000000
 	END
-TURNOUT *  "Block Gap"	BG"
+TURNOUT *  "Block Gap	BG"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 0.500000 0.000000 90.000000
@@ -264,48 +264,60 @@ TURNOUT *  "Block Gap"	BG"
 	END
 
 SUBCONTENTS Track Symbols - Turnouts
-TURNOUT *  "Turnout LH(GAP)"	LHG"
-	P "Normal" 1 0 2 0 3
+TURNOUT *  "Turnout LH(GAP)	LHG" 256
+# UseOldPaths - connection angle too large
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
 	E 0.000000 0.000000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 0.500000 90.000000
-	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.000000 0.000000 0.300000 0.000000
+	S 16777215 0 0.300000 0.000000 1.000000 0.000000
 	S 16777215 0 0.300000 0.000000 0.800000 0.500000
 	S 16777215 0 0.800000 0.500000 1.000000 0.500000
 	L 0 0.080000 0.050000 0.000000 0.950000 0.000000
 	L 0 0.080000 0.300000 0.000000 0.825000 0.525000
 	L 0 0.080000 0.800000 0.500000 0.950000 0.500000
 	END
-TURNOUT *  "Turnout RH(GAP)"	RHG"
-	P "Normal" 1 0 2 0 3
+TURNOUT *  "Turnout RH(GAP)	RHG" 256
+# UseOldPaths - connection angle too large
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
 	E 0.000000 0.000000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 -0.500000 90.000000
-	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.000000 0.000000 0.300000 0.000000
+	S 16777215 0 0.300000 0.000000 1.000000 0.000000
 	S 16777215 0 0.300000 0.000000 0.800000 -0.500000
 	S 16777215 0 0.800000 -0.500000 1.000000 -0.500000
 	L 0 0.080000 0.050000 0.000000 0.950000 0.000000
 	L 0 0.080000 0.300000 0.000000 0.825000 -0.525000
 	L 0 0.080000 0.800000 -0.500000 0.950000 -0.500000
 	END
-TURNOUT *  "Turnout LH"	LH"
-	P "Normal" 1 0 2 0 3
+TURNOUT *  "Turnout LH	LH" 256
+# UseOldPaths - connection angle too large
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
 	E 0.000000 0.000000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 0.500000 90.000000
-	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.000000 0.000000 0.300000 0.000000
+	S 16777215 0 0.300000 0.000000 1.000000 0.000000
 	S 16777215 0 0.300000 0.000000 0.800000 0.500000
 	S 16777215 0 0.800000 0.500000 1.000000 0.500000
 	L 0 0.080000 0.000000 0.000000 1.000000 0.000000
 	L 0 0.080000 0.300000 0.000000 0.825000 0.525000
 	L 0 0.080000 0.800000 0.500000 1.000000 0.500000
 	END
-TURNOUT *  "Turnout RH"	RH"
-	P "Normal" 1 0 2 0 3
+TURNOUT *  "Turnout RH	RH" 256
+# UseOldPaths - connection angle too large
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
 	E 0.000000 0.000000 270.000000
 	E 1.000000 0.000000 90.000000
 	E 1.000000 -0.500000 90.000000
-	S 16777215 0 0.000000 0.000000 1.000000 0.000000
+	S 16777215 0 0.000000 0.000000 0.300000 0.000000
+	S 16777215 0 0.300000 0.000000 1.000000 0.000000
 	S 16777215 0 0.300000 0.000000 0.800000 -0.500000
 	S 16777215 0 0.800000 -0.500000 1.000000 -0.500000
 	L 0 0.080000 0.000000 0.000000 1.000000 0.000000
@@ -314,7 +326,7 @@ TURNOUT *  "Turnout RH"	RH"
 	END
 
 SUBCONTENTS Track Symbols - Crossovers
-TURNOUT *  "Crossover LH(GAP)"	COLHG"
+TURNOUT *  "Crossover LH(GAP)	COLHG"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
 	E 0.000000 0.500000 270.000000
@@ -326,7 +338,7 @@ TURNOUT *  "Crossover LH(GAP)"	COLHG"
 	L 0 0.080000 0.250000 0.000000 0.750000 0.500000
 	L 0 0.080000 0.050000 0.500000 0.950000 0.500000
 	END
-TURNOUT *  "Crossover RH(GAP)"	CORHG"
+TURNOUT *  "Crossover RH(GAP)	CORHG"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
 	E 0.000000 -0.500000 270.000000
@@ -338,7 +350,7 @@ TURNOUT *  "Crossover RH(GAP)"	CORHG"
 	L 0 0.080000 0.250000 0.000000 0.750000 -0.500000
 	L 0 0.080000 0.050000 -0.500000 0.950000 -0.500000
 	END
-TURNOUT *  "Crossover LH"	COLH"
+TURNOUT *  "Crossover LH	COLH"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
 	E 0.000000 0.500000 270.000000
@@ -350,7 +362,7 @@ TURNOUT *  "Crossover LH"	COLH"
 	L 0 0.080000 0.250000 0.000000 0.750000 0.500000
 	L 0 0.080000 0.000000 0.500000 1.000000 0.500000
 	END
-TURNOUT *  "Crossover RH"	CORH"
+TURNOUT *  "Crossover RH	CORH"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
 	E 0.000000 -0.500000 270.000000
@@ -362,7 +374,7 @@ TURNOUT *  "Crossover RH"	CORH"
 	L 0 0.080000 0.250000 0.000000 0.750000 -0.500000
 	L 0 0.080000 0.000000 -0.500000 1.000000 -0.500000
 	END
-TURNOUT *  "Dbl.Crossover(GAP)"	DBLCOG"
+TURNOUT *  "Dbl.Crossover(GAP)	DBLCOG"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
 	E 0.000000 0.500000 270.000000
@@ -375,7 +387,7 @@ TURNOUT *  "Dbl.Crossover(GAP)"	DBLCOG"
 	L 0 0.080000 0.250000 0.500000 0.750000 0.000000
 	L 0 0.080000 0.050000 0.500000 0.950000 0.500000
 	END
-TURNOUT *  "Dbl.Crossover"	DBLCO"
+TURNOUT *  "Dbl.Crossover	DBLCO"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
 	E 0.000000 0.500000 270.000000
@@ -390,7 +402,7 @@ TURNOUT *  "Dbl.Crossover"	DBLCO"
 	END
 
 SUBCONTENTS Track Symbols - Crossings
-TURNOUT *  "90 Crossing"	90C"
+TURNOUT *  "90 Crossing	90C"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
 	E 0.500000 0.000000 90.000000
@@ -401,7 +413,7 @@ TURNOUT *  "90 Crossing"	90C"
 	L 0 0.080000 0.000000 0.000000 0.500000 0.000000
 	L 0 0.080000 0.250000 0.250000 0.250000 -0.250000
 	END
-TURNOUT *  "45 Crossing"	45C"
+TURNOUT *  "45 Crossing	45C"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
 	E 0.500000 0.000000 90.000000