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

1 files changed, 65 insertions, 46 deletions

diff --git a/app/lib/params/HO-Peco-Code100Setrack.xtp b/app/lib/params/HO-Peco-Code100Setrack.xtp
index 3b16768..b331055 100644
--- a/app/lib/params/HO-Peco-Code100Setrack.xtp
+++ b/app/lib/params/HO-Peco-Code100Setrack.xtp
@@ -6,37 +6,37 @@ TURNOUT HO "Peco	Setrack Straight standard	ST-200"
 	E 0.000000 0.000000 270.000000
 	E 6.614173 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 6.614173 0.000000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack Straight double	ST-201"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 13.188976 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 13.188976 0.000000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack Straight half	ST-202"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 3.110236 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 3.110236 0.000000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack Straight Quart	ST-203"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 1.614173 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 1.614173 0.000000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack Straight long	ST-204"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 26.377953 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 26.377953 0.000000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack straight isolation	ST-205"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 6.614173 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 6.614173 0.000000
-	END
+	END$SEGS
 
 SUBCONTENTS Peco HO Setrack - Curve Track
 TURNOUT HO "Peco	Setrack Curve no1 Std	ST-220"
@@ -44,107 +44,126 @@ TURNOUT HO "Peco	Setrack Curve no1 Std	ST-220"
 	E 0.000000 0.000000 270.000000
 	E 5.589589 1.111838 67.500000
 	C 0 0.000000 -14.606299 0.000000 14.606299 157.500000 22.500000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack Curve no1 Dbl	ST-221"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 10.328213 4.278086 45.000000
 	C 0 0.000000 -14.606299 0.000000 14.606299 135.000000 45.000000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack Curve no1 half	ST-222"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 2.849548 0.280656 78.750000
 	C 0 0.000000 -14.606299 0.000000 14.606299 168.750000 11.250000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack curve no2 Std	ST-225"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 6.599029 1.312629 67.500000
 	C 0 0.000000 -17.244094 0.000000 17.244094 157.500000 22.500000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack curve no2 dbl	ST-226"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 12.193416 5.050678 45.000000
 	C 0 0.000000 -17.244094 0.000000 17.244094 135.000000 45.000000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack curve no2 half	ST-227"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 3.364156 0.331340 78.750000
 	C 0 0.000000 -17.244094 0.000000 17.244094 168.750000 11.250000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack curve no3 Std	ST-230"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 7.608470 1.513419 67.500000
 	C 0 0.000000 -19.881890 0.000000 19.881890 157.500000 22.500000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack curve no3 dbl	ST-231"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 14.058619 5.823271 45.000000
 	C 0 0.000000 -19.881890 0.000000 19.881890 135.000000 45.000000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack curve no4 Std	ST-235"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 8.610377 1.712711 67.500000
 	C 0 0.000000 -22.500000 0.000000 22.500000 157.500000 22.500000
-	END
+	END$SEGS
 TURNOUT HO "Peco	Setrack Special Curve	ST-238"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 6.602348 0.650275 78.750000
 	C 0 0.000000 -33.842520 0.000000 33.842520 168.750000 11.250000
-	END
+	END$SEGS
 
 SUBCONTENTS Peco HO Setrack - Turnouts
-TURNOUT HO "Peco	Setrack No.2 Radius LH Turnout, Insulfrog	ST-241"
+TURNOUT HO "Peco	Setrack No.2 Radius RH Turnout, Insulfrog	ST-240"
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
 	E 0.000000 0.000000 270.000000
 	E 6.614173 0.000000 90.000000
-	E 6.599029 1.312629 67.500000
+	E 6.599029 -1.312629 112.500000
 	S 0 0.000000 0.000000 0.000000 0.649637 0.000000
 	S 0 0.000000 0.649637 0.000000 6.614173 0.000000
-	C 0 0.000000 -13.978252 0.649656 13.978252 157.499924 22.500152
-	S 0 0.000000 5.998913 1.064043 6.599029 1.312629
-	END
-TURNOUT HO "Peco	Setrack No.2 Radius RH Turnout, Insulfrog	ST-240"
+	C 0 0.000000 13.978252 0.649582 -13.978252 0.000076 22.500152
+	S 0 0.000000 5.998913 -1.064043 6.599029 -1.312629
+	END$SEGS
+TURNOUT HO "Peco	Setrack No.2 Radius LH Turnout, Insulfrog	ST-241"
 	P "Normal" 1 2
 	P "Reverse" 1 3 4
 	E 0.000000 0.000000 270.000000
 	E 6.614173 0.000000 90.000000
-	E 6.599029 -1.312629 112.500000
+	E 6.599029 1.312629 67.500000
 	S 0 0.000000 0.000000 0.000000 0.649637 0.000000
 	S 0 0.000000 0.649637 0.000000 6.614173 0.000000
-	C 0 0.000000 13.978252 0.649582 -13.978252 0.000076 22.500152
-	S 0 0.000000 5.998913 -1.064043 6.599029 -1.312629
-	END
-TURNOUT HO "Peco	Setrack Curved Double Radius LH Turnout, Insulfrog	ST-245"
-	P "Normal" 2 3 4
-	P "Reverse" 1
-	E 0.000000 0.000000 270.000000
-	E 9.237000 1.313000 67.500000
-	E 9.580306 2.906154 56.250000
-	C 0 0.000000 -17.244094 0.000000 17.244094 146.250000 33.750000
-	S 0 0.000000 0.000000 0.000000 3.000000 0.000000
-	C 0 0.000000 -15.424000 3.000000 15.424000 157.500000 22.500000
-	S 0 0.000000 8.902509 1.174082 9.237000 1.313000
-	END
+	C 0 0.000000 -13.978252 0.649656 13.978252 157.499924 22.500152
+	S 0 0.000000 5.998913 1.064043 6.599029 1.312629
+	END$SEGS
+TURNOUT HO "Peco	Setrack Curved Double Radius RH Turnout(Obsolete), Insulfrog	ST-242"
+	P "Normal" 1 2
+	P "Reverse" 3
+	E 0.000000 0.000000 270.000000
+	E 7.917927 -1.312629 112.500000
+	E 8.114825 -2.461605 123.750000
+	S 0 0.000000 0.000000 0.000000 1.318898 0.000000
+	C 0 0.000000 17.244094 1.318898 -17.244094 0.000000 22.500000
+	C 0 0.000000 14.606299 0.000000 -14.606299 0.000000 33.750000
+	END$SEGS
+TURNOUT HO "Peco	Setrack Curved Double Radius LH Turnout(Obsolete), Insulfrog	ST-243"
+	P "Normal" 1 2
+	P "Reverse" 3
+	E 0.000000 0.000000 270.000000
+	E 7.917927 1.312629 67.500000
+	E 8.114825 2.461605 56.250000
+	S 0 0.000000 0.000000 0.000000 1.318898 0.000000
+	C 0 0.000000 -17.244094 1.318898 17.244094 157.500000 22.500000
+	C 0 0.000000 14.606299 0.000000 14.606299 146.250000 33.750000
+	END$SEGS
 TURNOUT HO "Peco	Setrack Curved Double Radius RH Turnout, Insulfrog	ST-244"
-	P "Normal" 2 3 4
-	P "Reverse" 1
+	P "Normal" 1 2
+	P "Reverse" 3
 	E 0.000000 0.000000 270.000000
-	E 9.237000 -1.313000 112.500000
+	E 9.236824 -1.312629 112.500000
 	E 9.580306 -2.906154 123.750000
+	S 0 0.000000 0.000000 0.000000 2.637795 0.000000
+	C 0 0.000000 17.244094 2.637795 -17.244094 0.000000 22.500000
 	C 0 0.000000 17.244094 0.000000 -17.244094 0.000000 33.750000
-	S 0 0.000000 0.000000 0.000000 3.000000 0.000000
-	C 0 0.000000 15.424000 3.000000 -15.424000 0.000000 22.500000
-	S 0 0.000000 8.902509 -1.174082 9.237000 -1.313000
-	END
+	END$SEGS
+TURNOUT HO "Peco	Setrack Curved Double Radius LH Turnout, Insulfrog	ST-245"
+	P "Normal" 1 2
+	P "Reverse" 3
+	E 0.000000 0.000000 270.000000
+	E 9.236824 1.312629 67.500000
+	E 9.580306 2.906154 56.250000
+	S 0 0.000000 0.000000 0.000000 2.637795 0.000000
+	C 0 0.000000 -17.244094 2.637795 17.244094 157.500000 22.500000
+	C 0 0.000000 17.244094 0.000000 17.244094 146.250000 33.750000
+	END$SEGS
+
 TURNOUT HO "Peco	Setrack Medium Radius Y Turnout, Insulfrog	ST-247"
 	P "Left" 1 2 3
 	P "Right" 1 4 5
@@ -156,7 +175,7 @@ TURNOUT HO "Peco	Setrack Medium Radius Y Turnout, Insulfrog	ST-247"
 	S 0 0.000000 6.055867 0.523550 6.692913 0.650275
 	C 0 0.000000 27.246634 0.740137 -27.246634 0.000076 11.250152
 	S 0 0.000000 6.055867 -0.523550 6.692913 -0.650275
-	END
+	END$SEGS
 
 SUBCONTENTS Peco HO Setrack - Crossing
 TURNOUT HO "Peco	Setrack Medium Diamond Crossing, Insulfrog	ST-250"
@@ -167,4 +186,4 @@ TURNOUT HO "Peco	Setrack Medium Diamond Crossing, Insulfrog	ST-250"
 	E 6.438181 -1.280628 112.500000
 	S 0 0.000000 0.000000 0.000000 6.692913 0.000000
 	S 0 0.000000 0.254732 1.280628 6.438181 -1.280628
-	END
+	END$SEGS