New upstream version 5.1.2aupstream/5.1.2a

1 files changed, 57 insertions, 49 deletions

diff --git a/app/lib/params/HO-Peco-Code100Streamline.xtp b/app/lib/params/HO-Peco-Code100Streamline.xtp
index 23924a5..a60fe62 100644
--- a/app/lib/params/HO-Peco-Code100Streamline.xtp
+++ b/app/lib/params/HO-Peco-Code100Streamline.xtp
@@ -66,69 +66,75 @@ TURNOUT HO "Peco	RH Long Turnout, Insulfrog	SL-88"
 	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 100 Curved Turnouts
 TURNOUT HO "Peco	Curved Left Turnout	SL-87"
 	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	SL-86"
 	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 100 WYE Turnouts
 TURNOUT HO "Peco	Short Y Turnout	SL-97"
 	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
+	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	Large Y Turnout	SL-98"
 	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	Medium Radius 3 Way Turnout, Insulfrog	SL-99"
 	P "Left" 1 2 3
 	P "Normal" 1 6
 	P "Right" 1 4 5
 	E 0.000000 0.000000 270.000000
-	E 8.661417 1.000000 78.000000
-	E 8.661417 -1.000000 102.000000
-	E 8.661417 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 0.648600 0.000000
-	C 0 0.000000 -31.475814 0.648642 31.475814 167.999924 12.000152
-	S 0 0.000000 7.192866 0.687838 8.661417 1.000000
-	C 0 0.000000 31.475814 0.648475 -31.475814 0.000076 12.000152
-	S 0 0.000000 7.192866 -0.687838 8.661417 -1.000000
-	S 0 0.000000 0.648600 0.000000 8.661417 0.000000
-	END
+	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
+
+SUBCONTENTS Peco HO Scale Code 100 Slip Turnouts
 TURNOUT HO "Peco	Single Slip, Insulfrog	SL-80"
 	P "Normal" 1 2 0 3 4
 	P "Reverse" 1 5 4
@@ -141,7 +147,7 @@ TURNOUT HO "Peco	Single Slip, Insulfrog	SL-80"
 	S 0 0.000000 0.107110 1.019087 8.427277 -0.749392
 	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
+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
@@ -157,7 +163,9 @@ TURNOUT HO "Peco	Double Slip, Insulfrog	SL-90"
 	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
 	C 0 0.000000 -34.292562 8.505825 34.292552 180.000076 12.000152
-	END
+END
+
+SUBCONTENTS Peco HO Scale Code 100 CatchPoints
 TURNOUT HO "PECO	RH CatchPoint	SL-84"
 	P "Closed" 1 2
 	P "Open" 1 3
@@ -167,7 +175,7 @@ TURNOUT HO "PECO	RH CatchPoint	SL-84"
 	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
+END
 TURNOUT HO "PECO	LH CatchPoint	SL-85"
 	P "Closed" 1 2
 	P "Open" 1 3
@@ -177,7 +185,8 @@ TURNOUT HO "PECO	LH CatchPoint	SL-85"
 	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
+END
+
 SUBCONTENTS Peco HO Scale Crossings
 TURNOUT HO "Peco	Short Crossing, Insulfrog	SL-93"
 	P "Normal" 1 0 2
@@ -187,7 +196,7 @@ TURNOUT HO "Peco	Short Crossing, Insulfrog	SL-93"
 	E 4.783865 -1.016838 114.000000
 	S 0 0.000000 0.000000 0.000000 5.000000 0.000000
 	S 0 0.000000 0.216135 1.016838 4.783865 -1.016838
-	END
+END
 TURNOUT HO "Peco	Long Crossing, Insulfrog	SL-94"
 	P "Normal" 1 0 2
 	E 0.000000 0.000000 270.000000
@@ -196,7 +205,7 @@ TURNOUT HO "Peco	Long Crossing, Insulfrog	SL-94"
 	E 9.696040 -1.019087 102.000000
 	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
+END
 
 SUBCONTENTS Peco HO Scale Code 100 Inspection Pit
 TURNOUT HO "Peco	Inspection Pit (Code 100)	LK-56"
@@ -268,7 +277,6 @@ TURNOUT HO "Peco Code 100	Inspection Pit(Stair End)	LK-56A"
 	L 0 0.020000 0.000000 0.280000 1.948819 0.28000
 	L 0 0.020000 0.000000 -0.280000 1.948819 -0.280000
 	L 0 0.020000 0.000000 -0.551091 1.948819 -0.551091
-	
 END
 TURNOUT HO "Peco Code 100	Inspection Pit(Mid Section)	LK-56B"
 	P "Normal" 1
@@ -285,4 +293,4 @@ TURNOUT HO "Peco Code 100	Inspection Pit(Mid Section)	LK-56B"
 	L 0 0.020000 0.000000 0.280000 1.948819 0.28000
 	L 0 0.020000 0.000000 -0.280000 1.948819 -0.280000
 	L 0 0.020000 0.000000 -0.551091 1.948819 -0.551091
-END
\ No newline at end of file
+END