Update upstream source from tag 'upstream/5.2.2GA'

Update to upstream version '5.2.2GA'
with Debian dir 9c80045d0b4f9e463647bc8af8c090a673df4132

1 files changed, 65 insertions, 62 deletions

diff --git a/app/lib/params/HO-Peco-Code100Streamline.xtp b/app/lib/params/HO-Peco-Code100Streamline.xtp
index 013c810..95ceed8 100644
--- a/app/lib/params/HO-Peco-Code100Streamline.xtp
+++ b/app/lib/params/HO-Peco-Code100Streamline.xtp
@@ -69,32 +69,30 @@ 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 2 3 4
-	P "Reverse" 1 2 5 6 7
+	P "Normal" 1 2 3
+	P "Reverse" 1 4 5 6
 	E 0.000000 0.000000 270.000000
-	E 9.930000 0.830000 80.473000
-	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
+	E 9.930000 0.830000 80.490000
+	E 9.681496 1.794000 69.640000
+	S 0 0.000000 0.000000 0.000000 1.204702 0.001944
+	C 0 0.000000 -56.711913 0.217496 56.705263 170.341157 8.661424
+	C 0 0.000000 -60.000000 0.016815 60.005407 170.490000 0.190986
+	C 0 0.000000 -19.394467 1.124778 19.396246 167.192625 12.571261
+	C 0 0.000000 -36.267775 -3.099537 35.736252 159.681969 6.725371
+	C 0 0.000000 -28.764567 -0.326204 28.761504 159.640000 0.398377
 	END
 TURNOUT HO "Peco	Curved Right Turnout	SL-86"
-	P "Normal" 1 2 3 4
-	P "Reverse" 1 2 5 6 7
+	P "Normal" 1 2 3
+	P "Reverse" 1 4 5 6
 	E 0.000000 0.000000 270.000000
-	E 9.930000 -0.830000 99.527000
-	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
+	E 9.930000 -0.830000 99.510000
+	E 9.681496 -1.794000 110.360000
+	S 0 0.000000 0.000000 0.000000 1.204702 -0.001944
+	C 0 0.000000 56.711913 0.217496 -56.705263 0.997419 8.661424
+	C 0 0.000000 60.000000 0.016815 -60.005407 9.319014 0.190986
+	C 0 0.000000 19.394467 1.124778 -19.396246 0.236114 12.571261
+	C 0 0.000000 36.267775 -3.099537 -35.736252 13.592659 6.725371
+	C 0 0.000000 28.764567 -0.326204 -28.761504 19.961623 0.398377
 	END
 
 SUBCONTENTS Peco HO Scale Code 100 WYE Turnouts
@@ -102,48 +100,49 @@ TURNOUT HO "Peco	Short Y Turnout	SL-97"
 	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.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
+	E 5.734000 0.517717 78.000000
+	E 5.733858 -0.518000 102.000000
+	S 0 0.000000 0.000000 0.000000 0.200000 0.000000
+	S 0 0.000000 0.200000 0.000000 0.987008 0.000000
+	C 0 0.000000 -21.538028 1.221044 21.536756 174.521400 6.101197
+	C 0 0.000000 -20.601246 0.999673 20.572063 167.273147 6.379205
+	C 0 0.000000 -23.701000 0.806285 23.700793 168.000000 0.483488
+	C 0 0.000000 20.114739 1.173703 -20.113873 359.468200 6.530097
+	C 0 0.000000 26.357793 0.179320 -26.284552 6.746334 4.984102
+	C 0 0.000000 23.701000 0.806143 -23.701076 11.516512 0.483488
 	END
 TURNOUT HO "Peco	Large Y Turnout	SL-98"
 	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.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
+	E 8.640000 0.480000 83.500000
+	E 8.640000 -0.480000 96.500000
+	S 0 0.000000 0.000000 0.000000 0.200000 0.000000
+	S 0 0.000000 0.200000 0.000000 1.005906 0.000000
+	C 0 0.000000 -65.701925 0.696301 65.701195 173.230196 6.499810
+	S 0 0.000000 8.441286 0.457359 8.640000 0.480000
+	C 0 0.000000 65.701925 0.696301 -65.701195 0.269994 6.499810
+	S 0 0.000000 8.441286 -0.457359 8.640000 -0.480000
 	END
-TURNOUT HO "Peco	Medium Radius 3 Way Turnout, Insulfrog	SL-99"
-	P "Normal" 1 2 3 4
-	P "Left" 1 2 5 6 7
-	P "Right" 1 2 8 9 10
+TURNOUT HO "Peco	Medium Radius 3 Way Turnout, Insulfrog	SL-99" 0
+	P "Normal" 1 2 3 4 5
+	P "Left" 1 2 3 6 7 8
+	P "Right" 1 2 9 10 11
 	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.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
+	E 8.540000 1.007480 78.000000
+	E 8.540000 -1.007480 102.000000
+	E 8.650000 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 0.200000 0.000000
+	S 0 0.000000 0.200000 0.000000 1.005118 0.000000
+	S 0 0.000000 1.005118 0.000000 1.541339 0.000000
+	S 0 0.000000 1.541339 0.000000 8.450000 0.000000
+	S 0 0.000000 8.450000 0.000000 8.650000 0.000000
+	C 0 0.000000 -19.950415 1.756712 19.949252 170.725608 9.892934
+	C 0 0.000000 -93.877293 -12.581420 92.481238 167.120240 2.103032
+	S 0 0.000000 8.344370 0.965898 8.540000 1.007480
+	C 0 0.000000 24.157933 1.281406 -24.156353 359.344709 8.801153
+	C 0 0.000000 66.554731 -6.449712 -65.855553 9.647932 3.195314
+	S 0 0.000000 8.344370 -0.965898 8.540000 -1.007480
 	END
 
 SUBCONTENTS Peco HO Scale Code 100 Slip Turnouts
@@ -160,9 +159,11 @@ TURNOUT HO "Peco	Single Slip, Insulfrog	SL-80"
 	S 0 0.000000 8.427277 -0.749392 9.696040 -1.019087
 	C 0 0.000000 34.292562 1.297233 -34.292562 0.000076 12.000152
 END
-TURNOUT HO "Peco	Double Slip, Insulfrog	SL-90"
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
+TURNOUT HO "Peco	Double Slip, Insulfrog	SL-90" 512
+	P "Cross1" 1 2 3
+	P "Cross2" 4 5 6
+	P "Slip1" 1 7 6
+	P "Slip2" 4 8 3
 	E 0.000000 0.000000 270.000000
 	E 9.803150 0.000000 90.000000
 	E 0.107110 1.019087 282.000000
@@ -179,23 +180,25 @@ END
 
 SUBCONTENTS Peco HO Scale Code 100 CatchPoints
 TURNOUT HO "PECO	RH CatchPoint	SL-84"
+# tighten angle for diverging path
 	P "Closed" 1 2 4
 	P "Open" 1 3
 	E 0.000000 0.000000 270.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 3.441000 0.000000
-	S 0 0.000000 0.649000 -0.000000 3.441000 -0.20000
+	S 0 0.000000 0.649000 -0.000000 3.600000 -0.073273
 	S 0 0.000000 3.441000 0.000000 4.090000 0.000000
 	END
 TURNOUT HO "PECO	LH CatchPoint	SL-85"
+# tighten angle for diverging path
 	P "Closed" 1 2 4
 	P "Open" 1 3
 	E 0.000000 0.000000 270.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 3.441000 0.000000
-	S 0 0.000000 0.649000 -0.000000 3.441000 0.20000
+	S 0 0.000000 0.649000 -0.000000 3.600000 0.073273
 	S 0 0.000000 3.441000 0.000000 4.090000 0.000000
 	END