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

1 files changed, 126 insertions, 74 deletions

diff --git a/app/lib/params/HOn30_Minitrains.xtp b/app/lib/params/HOn30_Minitrains.xtp
index 5582df6..c99b391 100644
--- a/app/lib/params/HOn30_Minitrains.xtp
+++ b/app/lib/params/HOn30_Minitrains.xtp
@@ -1,74 +1,126 @@
-CONTENTS Minitrains HOe 009 HOn30   Gleissystem / Track System
-TURNOUT HOn30 "Minitrains	Straight Track 2/1	9311"
-	U "Straight Section" "" "Minitrains" "Straight Track 2/1" "9311" 6.062992 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.062992 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 6.062992 0.000000
-	END
-TURNOUT HOn30 "Minitrains	Straight Track	9301"
-	U "Straight Section" "" "Minitrains" "Straight Track" "9301" 3.031496 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.031496 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 3.031496 0.000000
-	END
-TURNOUT HOn30 "Minitrains	Straight Track	9313"
-	U "Straight Section" "" "Minitrains" "Straight Track" "9313" 2.480315 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 2.480315 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 2.480315 0.000000
-	END
-TURNOUT HOn30 "Minitrains	Feeder Track	9303"
-	U "Straight Section" "" "Minitrains" "Feeder Track" "9303" 6.062992 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.062992 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 6.062992 0.000000
-	END
-TURNOUT HOn30 "Minitrains	Insulated Track	9304"
-	U "Straight Section" "" "Minitrains" "Insulated Track" "9304" 3.031496 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.031496 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 3.031496 0.000000
-	END
-TURNOUT HOn30 "Minitrains	Curved Track 60°	9321"
-	U "Curved Section" "" "Minitrains" "Curved Track 60°" "9321" 5.511811 60.000000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 4.773366 2.755901 30.000000
-	C 0 0.000000 -5.511811 0.000007 5.511811 120.000076 60.000000
-	END
-TURNOUT HOn30 "Minitrains	Curved Track 30°	9302"
-	U "Curved Section" "" "Minitrains" "Curved Track 30°" "9302" 5.511811 30.000000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 2.755903 0.738441 60.000000
-	C 0 0.000000 -5.511811 0.000007 5.511811 150.000076 30.000000
-	END
-TURNOUT HOn30 "Minitrains	Left Hand Turnout	9306"
-	U "Regular Turnout" "" "Minitrains" "Left Hand Turnout" "9306" "Right Hand Turnout" "9316" 2.755906 30.000000 0.708661 3.031496 0.000000 0.000000 0
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 3.031496 0.000000 90.000000
-	E 2.755906 0.708661 60.000000
-	S 0 0.000000 0.000000 0.000000 0.465457 0.000000
-	S 0 0.000000 0.465457 0.000000 3.031496 0.000000
-	C 0 0.000000 -3.967235 0.465463 3.967235 149.999924 30.000152
-	S 0 0.000000 2.449083 0.531513 2.755906 0.708661
-	END
-TURNOUT HOn30 "Minitrains	Right Hand Turnout	9316"
-	U "Regular Turnout" "" "Minitrains" "Left Hand Turnout" "9306" "Right Hand Turnout" "9316" 2.755906 30.000000 0.708661 3.031496 0.000000 0.000000 0
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 3.031496 0.000000 90.000000
-	E 2.755906 -0.708661 120.000000
-	S 0 0.000000 0.000000 0.000000 0.465457 0.000000
-	S 0 0.000000 0.465457 0.000000 3.031496 0.000000
-	C 0 0.000000 3.967235 0.465442 -3.967235 0.000076 30.000152
-	S 0 0.000000 2.449083 -0.531513 2.755906 -0.708661
-	END
+CONTENTS Minitrains HOe 009 HOn30   Gleissystem / Track System

+SUBCONTENTS Minitrains - Straight Tracks

+TURNOUT HOn30 "Minitrains	154mm Straight Track	9311"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.062992 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 6.062992 0.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	114mm Straight Track	9317"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.488189 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 4.488489 0.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	77mm Straight Track	9301"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 3.031496 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 3.031496 0.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	63mm Straight Track	9313"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 2.480315 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 2.480315 0.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	66.5mm Straight Track	9314"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 2.618110 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 2.618110 0.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	38.5mm Straight Track	9315"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.515748 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 1.515748 0.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	154mm Feeder Track	9303"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.062992 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 6.062992 0.000000

+	L3 0 0.020000 2.906496 0.177165 0 2.906496 -0.437500 0

+	L3 0 0.020000 2.906496 -0.437500 0 2.843996 -0.500000 0

+	L3 0 0.020000 2.906496 -0.437500 0 2.968996 -0.500000 0

+	L3 16711680 0.020000 3.156496 -0.177165 0 3.156496 -0.437500 0

+	L3 16711680 0.020000 3.156496 -0.437500 0 3.093996 -0.500000 0

+	L3 16711680 0.020000 3.156496 -0.437500 0 3.218996 -0.500000 0

+	END$SEGS

+TURNOUT HOn30 "Minitrains	77mm Insulated Track	9304"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 3.031496 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 3.031496 0.000000

+	END$SEGS

+

+SUBCONTENTS Minitrains - Curve Tracks

+TURNOUT HOn30 "Minitrains	140mm Curved Track 60d	9321"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.773368 -2.755905 150.000000

+	C 0 0.000000 5.511811 0.000000 -5.511811 0.000000 60.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	140mm Curved Track 30d	9302"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 2.755906 -0.738443 120.000000

+	C 0 0.000000 5.511811 0.000000 -5.511811 0.000000 30.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	215mm Curved Track 32.5d	9341"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.548008 -1.325624 122.500000

+	C 0 0.000000 8.464567 0.000000 -8.464567 0.000000 32.500000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	215mm Curved Track 30d	9340"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.232283 -1.134037 120.000000

+	C 0 0.000000 8.464567 0.000000 -8.464567 0.000000 30.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	215mm Curved Track 15d	9342"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 2.190791 -0.288423 105.000000

+	C 0 0.000000 8.464567 0.000000 -8.464567 0.000000 15.000000

+	END$SEGS

+

+SUBCONTENTS Minitrains - Turnouts/Switches

+TURNOUT HOn30 "Minitrains	Left Hand 30d-R140mm Turnout	9306"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 3.031496 0.000000 90.000000

+	E 2.755906 0.738443 60.000000

+	S 0 0.000000 0.000000 0.000000 3.031496 0.000000

+	C 0 0.000000 5.511811 0.000000 5.511811 150.000000 30.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	Right Hand 30d-R140mm Turnout	9316"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 3.031496 0.000000 90.000000

+	E 2.755906 -0.738443 120.000000

+	S 0 0.000000 0.000000 0.000000 3.031496 0.000000

+	C 0 0.000000 5.511811 0.000000 -5.511811 0.000000 30.000000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	Left Hand 27.5d-R215mm Turnout	9346"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 4.488189 0.000000 90.000000

+	E 3.908502 0.956404 62.500000

+	S 0 0.000000 0.000000 0.000000 4.488189 0.000000

+	C 0 0.000000 8.464567 0.000000 8.464567 152.500000 27.500000

+	END$SEGS

+TURNOUT HOn30 "Minitrains	Right Hand 27.5d-R215mm Turnout	9347"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 4.488189 0.000000 90.000000

+	E 3.908502 -0.956404 117.500000

+	S 0 0.000000 0.000000 0.000000 4.488189 0.000000

+	C 0 0.000000 8.464567 0.000000 -8.464567 0.000000 27.500000

+	END$SEGS