Update upstream source from tag 'upstream/5.2.0Beta2.1'

Update to upstream version '5.2.0Beta2.1'
with Debian dir 1576f25f4c1496abfed44af31ead67d32c7be650

1 files changed, 71 insertions, 59 deletions

diff --git a/app/lib/params/HO-Peco-Code100Streamline.xtp b/app/lib/params/HO-Peco-Code100Streamline.xtp
index a60fe62..013c810 100644
--- a/app/lib/params/HO-Peco-Code100Streamline.xtp
+++ b/app/lib/params/HO-Peco-Code100Streamline.xtp
@@ -69,70 +69,82 @@ TURNOUT HO "Peco	RH Long Turnout, Insulfrog	SL-88"
 
 SUBCONTENTS Peco HO Scale Code 100 Curved Turnouts
 TURNOUT HO "Peco	Curved Left Turnout	SL-87"
-	P "Normal" 1 4 5
-	P "Reverse" 1 2 3
+	P "Normal" 1 2 3 4
+	P "Reverse" 1 2 5 6 7
 	E 0.000000 0.000000 270.000000
 	E 9.930000 0.830000 80.473000
-	E 9.680000 1.790000 69.666000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 -23.421390 0.649631 23.421390 159.665924 20.334152
-	S 0 0.000000 8.788401 1.459572 9.680000 1.790000
-	C 0 0.000000 -52.020505 0.649669 52.020505 170.472924 9.527152
-	S 0 0.000000 9.259766 0.717503 9.930000 0.830000
-END
+	E 9.680000 1.970000 69.666000
+	C 0 0.000000 60.000000 0.000000 60.000000 179.952254 0.047746
+	S 0 0.000000 0.050000 0.000021 0.549978 0.002473
+	C 0 0.000000 -59.997741 -0.016498 59.997539 170.505131 8.953896
+	C 0 0.000000 60.000000 -0.000742 60.002463 170.473000 0.047746
+	C 0 0.000000 -20.009032 0.514864 20.011474 166.525509 13.373944
+	C 0 0.000000 -42.289079 -5.246889 41.537410 159.398651 6.331063
+	C 0 0.000000 30.000000 -0.744764 30.100487 159.666000 0.095493
+	END
 TURNOUT HO "Peco	Curved Right Turnout	SL-86"
-	P "Normal" 1 4 5
-	P "Reverse" 1 2 3
+	P "Normal" 1 2 3 4
+	P "Reverse" 1 2 5 6 7
 	E 0.000000 0.000000 270.000000
 	E 9.930000 -0.830000 99.527000
-	E 9.680000 -1.790000 110.334000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 23.421390 0.649507 -23.421390 0.000076 20.334152
-	S 0 0.000000 8.788401 -1.459572 9.680000 -1.790000
-	C 0 0.000000 52.020505 0.649393 -52.020505 0.000076 9.527152
-	S 0 0.000000 9.259766 -0.717503 9.930000 -0.830000
-END
+	E 9.680000 -1.970000 110.334000
+	C 0 0.000000 60.000000 0.000000 -60.000000 0.000000 0.047746
+	S 0 0.000000 0.050000 -0.000021 0.549978 -0.002473
+	C 0 0.000000 59.997741 -0.016498 -59.997539 0.540973 8.953896
+	C 0 0.000000 60.000000 -0.000742 -60.002463 9.479254 0.047746
+	C 0 0.000000 20.009032 0.514864 -20.011474 0.100547 13.373944
+	C 0 0.000000 42.289079 -5.246889 -41.537410 14.270285 6.331063
+	C 0 0.000000 30.000000 -0.744764 -30.100487 20.238507 0.095493
+	END
 
 SUBCONTENTS Peco HO Scale Code 100 WYE Turnouts
 TURNOUT HO "Peco	Short Y Turnout	SL-97"
-	P "Left" 1 2 3
-	P "Right" 1 4 5
+	P "Left" 1 2 3 4 5
+	P "Right" 1 2 6 7 8
 	E 0.000000 0.000000 270.000000
-	E 5.733858 0.517913 78.000000
-	E 5.733858 -0.517913 102.000000
-	S 0 0.000000 0.000000 0.000000 1.455910 0.000000
-	C 0 0.000000 -17.519683 1.455934 17.519683 167.999924 12.000152
-	S 0 0.000000 5.098500 0.382856 5.733858 0.517913
-	C 0 0.000000 17.519683 1.455841 -17.519683 0.000076 12.000152
-	S 0 0.000000 5.098500 -0.382856 5.733858 -0.517913
+	E 5.733858 0.517717 78.000000
+	E 5.733858 -0.517717 102.000000
+	S 0 0.000000 0.000000 0.000000 0.050000 0.000000
+	S 0 0.000000 0.050000 0.000000 0.837008 0.000000
+	C 0 0.000000 -21.959287 1.049798 21.958256 174.182810 6.372407
+	C 0 0.000000 -25.426526 0.368265 25.371829 167.930412 5.504160
+	C 0 0.000000 23.701181 0.806106 23.700970 168.000000 0.120871
+	C 0 0.000000 21.967293 1.049905 -21.966261 359.444707 6.370099
+	C 0 0.000000 25.415926 0.370538 -25.361368 6.563042 5.506467
+	C 0 0.000000 23.701181 10.661611 22.665537 192.120871 0.120871
 	END
 TURNOUT HO "Peco	Large Y Turnout	SL-98"
-	P "Left" 1 2 3
-	P "Right" 1 4 5
+	P "Left" 1 2 3 4
+	P "Right" 1 2 5 6
 	E 0.000000 0.000000 270.000000
-	E 8.638189 0.479134 84.000556
-	E 8.638189 -0.479134 95.999444
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 -65.447085 0.649687 65.447085 174.000480 5.999596
-	S 0 0.000000 7.490219 0.358477 8.638189 0.479134
-	C 0 0.000000 65.447085 0.649339 -65.447085 0.000076 5.999596
-	S 0 0.000000 7.490219 -0.358477 8.638189 -0.479134
-END
+	E 8.638189 0.479134 84.000000
+	E 8.638189 -0.479134 96.000000
+	S 0 0.000000 0.000000 0.000000 0.050000 0.000000
+	S 0 0.000000 0.050000 0.000000 0.855906 0.000000
+	C 0 0.000000 -56.219397 1.192646 56.218388 176.392954 3.950236
+	C 0 0.000000 -108.369470 -3.503854 108.166608 173.593356 2.049359
+	C 0 0.000000 54.238706 1.176210 -54.237760 359.661640 4.094836
+	C 0 0.000000 116.607497 -4.432846 -116.362546 4.506721 1.904748
+	END
 TURNOUT HO "Peco	Medium Radius 3 Way Turnout, Insulfrog	SL-99"
-	P "Left" 1 2 3
-	P "Normal" 1 6
-	P "Right" 1 4 5
+	P "Normal" 1 2 3 4
+	P "Left" 1 2 5 6 7
+	P "Right" 1 2 8 9 10
 	E 0.000000 0.000000 270.000000
 	E 8.540945 0.994094 78.000000
 	E 8.540945 -0.994094 102.000000
 	E 8.644882 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 -30.584413 0.649641 30.584413 167.999924 12.000152
-	S 0 0.000000 7.008531 0.668359 8.540945 0.994094
-	C 0 0.000000 30.584413 0.649478 -30.584413 0.000076 12.000152
-	S 0 0.000000 7.008531 -0.668359 8.540945 -0.994094
-	S 0 0.000000 0.649600 0.000000 8.644882 0.000000
-END
+	S 0 0.000000 0.000000 0.000000 0.050000 0.000000
+	S 0 0.000000 0.050000 0.000000 0.855118 0.000000
+	S 0 0.000000 0.855118 0.000000 8.594882 0.000000
+	S 0 0.000000 8.594882 0.000000 8.594882 0.000000
+	C 0 0.000000 -26.000276 1.156979 25.998523 172.159155 8.506060
+	C 0 0.000000 -63.372404 -5.584016 62.773069 167.166627 3.490515
+	S 0 0.000000 8.492038 0.983699 8.492038 0.983699
+	C 0 0.000000 25.160469 1.142991 -25.158822 359.344438 8.793112
+	C 0 0.000000 69.079411 -6.862926 -68.355735 9.639618 3.203358
+	S 0 0.000000 8.492038 -1.004490 8.492038 -1.004490
+	END
 
 SUBCONTENTS Peco HO Scale Code 100 Slip Turnouts
 TURNOUT HO "Peco	Single Slip, Insulfrog	SL-80"
@@ -167,25 +179,25 @@ END
 
 SUBCONTENTS Peco HO Scale Code 100 CatchPoints
 TURNOUT HO "PECO	RH CatchPoint	SL-84"
-	P "Closed" 1 2
+	P "Closed" 1 2 4
 	P "Open" 1 3
 	E 0.000000 0.000000 270.000000
-	E 4.094488 0.000000 90.000000
-	E 3.250000 0.125000 85.500000
+	E 4.090000 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 0.649000 0.000000
-	S 0 0.000000 0.649000 0.000000 4.094488 0.000000
-	S 0 0.000000 0.649000 0.000000 3.250000 0.12500
-END
+	S 0 0.000000 0.649000 0.000000 3.441000 0.000000
+	S 0 0.000000 0.649000 -0.000000 3.441000 -0.20000
+	S 0 0.000000 3.441000 0.000000 4.090000 0.000000
+	END
 TURNOUT HO "PECO	LH CatchPoint	SL-85"
-	P "Closed" 1 2
+	P "Closed" 1 2 4
 	P "Open" 1 3
 	E 0.000000 0.000000 270.000000
-	E 4.094488 0.000000 90.00000
-	E 3.250000 -0.12500 95.000000
+	E 4.090000 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 0.649000 0.000000
-    S 0 0.000000 0.649000 0.000000 4.094488 0.000000
-	S 0 0.000000 0.649000 0.000000 3.250000 -0.12500
-END
+	S 0 0.000000 0.649000 0.000000 3.441000 0.000000
+	S 0 0.000000 0.649000 -0.000000 3.441000 0.20000
+	S 0 0.000000 3.441000 0.000000 4.090000 0.000000
+	END
 
 SUBCONTENTS Peco HO Scale Crossings
 TURNOUT HO "Peco	Short Crossing, Insulfrog	SL-93"