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

1 files changed, 166 insertions, 164 deletions

diff --git a/app/lib/params/HO-Marklin C-Track.xtp b/app/lib/params/HO-Marklin C-Track.xtp
index 9f8be72..3fbb566 100644
--- a/app/lib/params/HO-Marklin C-Track.xtp
+++ b/app/lib/params/HO-Marklin C-Track.xtp
@@ -1,8 +1,8 @@
-CONTENTS Märklin C-Track HO-Scale

+CONTENTS Märklin C-Track HO-Scale

 

-SUBCONTENTS Märklin C-Track Straight Tracks

-TURNOUT HO "Märklin C-Track	Straight 64.3mm	24064"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 64.3mm" "24064" 2.531496

+SUBCONTENTS Märklin C-Track Straight Tracks

+TURNOUT HO "Märklin C-Track	Straight 64.3mm	24064"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 64.3mm" "24064" 2.531496

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 2.531496 0.000000 90.000000

@@ -10,8 +10,8 @@ TURNOUT HO "Märklin C-Track	Straight 64.3mm	24064"
 	L 8421376 0.030000 0.000000 0.787400 2.531496 0.787400

 	L 8421376 0.030000 0.000000 -0.787400 2.531496 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	Straight 70.8mm	24071"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 70.8mm" "24071" 2.787401

+TURNOUT HO "Märklin C-Track	Straight 70.8mm	24071"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 70.8mm" "24071" 2.787401

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 2.787401 0.000000 90.000000

@@ -19,8 +19,8 @@ TURNOUT HO "Märklin C-Track	Straight 70.8mm	24071"
 	L 8421376 0.030000 0.000000 0.787400 2.787401 0.787400

 	L 8421376 0.030000 0.000000 -0.787400 2.787401 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	Straight 77.5mm	24077"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 77.5mm" "24077" 3.051181

+TURNOUT HO "Märklin C-Track	Straight 77.5mm	24077"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 77.5mm" "24077" 3.051181

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.051181 0.000000 90.000000

@@ -28,8 +28,8 @@ TURNOUT HO "Märklin C-Track	Straight 77.5mm	24077"
 	L 8421376 0.030000 0.000000 0.787400 3.051181 0.787400

 	L 8421376 0.030000 0.000000 -0.787400 3.051181 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	Straight 94.2mm	24094"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 94.2mm" "24094" 3.708661

+TURNOUT HO "Märklin C-Track	Straight 94.2mm	24094"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 94.2mm" "24094" 3.708661

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.708661 0.000000 90.000000

@@ -37,8 +37,8 @@ TURNOUT HO "Märklin C-Track	Straight 94.2mm	24094"
 	L 8421376 0.030000 0.000000 0.787400 3.708661 0.787400

 	L 8421376 0.030000 0.000000 -0.787400 3.708661 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	Straight 171.7mm	24172"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 171.7mm" "24172" 6.759843

+TURNOUT HO "Märklin C-Track	Straight 171.7mm	24172"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 171.7mm" "24172" 6.759843

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 6.759843 0.000000 90.000000

@@ -46,8 +46,8 @@ TURNOUT HO "Märklin C-Track	Straight 171.7mm	24172"
 	L 8421376 0.030000 0.000000 0.787400 6.759843 0.787400

 	L 8421376 0.030000 0.000000 -0.787400 6.759843 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	Straight 188.3mm	24188"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 188.3mm" "24188" 7.413386

+TURNOUT HO "Märklin C-Track	Straight 188.3mm	24188"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 188.3mm" "24188" 7.413386

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.413386 0.000000 90.000000

@@ -55,26 +55,26 @@ TURNOUT HO "Märklin C-Track	Straight 188.3mm	24188"
 	L 8421376 0.030000 0.000000 0.787400 7.413386 0.787400

 	L 8421376 0.030000 0.000000 -0.787400 7.413386 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	Straight 229.0mm	24229"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 229.0mm" "24229" 9.015748

+TURNOUT HO "Märklin C-Track	Straight 229.3mm	24229"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 229.3mm" "24229" 9.027559

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

-	E 9.015748 0.000000 90.000000

-	S 0 0.000000 0.000000 0.000000 9.015748 0.000000

-	L 8421376 0.030000 0.000000 0.787400 9.015748 0.787400

-	L 8421376 0.030000 0.000000 -0.787400 9.015748 -0.787400

+	E 9.027559 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 9.027559 0.000000

+	L 8421376 0.030000 0.000000 0.787400 9.027559 0.787400

+	L 8421376 0.030000 0.000000 -0.787400 9.027559 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	Straight 236.0mm	24236"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 236.0mm" "24236" 9.291338

+TURNOUT HO "Märklin C-Track	Straight 236.1mm	24236"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 236.1mm" "24236" 9.295276

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

-	E 9.291338 0.000000 90.000000

-	S 0 0.000000 0.000000 0.000000 9.291338 0.000000

-	L 8421376 0.030000 0.000000 0.787400 9.291338 0.787400

-	L 8421376 0.030000 0.000000 -0.787400 9.291338 -0.787400

+	E 9.295276 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 9.295276 0.000000

+	L 8421376 0.030000 0.000000 0.787400 9.295276 0.787400

+	L 8421376 0.030000 0.000000 -0.787400 9.295276 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	Straight 360.0mm	24360"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 360.0mm" "24360" 14.173228

+TURNOUT HO "Märklin C-Track	Straight 360.0mm	24360"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 360.0mm" "24360" 14.173228

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 14.173228 0.000000 90.000000

@@ -83,9 +83,9 @@ TURNOUT HO "Märklin C-Track	Straight 360.0mm	24360"
 	L 8421376 0.030000 0.000000 -0.787400 14.173228 -0.787400

 	END

 

-SUBCONTENTS Märklin C-Track Curve Tracks

-TURNOUT HO "Märklin C-Track	Curved R1=360mm 30°	24130"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R1=360mm 30°" "24130" 14.173228 30.000000

+SUBCONTENTS Märklin C-Track Curve Tracks

+TURNOUT HO "Märklin C-Track	Curved R1=360mm 30°	24130"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R1=360mm 30°" "24130" 14.173228 30.000000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.086614 1.898853 60.000000

@@ -93,8 +93,8 @@ TURNOUT HO "Märklin C-Track	Curved R1=360mm 30°	24130"
 	A 8421376 0.030000 -13.385828 0.000000 14.173228 150.000000 30.000000

 	A 8421376 0.030000 -14.960628 0.000000 14.173228 150.000000 30.000000

 	END

-TURNOUT HO "Märklin C-Track	Curved R1=360mm 15°	24115"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R1=360mm 15°" "24115" 14.173228 15.000000

+TURNOUT HO "Märklin C-Track	Curved R1=360mm 15°	24115"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R1=360mm 15°" "24115" 14.173228 15.000000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.668301 0.482941 75.000000

@@ -102,8 +102,8 @@ TURNOUT HO "Märklin C-Track	Curved R1=360mm 15°	24115"
 	A 8421376 0.030000 -13.385828 0.000000 14.173228 165.000000 15.000000

 	A 8421376 0.030000 -14.960628 0.000000 14.173228 165.000000 15.000000

 	END

-TURNOUT HO "Märklin C-Track	Curved R1=360mm 7.5°	24107"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R1=360mm 7.5°" "24107" 14.173228 7.500000

+TURNOUT HO "Märklin C-Track	Curved R1=360mm 7.5°	24107"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R1=360mm 7.5°" "24107" 14.173228 7.500000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 1.849976 0.121254 82.500000

@@ -111,8 +111,8 @@ TURNOUT HO "Märklin C-Track	Curved R1=360mm 7.5°	24107"
 	A 8421376 0.030000 -13.385828 0.000000 14.173228 172.500000 7.500000

 	A 8421376 0.030000 -14.960628 0.000000 14.173228 172.500000 7.500000

 	END

-TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 30°	24230"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R2=437.5mm 30°" "24230" 17.224409 30.000000

+TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 30°	24230"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R2=437.5mm 30°" "24230" 17.224409 30.000000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 8.612205 2.307633 60.000000

@@ -120,8 +120,8 @@ TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 30°	24230"
 	A 8421376 0.030000 -16.437009 0.000000 17.224409 150.000000 30.000000

 	A 8421376 0.030000 -18.011809 0.000000 17.224409 150.000000 30.000000

 	END

-TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 24.3°	24224"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R2=437.5mm 24.3°" "24224" 17.224409 24.300000

+TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 24.3°	24224"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R2=437.5mm 24.3°" "24224" 17.224409 24.300000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.088092 1.526026 65.700000

@@ -129,8 +129,8 @@ TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 24.3°	24224"
 	A 8421376 0.030000 -16.437009 0.000000 17.224409 155.700000 24.300000

 	A 8421376 0.030000 -18.011809 0.000000 17.224409 155.700000 24.300000

 	END

-TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 15°	24215"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R2=437.5mm 15°" "24215" 17.224409 15.000000

+TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 15°	24215"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R2=437.5mm 15°" "24215" 17.224409 15.000000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 4.458005 0.586908 75.000000

@@ -138,8 +138,8 @@ TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 15°	24215"
 	A 8421376 0.030000 -16.437009 0.000000 17.224409 165.000000 15.000000

 	A 8421376 0.030000 -18.011809 0.000000 17.224409 165.000000 15.000000

 	END

-TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 7.5°	24207"

-	U "Curved Section" "" "Märklin C-Track" "Curved R2=437.5mm 7.5°" "24207" 17.224409 7.500000

+TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 7.5°	24207"

+	U "Curved Section" "" "Märklin C-Track" "Curved R2=437.5mm 7.5°" "24207" 17.224409 7.500000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 2.248235 0.147357 82.500000

@@ -147,8 +147,8 @@ TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 7.5°	24207"
 	A 8421376 0.030000 -16.437009 0.000000 17.224409 172.500076 7.500000

 	A 8421376 0.030000 -18.011809 0.000000 17.224409 172.500076 7.500000

 	END

-TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 5.7°	24206"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R2=437.5mm 5.7°" "24206" 17.224409 5.700000

+TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 5.7°	24206"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R2=437.5mm 5.7°" "24206" 17.224409 5.700000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 1.710724 0.085165 84.300000

@@ -156,8 +156,8 @@ TURNOUT HO "Märklin C-Track	Curved R2=437.5mm 5.7°	24206"
 	A 8421376 0.030000 -16.437009 0.000000 17.224409 174.300000 5.700000

 	A 8421376 0.030000 -18.011809 0.000000 17.224409 174.300000 5.700000

 	END

-TURNOUT HO "Märklin C-Track	Curved R3=515mm 30°	24330"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R3=515mm 30°" "24330" 20.275591 30.000000

+TURNOUT HO "Märklin C-Track	Curved R3=515mm 30°	24330"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R3=515mm 30°" "24330" 20.275591 30.000000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 10.137788 2.716410 60.000000

@@ -165,8 +165,8 @@ TURNOUT HO "Märklin C-Track	Curved R3=515mm 30°	24330"
 	A 8421376 0.030000 -19.488191 0.000000 20.275591 150.000000 30.000000

 	A 8421376 0.030000 -21.062991 0.000000 20.275591 150.000000 30.000000

 	END

-TURNOUT HO "Märklin C-Track	Curved R4=579.3mm 30°	24430"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R4=579.3mm 30°" "24430" 22.812750 30.000000

+TURNOUT HO "Märklin C-Track	Curved R4=579.3mm 30°	24430"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R4=579.3mm 30°" "24430" 22.812750 30.000000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 11.406375 3.056329 60.000000

@@ -174,8 +174,8 @@ TURNOUT HO "Märklin C-Track	Curved R4=579.3mm 30°	24430"
 	A 8421376 0.030000 -22.025350 0.000000 22.812750 150.000000 30.000000

 	A 8421376 0.030000 -23.600150 0.000000 22.812750 150.000000 30.000000

 	END

-TURNOUT HO "Märklin C-Track	Curved R5=643.6mm 30°	24530"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R5=643.6mm 30°" "24530" 25.312500 30.000000

+TURNOUT HO "Märklin C-Track	Curved R5=643.6mm 30°	24530"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R5=643.6mm 30°" "24530" 25.312500 30.000000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 12.656250 3.391232 60.000000

@@ -183,8 +183,8 @@ TURNOUT HO "Märklin C-Track	Curved R5=643.6mm 30°	24530"
 	A 8421376 0.030000 -24.525100 0.000000 25.312500 150.000000 30.000000

 	A 8421376 0.030000 -26.099900 0.000000 25.312500 150.000000 30.000000

 	END

-TURNOUT HO "Märklin C-Track	Curved R=1114.6mm 12.1°	24912"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R=1114.6mm 12.1°" "24912" 43.875000 12.100000

+TURNOUT HO "Märklin C-Track	Curved R=1114.6mm 12.1°	24912"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved R=1114.6mm 12.1°" "24912" 43.875000 12.100000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 9.197014 0.974760 77.900000

@@ -194,9 +194,9 @@ TURNOUT HO "Märklin C-Track	Curved R=1114.6mm 12.1°	24912"
 	END

 

 

-SUBCONTENTS Märklin C-Track Turnouts

-TURNOUT HO "Märklin C-Track	Left Turnout 188.3mm R2=437.5mm 24.3°	24611"

-	U "Regular Turnout" "XtrkCad" "Märklin C-Track" "Left Turnout" "24611" "Right Turnout" "24612" 7.088092 24.300000 1.526026 7.413386

+SUBCONTENTS Märklin C-Track Turnouts

+TURNOUT HO "Märklin C-Track	Left Turnout 188.3mm R2=437.5mm 24.3°	24611"

+	U "Regular Turnout" "XtrkCad" "Märklin C-Track" "Left Turnout" "24611" "Right Turnout" "24612" 7.088092 24.300000 1.526026 7.413386

 	P "Normal" 1 2

 	P "Reverse" 1 3 4

 	E 0.000000 0.000000 270.000000

@@ -211,8 +211,8 @@ TURNOUT HO "Märklin C-Track	Left Turnout 188.3mm R2=437.5mm 24.3°	24611"
 	A 8421376 0.030000 -13.424387 0.648601 14.211787 155.700000 24.300000

 	L 8421376 0.030000 6.180000 1.980000 6.760000 2.240000

 	END

-TURNOUT HO "Märklin C-Track	Right Turnout 188.3mm R2=437.5mm 24.3°	24612"

-	U "Regular Turnout" "XtrkCad" "Märklin C-Track" "Left Turnout" "24611" "Right Turnout" "24612" 7.088092 24.300000 1.526026 7.413386

+TURNOUT HO "Märklin C-Track	Right Turnout 188.3mm R2=437.5mm 24.3°	24612"

+	U "Regular Turnout" "XtrkCad" "Märklin C-Track" "Left Turnout" "24611" "Right Turnout" "24612" 7.088092 24.300000 1.526026 7.413386

 	P "Normal" 1 2

 	P "Reverse" 1 3 4

 	E 0.000000 0.000000 270.000000

@@ -227,8 +227,8 @@ TURNOUT HO "Märklin C-Track	Right Turnout 188.3mm R2=437.5mm 24.3°	24612"
 	A 8421376 0.030000 13.424387 0.648601 -14.211787 0.000000 24.300000

 	L 8421376 0.030000 6.180000 -1.980000 6.760000 -2.240000

 	END

-TURNOUT HO "Märklin C-Track	Curved Left Turnout R1=360mm 30°	24671"

-	U "Curved Turnout" "XtrkCad" "Märklin C-Track" "Curved Left Turnout 30°" "24671" "Curved Right Turnout 30°" "24672" 7.086614 30.000000 1.898853 30.000000 1.898853 10.137795

+TURNOUT HO "Märklin C-Track	Curved Left Turnout R1=360mm 30°	24671"

+	U "Curved Turnout" "XtrkCad" "Märklin C-Track" "Curved Left Turnout 30°" "24671" "Curved Right Turnout 30°" "24672" 7.086614 30.000000 1.898853 30.000000 1.898853 10.137795

 	P "Normal" 1 6 4 5

 	P "Reverse" 1 2 3

 	E -0.054784 -2944.110350 270.000000

@@ -245,8 +245,8 @@ TURNOUT HO "Märklin C-Track	Curved Left Turnout R1=360mm 30°	24671"
 	A 8421376 0.030000 15.047713 2.996397 -2929.822762 150.000000 30.000000

 	L 32768 0.010417 7.413553 -2942.891285 9.697017 -2941.513332

 	END

-TURNOUT HO "Märklin C-Track	Curved Right Turnout R1=360mm 30°	24672"

-	U "Curved Turnout" "XtrkCad" "Märklin C-Track" "Curved Right Turnout 30°" "24672" "Curved Left Turnout 30°" "24671" 7.086614 30.000000 1.898853 30.000000 1.898853 10.137795

+TURNOUT HO "Märklin C-Track	Curved Right Turnout R1=360mm 30°	24672"

+	U "Curved Turnout" "XtrkCad" "Märklin C-Track" "Curved Right Turnout 30°" "24672" "Curved Left Turnout 30°" "24671" 7.086614 30.000000 1.898853 30.000000 1.898853 10.137795

 	P "Normal" 1 6 4 5

 	P "Reverse" 1 2 3

 	E 0.000000 -100.160054 270.000000

@@ -263,8 +263,8 @@ TURNOUT HO "Märklin C-Track	Curved Right Turnout R1=360mm 30°	24672"
 	L 8421376 0.030000 7.440945 -101.365353 9.763780 -102.782676

 	A 8421376 0.030000 15.047562 3.051181 -114.444412 0.000000 29.636472

 	END

-TURNOUT HO "Märklin C-Track	3-way Turnout 188.3mm R2=437.5mm 24.3°	24630"

-	U "3-way Turnout" "XtrkCad" "Märklin C-Track" "3-way Turnout" "24630" 7.079991 24.300000 1.524282 7.413386 1.524282 24.300000 7.079991

+TURNOUT HO "Märklin C-Track	3-way Turnout 188.3mm R2=437.5mm 24.3°	24630"

+	U "3-way Turnout" "XtrkCad" "Märklin C-Track" "3-way Turnout" "24630" 7.079991 24.300000 1.524282 7.413386 1.524282 24.300000 7.079991

 	P "Left" 1 2 3

 	P "Normal" 1 6

 	P "Right" 1 4 5

@@ -281,10 +281,12 @@ TURNOUT HO "Märklin C-Track	3-way Turnout 188.3mm R2=437.5mm 24.3°	24630"
 	A 8421376 0.030000 -16.437009 0.000000 17.224409 155.700000 24.300000

 	A 8421376 0.030000 16.437009 0.000000 -17.224409 0.00000000 24.300000

 	END

-TURNOUT HO "Märklin C-Track	Double Slipswitch 188.3mm R2=437.5mm 24.3°	24624"

-	U "Double Slipswitch" "XtrkCad" "Märklin C-Track" "Double Slip" "24624" 7.413386 24.300000 7.413386

-	P "Normal" 1 2 3 0 4 5 6

-	P "Reverse" 1 7 6 0 4 8 3

+TURNOUT HO "Märklin C-Track	Double Slipswitch 188.3mm R2=437.5mm 24.3°	24624" 512

+	U "Double Slipswitch" "XtrkCad" "Märklin C-Track" "Double Slip" "24624" 7.413386 24.300000 7.413386

+	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 7.413386 0.000000 90.000000

 	E 0.328401 1.525357 294.300000

@@ -304,7 +306,7 @@ TURNOUT HO "Märklin C-Track	Double Slipswitch 188.3mm R2=437.5mm 24.3°	24624"
 	A 8421376 0.030000 13.424387 6.764785 14.211787 180.000000 24.300000

 	L 8421376 0.030000 1.233386 1.980000 0.653386 2.240000

 	END

-TURNOUT HO "Märklin C-Track	Left Turnout 236.1mm R=1114.6mm 12.1°	24711"

+TURNOUT HO "Märklin C-Track	Left Turnout 236.1mm R=1114.6mm 12.1°	24711"

 	P "Normal" 1

 	P "Reverse" 2

 	E 0.000000 0.000000 270.000000

@@ -315,7 +317,7 @@ TURNOUT HO "Märklin C-Track	Left Turnout 236.1mm R=1114.6mm 12.1°	24711"
 	L 8421376 0.030000 0.000000 -0.787400 9.312500 -0.787400

 	A 8421376 0.030000 -43.087600 0.000000 43.875000 167.900000 12.100000

 	END

-TURNOUT HO "Märklin C-Track	Right Turnout 236.1mm R=1114.6mm 12.1°	24712"

+TURNOUT HO "Märklin C-Track	Right Turnout 236.1mm R=1114.6mm 12.1°	24712"

 	P "Normal" 1

 	P "Reverse" 2

 	E 0.000000 0.000000 270.000000

@@ -327,9 +329,9 @@ TURNOUT HO "Märklin C-Track	Right Turnout 236.1mm R=1114.6mm 12.1°	24712"
 	A 8421376 0.030000 43.087600 0.000000 -43.875000 0.000000 12.100000

 	END

 

-SUBCONTENTS Märklin C-Track Crossings

-TURNOUT HO "Märklin C-Track	Double Crossing 188.3mm 24.3°	24640"

-	U "Crossing" "XtrkCad" "Märklin C-Track" "Double Crossing 188.3mm 24.3°" "24640" 7.413386 24.300000 7.413386

+SUBCONTENTS Märklin C-Track Crossings

+TURNOUT HO "Märklin C-Track	Double Crossing 188.3mm 24.3°	24640"

+	U "Crossing" "XtrkCad" "Märklin C-Track" "Double Crossing 188.3mm 24.3°" "24640" 7.413386 24.300000 7.413386

 	P "Normal" 1 0 2

 	E 0.000000 0.000000 270.000000

 	E 7.413386 0.000000 90.000000

@@ -342,8 +344,8 @@ TURNOUT HO "Märklin C-Track	Double Crossing 188.3mm 24.3°	24640"
 	L 8421376 0.030000 0.653386 2.240000 3.900000 0.787400

 	L 8421376 0.030000 6.760000 -2.240000 3.513386 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	Double Crossing 103.3mm 48.6°	24649"

-	U "Crossing" "XtrkCad" "Märklin C-Track" "Double Crossing 103.3mm 48.6°" "24649" 4.066929 48.600000 4.066929

+TURNOUT HO "Märklin C-Track	Double Crossing 103.3mm 48.6°	24649"

+	U "Crossing" "XtrkCad" "Märklin C-Track" "Double Crossing 103.3mm 48.6°" "24649" 4.066929 48.600000 4.066929

 	P "Normal" 1 0 2

 	E 0.000000 0.000000 270.000000

 	E 4.066929 0.000000 90.000000

@@ -356,7 +358,7 @@ TURNOUT HO "Märklin C-Track	Double Crossing 103.3mm 48.6°	24649"
 	L 8421376 0.030000 4.066929 0.787400 2.401575 0.787400

 	L 8421376 0.030000 2.401575 0.787400 1.300000 2.050000

 	END

-TURNOUT HO "Märklin C-Track	Wide Angle Crossing 236.1mm 12.1°	24740"

+TURNOUT HO "Märklin C-Track	Wide Angle Crossing 236.1mm 12.1°	24740"

 	P "Normal" 1 0 2

 	E 0.000000 0.000000 270.000000

 	E 9.312500 0.000000 90.000000

@@ -370,9 +372,9 @@ TURNOUT HO "Märklin C-Track	Wide Angle Crossing 236.1mm 12.1°	24740"
 	L 8421376 0.030000 4.656250 -0.787400 0.268500 -1.745943

 	END

 

-SUBCONTENTS Märklin C-Track Miscellaneous Tracks

-TURNOUT HO "Märklin C-Track	Bumper 77.5mm	24977"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Bumper" "24977" 3.051181 

+SUBCONTENTS Märklin C-Track Miscellaneous Tracks

+TURNOUT HO "Märklin C-Track	Bumper 77.5mm	24977"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Bumper" "24977" 3.051181

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	S 0 0.000000 0.000000 0.000000 3.051181 0.000000

@@ -384,8 +386,8 @@ TURNOUT HO "Märklin C-Track	Bumper 77.5mm	24977"
 		3.040000 0.769333

 		1.653333 0.769333

 	END

-TURNOUT HO "Märklin C-Track	Bumper w/ Lantern 77.5mm	24978"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Bumper w/ Lantern" "24978" 3.051181

+TURNOUT HO "Märklin C-Track	Bumper w/ Lantern 77.5mm	24978"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Bumper w/ Lantern" "24978" 3.051181

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	S 0 0.000000 0.000000 0.000000 3.051181 0.000000

@@ -398,8 +400,8 @@ TURNOUT HO "Märklin C-Track	Bumper w/ Lantern 77.5mm	24978"
 		1.653333 0.769333

 	G 16711680 0.026667 0.362706 1.600000 0.00000

 	END

-TURNOUT HO "Märklin C-Track	End Piece 16.5mm	24001"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "End Piece" "24001" 0.649606

+TURNOUT HO "Märklin C-Track	End Piece 16.5mm	24001"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "End Piece" "24001" 0.649606

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	S 0 0.000000 0.000000 0.000000 0.649606 0.000000

@@ -411,8 +413,8 @@ TURNOUT HO "Märklin C-Track	End Piece 16.5mm	24001"
 		0.649606 0.769333

 		0.1 0.769333

 	END

-TURNOUT HO "Märklin C-Track	Uncoupler 94.2mm	24997"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Uncoupler" "24997" 3.708661

+TURNOUT HO "Märklin C-Track	Uncoupler 94.2mm	24997"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Uncoupler" "24997" 3.708661

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.708661 0.000000 90.000000

@@ -425,8 +427,8 @@ TURNOUT HO "Märklin C-Track	Uncoupler 94.2mm	24997"
 		3.041994 0.090000

 		0.666667 0.090000

 	END

-TURNOUT HO "Märklin C-Track	Contact Track 94.2mm	24995"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Contact Track" "24995" 3.708661

+TURNOUT HO "Märklin C-Track	Contact Track 94.2mm	24995"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Contact Track" "24995" 3.708661

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.708661 0.000000 90.000000

@@ -436,8 +438,8 @@ TURNOUT HO "Märklin C-Track	Contact Track 94.2mm	24995"
 	L 8421376 0.030000 0.000000 -0.787400 3.708661 -0.787400

 	G 16711680 0.030000 0.200000 1.854331 0.75000

 	END

-TURNOUT HO "Märklin C-Track	Straight w/ Contact 94.2mm	24994"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight w/ Contact" "24994" 3.708661

+TURNOUT HO "Märklin C-Track	Straight w/ Contact 94.2mm	24994"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight w/ Contact" "24994" 3.708661

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.708661 0.000000 90.000000

@@ -446,8 +448,8 @@ TURNOUT HO "Märklin C-Track	Straight w/ Contact 94.2mm	24994"
 	L 8421376 0.030000 0.000000 -0.787400 3.708661 -0.787400

 	G 16711680 0.030000 0.400000 1.854331 0.00000

 	END

-TURNOUT HO "Märklin C-Track	Curved w/ Contact R1=360mm 15°	24194"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved w/ Contact R1=360mm 15°" "24194" 14.173228 15.000000

+TURNOUT HO "Märklin C-Track	Curved w/ Contact R1=360mm 15°	24194"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved w/ Contact R1=360mm 15°" "24194" 14.173228 15.000000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.668301 0.482941 75.000000

@@ -456,8 +458,8 @@ TURNOUT HO "Märklin C-Track	Curved w/ Contact R1=360mm 15°	24194"
 	A 8421376 0.030000 -14.960628 0.000000 14.173228 165.000000 15.000000

 	G 16711680 0.030000 0.400000 1.849976 0.121323

 	END

-TURNOUT HO "Märklin C-Track	Curved w/ Contact R2=437.5mm 15°	24294"

-	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved w/ Contact R2=437.5mm 15°" "24294" 17.224409 15.000000

+TURNOUT HO "Märklin C-Track	Curved w/ Contact R2=437.5mm 15°	24294"

+	U "Curved Section" "XtrkCad" "Märklin C-Track" "Curved w/ Contact R2=437.5mm 15°" "24294" 17.224409 15.000000

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 4.458005 0.586908 75.000000

@@ -466,8 +468,8 @@ TURNOUT HO "Märklin C-Track	Curved w/ Contact R2=437.5mm 15°	24294"
 	A 8421376 0.030000 -18.011809 0.000000 17.224409 165.000000 15.000000

 	G 16711680 0.030000 0.400000 2.248233 0.147372

 	END

-TURNOUT HO "Märklin C-Track	K-track Adaptor 180mm	24922"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "K-track Adaptor" "24922" 7.086614

+TURNOUT HO "Märklin C-Track	K-track Adaptor 180mm	24922"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "K-track Adaptor" "24922" 7.086614

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.086614 0.000000 90.000000

@@ -475,8 +477,8 @@ TURNOUT HO "Märklin C-Track	K-track Adaptor 180mm	24922"
 	L 8421376 0.030000 0.000000 0.787400 7.086614 0.787400

 	L 8421376 0.030000 0.000000 -0.787400 7.086614 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	M-Track Adaptor 180mm	24951"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "M-Track Adaptor" "24951" 7.086614

+TURNOUT HO "Märklin C-Track	M-Track Adaptor 180mm	24951"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "M-Track Adaptor" "24951" 7.086614

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.086614 0.000000 90.000000

@@ -484,8 +486,8 @@ TURNOUT HO "Märklin C-Track	M-Track Adaptor 180mm	24951"
 	L 8421376 0.030000 0.000000 0.787400 7.086614 0.787400

 	L 8421376 0.030000 0.000000 -0.787400 7.086614 -0.787400

 	END

-TURNOUT HO "Märklin C-Track	Feeder Trk 188.3mm	24088"

-	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 188.3mm" "24088" 7.413386

+TURNOUT HO "Märklin C-Track	Feeder Trk 188.3mm	24088"

+	U "Straight Section" "XtrkCad" "Märklin C-Track" "Straight 188.3mm" "24088" 7.413386

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.413386 0.000000 90.000000

@@ -495,73 +497,73 @@ TURNOUT HO "Märklin C-Track	Feeder Trk 188.3mm	24088"
 	L 8421376 1.574800 1.574800 -1.574800 3.149600 -1.574800

 	END

 

-SUBCONTENTS Märklin C-Track TurnTable

-TURNOUT HO	"Marklin	C-Track Turntable 10.35"" Dia 12d 30 Positions	74861"						

-	P	"1"	1						

-	P	"2"	2						

-	P	"3"	3						

-	P	"4"	4						

-	P	"5"	5						

-	P	"6"	6						

-	P	"7"	7						

-	P	"8"	8						

-	P	"9"	9						

-	P	"10"	10						

-	P	"11"	11						

-	P	"12"	12						

-	P	"13"	13						

-	P	"14"	14						

-	P	"15"	15						

-	G3	0	0.000000	0.129736	0.000000	0.000000	0		

+SUBCONTENTS Märklin C-Track TurnTable

+TURNOUT HO	"Marklin	C-Track Turntable 10.35"" Dia 12d 30 Positions	74861" 512

+	P	"1"	1

+	P	"2"	2

+	P	"3"	3

+	P	"4"	4

+	P	"5"	5

+	P	"6"	6

+	P	"7"	7

+	P	"8"	8

+	P	"9"	9

+	P	"10"	10

+	P	"11"	11

+	P	"12"	12

+	P	"13"	13

+	P	"14"	14

+	P	"15"	15

+	E	0.000000	5.177154	0.000000

+	E	1.076391	5.064020	12.000000

+	E	2.105738	4.729565	24.000000

+	E	3.043054	4.188405	36.000000

+	E	3.847375	3.464192	48.000000

+	E	4.483546	2.588577	60.000000

+	E	4.923766	1.599828	72.000000

+	E	5.148793	0.541160	84.000000

+	E	5.148793	-0.541160	96.000000

+	E	4.923766	-1.599828	108.000000

+	E	4.483546	-2.588577	120.000000

+	E	3.847375	-3.464192	132.000000

+	E	3.043054	-4.188405	144.000000

+	E	2.105738	-4.729565	156.000000

+	E	1.076391	-5.064020	168.000000

+	E	0.000000	-5.177154	180.000000

+	E	-1.076391	-5.064020	192.000000

+	E	-2.105738	-4.729565	204.000000

+	E	-3.043054	-4.188405	216.000000

+	E	-3.847375	-3.464192	228.000000

+	E	-4.483546	-2.588577	240.000000

+	E	-4.923766	-1.599828	252.000000

+	E	-5.148793	-0.541160	264.000000

+	E	-5.148793	0.541160	276.000000

+	E	-4.923766	1.599828	288.000000

+	E	-4.483546	2.588577	300.000000

+	E	-3.847375	3.464192	312.000000

+	E	-3.043054	4.188405	324.000000

+	E	-2.105738	4.729565	336.000000

+	E	-1.076391	5.064020	348.000000

+	S	16777215	0	0.000000	5.177154	0.000000	-5.177154

+	S	16777215	0	1.076391	5.064020	-1.076391	-5.064020

+	S	16777215	0	2.105738	4.729565	-2.105738	-4.729565

+	S	16777215	0	3.043054	4.188405	-3.043054	-4.188405

+	S	16777215	0	3.847375	3.464192	-3.847375	-3.464192

+	S	16777215	0	4.483546	2.588577	-4.483546	-2.588577

+	S	16777215	0	4.923766	1.599828	-4.923766	-1.599828

+	S	16777215	0	5.148793	0.541160	-5.148793	-0.541160

+	S	16777215	0	5.148793	-0.541160	-5.148793	0.541160

+	S	16777215	0	4.923766	-1.599828	-4.923766	1.599828

+	S	16777215	0	4.483546	-2.588577	-4.483546	2.588577

+	S	16777215	0	3.847375	-3.464192	-3.847375	3.464192

+	S	16777215	0	3.043054	-4.188405	-3.043054	4.188405

+	S	16777215	0	2.105738	-4.729565	-2.105738	4.729565

+	S	16777215	0	1.076391	-5.064020	-1.076391	5.064020

+	G3	0	0.000000	0.129736	0.000000	0.000000	0

 	A3	0	0.031250	5.177154	0.000000	0.000000	0	0.000000	360.000000

 	A3	0	0.031250	7.440945	0.000000	0.000000	0	0.000000	360.000000

-	E	0.000000	5.177154	0.000000					

-	E	1.076391	5.064020	12.000000					

-	E	2.105738	4.729565	24.000000					

-	E	3.043054	4.188405	36.000000					

-	E	3.847375	3.464192	48.000000					

-	E	4.483546	2.588577	60.000000					

-	E	4.923766	1.599828	72.000000					

-	E	5.148793	0.541160	84.000000					

-	E	5.148793	-0.541160	96.000000					

-	E	4.923766	-1.599828	108.000000					

-	E	4.483546	-2.588577	120.000000					

-	E	3.847375	-3.464192	132.000000					

-	E	3.043054	-4.188405	144.000000					

-	E	2.105738	-4.729565	156.000000					

-	E	1.076391	-5.064020	168.000000					

-	E	0.000000	-5.177154	180.000000					

-	E	-1.076391	-5.064020	192.000000					

-	E	-2.105738	-4.729565	204.000000					

-	E	-3.043054	-4.188405	216.000000					

-	E	-3.847375	-3.464192	228.000000					

-	E	-4.483546	-2.588577	240.000000					

-	E	-4.923766	-1.599828	252.000000					

-	E	-5.148793	-0.541160	264.000000					

-	E	-5.148793	0.541160	276.000000					

-	E	-4.923766	1.599828	288.000000					

-	E	-4.483546	2.588577	300.000000					

-	E	-3.847375	3.464192	312.000000					

-	E	-3.043054	4.188405	324.000000					

-	E	-2.105738	4.729565	336.000000					

-	E	-1.076391	5.064020	348.000000					

-	S	16777215	0	0.000000	5.177154	0.000000	-5.177154		

-	S	16777215	0	1.076391	5.064020	-1.076391	-5.064020		

-	S	16777215	0	2.105738	4.729565	-2.105738	-4.729565		

-	S	16777215	0	3.043054	4.188405	-3.043054	-4.188405		

-	S	16777215	0	3.847375	3.464192	-3.847375	-3.464192		

-	S	16777215	0	4.483546	2.588577	-4.483546	-2.588577		

-	S	16777215	0	4.923766	1.599828	-4.923766	-1.599828		

-	S	16777215	0	5.148793	0.541160	-5.148793	-0.541160		

-	S	16777215	0	5.148793	-0.541160	-5.148793	0.541160		

-	S	16777215	0	4.923766	-1.599828	-4.923766	1.599828		

-	S	16777215	0	4.483546	-2.588577	-4.483546	2.588577		

-	S	16777215	0	3.847375	-3.464192	-3.847375	3.464192		

-	S	16777215	0	3.043054	-4.188405	-3.043054	4.188405		

-	S	16777215	0	2.105738	-4.729565	-2.105738	4.729565		

-	S	16777215	0	1.076391	-5.064020	-1.076391	5.064020		

-END									

-TURNOUT HO "Märklin C-Track	Turntable Position Track 57.5mm	74871"

+END

+TURNOUT HO "Märklin C-Track	Turntable Position Track 57.5mm	74871"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 2.263792 0.000000 90.000000