New upstream version 5.1.2aupstream/5.1.2a

1 files changed, 53 insertions, 43 deletions

diff --git a/app/lib/params/HO-Peco-Code75Finescale.xtp b/app/lib/params/HO-Peco-Code75Finescale.xtp
index 39ea0c1..f2a99a3 100644
--- a/app/lib/params/HO-Peco-Code75Finescale.xtp
+++ b/app/lib/params/HO-Peco-Code75Finescale.xtp
@@ -66,70 +66,76 @@ TURNOUT HO "Peco	RH Long Turnout, Electrofrog	SL-E188"
 	C 0 0.000000 39.590004 1.291680 -39.590004 0.000076 12.000152
 	S 0 0.000000 9.523158 -0.865157 10.157480 -1.000000
 	END
+
+SUBCONTENTS Peco HO Scale Code 75 Curved Turnouts
 TURNOUT HO "Peco	Curved Left Turnout, Electrofrog	SL-E187"
 	P "Normal" 1 4 5
 	P "Reverse" 1 2 3
 	E 0.000000 0.000000 270.000000
-	E 9.970000 0.875000 81.000000
-	E 9.725000 1.850000 69.750000
-	S 0 0.000000 0.000000 0.000000 0.648600 0.000000
-	C 0 0.000000 -22.745078 0.648600 22.745078 159.750000 20.250000
-	S 0 0.000000 8.521059 1.405843 9.725000 1.850000
-	C 0 0.000000 -48.243775 0.648600 48.243775 171.000000 9.000000
-	S 0 0.000000 8.195589 0.593961 9.970000 0.875000
-	END
+	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
 TURNOUT HO "Peco	Curved Right Turnout, Electrofrog	SL-E186"
 	P "Normal" 1 4 5
 	P "Reverse" 1 2 3
 	E 0.000000 0.000000 270.000000
-	E 9.970000 -0.875000 99.000000
-	E 9.725000 -1.850000 110.250000
-	S 0 0.000000 0.000000 0.000000 0.648600 0.000000
-	C 0 0.000000 22.745078 0.648600 -22.745078 0.000000 20.250000
-	S 0 0.000000 8.521059 -1.405843 9.725000 -1.850000
-	C 0 0.000000 48.243775 0.648600 -48.243775 0.000000 9.000000
-	S 0 0.000000 8.195589 -0.593961 9.970000 -0.875000
-	END
+	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
+
+SUBCONTENTS Peco HO Scale Code 75 WYE Turnouts
 TURNOUT HO "Peco	Short Y Turnout, Electrofrog	SL-E197"
 	P "Left" 1 2 3
 	P "Right" 1 4 5
 	E 0.000000 0.000000 270.000000
-	E 5.826772 0.696850 78.000000
-	E 5.826772 -0.696850 102.000000
-	S 0 0.000000 0.000000 0.000000 0.648600 0.000000
-	C 0 0.000000 -18.075241 0.648624 18.075241 167.999924 12.000152
-	S 0 0.000000 4.406698 0.394997 5.826772 0.696850
-	C 0 0.000000 18.075241 0.648528 -18.075241 0.000076 12.000152
-	S 0 0.000000 4.406698 -0.394997 5.826772 -0.696850
-	END
+	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
+END
 TURNOUT HO "Peco	Medium Y Turnout, Electrofrog	SL-E198"
 	P "Left" 1 2 3
 	P "Right" 1 4 5
 	E 0.000000 0.000000 270.000000
-	E 8.661417 0.696850 84.000000
-	E 8.661417 -0.696850 96.000000
-	S 0 0.000000 0.000000 0.000000 0.648600 0.000000
-	C 0 0.000000 -26.386054 0.648635 26.386054 173.999924 6.000152
-	S 0 0.000000 3.406761 0.144553 8.661417 0.696850
-	C 0 0.000000 26.386054 0.648495 -26.386054 0.000076 6.000152
-	S 0 0.000000 3.406761 -0.144553 8.661417 -0.696850
-	END
+	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
 TURNOUT HO "Peco	Asymmetric 3 Way Turnout	SL-E199"
 	P "Left" 1 2 3 4
 	P "Normal" 1 2 7
 	P "Right" 1 5 6
 	E 0.000000 0.000000 270.000000
-	E 10.599803 1.023622 78.000000
-	E 8.661417 -1.023622 102.000000
-	E 10.724803 0.000000 90.000000
+	E 10.630315 1.007480 78.088000
+	E 8.535433 -1.007480 101.912000
+	E 10.735433 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 0.649600 -0.000000
-	S 0 0.000000 0.649600 -0.000000 1.510417 0.000000
-	C 0 0.000000 -40.661444 1.510471 40.661444 167.999924 12.000152
-	S 0 0.000000 9.964505 0.888571 10.599803 1.023622
-	C 0 0.000000 30.408937 0.649479 -30.408937 0.000076 12.000152
-	S 0 0.000000 6.972047 -0.664524 8.661417 -1.023622
-	S 0 0.000000 1.510417 0.000000 10.724803 0.000000
+	S 0 0.000000 0.649600 -0.000000 1.623177 0.000000
+	C 0 0.000000 -40.557971 1.623231 40.557971 168.087924 11.912152
+	S 0 0.000000 9.994810 0.873405 10.630315 1.007480
+	C 0 0.000000 29.809939 0.649481 -29.809939 0.000076 11.912152
+	S 0 0.000000 6.802716 -0.641949 8.535433 -1.007480
+	S 0 0.000000 1.623177 0.000000 10.735433 0.000000
 	END
+
+SUBCONTENTS Peco HO Scale Code 75 Slip Turnouts
 TURNOUT HO "Peco	Single Slip, Insulfrog	SL-180"
 	P "Normal" 1 2 0 3 4
 	P "Reverse" 1 5 4
@@ -159,6 +165,8 @@ TURNOUT HO "Peco	Double Slip, Electrofrog	SL-E190"
 	C 0 0.000000 34.292562 1.297233 -34.292562 0.000076 12.000152
 	C 0 0.000000 -34.292562 8.505825 34.292552 180.000076 12.000152
 	END
+
+SUBCONTENTS Peco HO Scale Code 75 CatchPoints
 TURNOUT HO "PECO	RH CatchPoint	SL-184"
 	P "Closed" 1 2
 	P "Open" 1 3
@@ -179,7 +187,8 @@ TURNOUT HO "PECO	LH CatchPoint	SL-185"
     S 0 0.000000 0.649000 0.000000 3.579921 0.000000
 	S 0 0.000000 0.649000 0.000000 2.500000 -0.12500
 	END
-SUBCONTENTS Peco HO Scale Crossings
+
+SUBCONTENTS Peco HO Scale Code 75 Crossings
 TURNOUT HO "Peco	Short Crossing, Insulfrog	SL-193"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
@@ -198,7 +207,8 @@ TURNOUT HO "Peco	Long Crossing, Insulfrog	SL-194"
 	S 0 0.000000 0.000000 0.000000 9.803150 0.000000
 	S 0 0.000000 0.107110 1.019087 9.696040 -1.019087
 	END
-SUBCONTENTS Peco Code 75 Inspection Pit
+
+SUBCONTENTS Peco HO Scale Code 75 Inspection Pit
 TURNOUT HO "Peco Code 75	Inspection Pit	LK-156"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000