Update upstream source from tag 'upstream/5.3.0GA'

Update to upstream version '5.3.0GA'
with Debian dir dfd14d63b0238e276ade6f54dd9100325df5b2f9

1 files changed, 228 insertions, 228 deletions

diff --git a/app/lib/params/TT-Berliner.xtp b/app/lib/params/TT-Berliner.xtp
index 94a3663..42298ff 100644
--- a/app/lib/params/TT-Berliner.xtp
+++ b/app/lib/params/TT-Berliner.xtp
@@ -1,228 +1,228 @@
-CONTENTS Berliner Track System

-SUBCONTENTS Berliner TT-Scale Track - Straight Track

-TURNOUT TT  "Berliner Track	Straight 228mm	6110"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 8.976378 0.000000 90.000000

-	S 0 0 0.000000 0.000000 8.976378 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Straight 114mm	6120"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 4.488189 0.000000 90.000000

-	S 0 0 0.000000 0.000000 4.488189 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Straight 105mm	6130"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 4.133858 0.000000 90.000000

-	S 0 0 0.000000 0.000000 4.133858 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Straight 57mm	6140"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.244094 0.000000 90.000000

-	S 0 0 0.000000 0.000000 2.244094 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Straight 14.5mm	6150"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 0.570866 0.000000 90.000000

-	S 0 0 0.000000 0.000000 0.570866 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Straight 5.4mm	D"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 0.212598 0.000000 90.000000

-	S 0 0 0.000000 0.000000 0.212598 0.000000

-	END$SEGS

-

-

-SUBCONTENTS Berliner TT-Scale Track - Curve Track

-TURNOUT TT  "Berliner Track	Curve 286mm 7.5°	6210"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 1.469704 -0.096330 97.500000

-	C 0 0 11.259843 0.000000 -11.259843 0.000000 7.500000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Curve 286mm 11.25°	6220"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.196686 -0.216355 101.250000

-	C 0 0 11.259843 0.000000 -11.259843 0.000000 11.2500000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Curve 286mm 22.5°	6230"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 4.308955 -0.857104 112.500000

-	C 0 0 11.259843 0.000000 -11.259843 0.000000 22.500000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Curve 286mm 45°	6240"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 7.961911 -3.297932 135.000000

-	C 0 0 11.259843 0.000000 -11.259843 0.000000 45.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Curve 330mm 7.5°	6310"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 1.695813 -0.111149 97.500000

-	C 0 0 12.992126 0.000000 -12.992126 0.000000 7.500000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Curve 330mm 11.25°	6320"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.534638 -0.249640 101.250000

-	C 0 0 12.992126 0.000000 -12.992126 0.000000 11.2500000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Curve 330mm 22.5°	6330"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 4.971871 -0.988967 112.500000

-	C 0 0 12.992126 0.000000 -12.992126 0.000000 22.500000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Curve 556mm 15°	6340"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 5.665488 -0.745876 105.000000

-	C 0 0 21.889764 0.000000 -21.889764 0.000000 15.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Curve 600mm 15°	6350"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 6.113836 -0.804902 105.000000

-	C 0 0 23.622047 0.000000 -23.622047 0.000000 15.000000

-	END$SEGS

-

-

-SUBCONTENTS Berliner TT-Scale Track - Misc

-TURNOUT TT  "Berliner Track	Power Feed 57mm	6510"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.244094 0.000000 90.000000

-	S 0 0 0.000000 0.000000 2.244094 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Power Feed 286mm 45°	6520"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 7.961911 -3.297932 135.000000

-	C 0 0 11.259843 0.000000 -11.259843 0.000000 45.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Unbreaker 57mm	6610"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.244094 0.000000 90.000000

-	S 0 0 0.000000 0.000000 2.244094 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Separation 57mm	6620"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.244094 0.000000 90.000000

-	S 0 0 0.000000 0.000000 2.244094 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Rectifier 57mm	6630"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.244094 0.000000 90.000000

-	S 0 0 0.000000 0.000000 2.244094 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Switching 57mm	6640"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.244094 0.000000 90.000000

-	S 0 0 0.000000 0.000000 2.244094 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	uncoupling 114mm	6710"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 4.488189 0.000000 90.000000

-	S 0 0 0.000000 0.000000 4.488189 0.000000

-	END$SEGS

-TURNOUT TT  "Berliner Track	Buffer	6730"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	S 0 0 0.000000 0.000000 2.244094 0.000000

-	L3 9127187 1.000000 2.244094 0.000000 0 3.244094 0.000000 0

-	END$SEGS

-TURNOUT TT  "Berliner Track	Buffer	7150"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	S 0 0 0.000000 0.000000 1.000000 0.000000

-	L3 9127187 1.000000 0.000000 0.000000 0 1.000000 0.000000 0

-	END$SEGS

-

-

-SUBCONTENTS Berliner TT-Scale Track - Turnouts

-TURNOUT TT "Berliner Track	Left Turnout R286 22.5d	6813"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 4.488189 0.000000 90.000000

-	E 4.308955 0.857104 67.500000

-	S 0 0.000000 0.000000 0.000000 4.488189 0.000000

-	C 0 0 11.259843 0.000000 11.259843 157.500000 22.500000

-	END$SEGS

-TURNOUT TT "Berliner Track	Right Turnout R286 22.5d	6814"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 4.488189 0.000000 90.000000

-	E 4.308955 -0.857104 112.500000

-	S 0 0.000000 0.000000 0.000000 4.488189 0.000000

-	C 0 0 11.259843 0.000000 -11.259843 0.000000 22.500000

-	END$SEGS

-TURNOUT TT "Berliner Track	Left Curve Turnout R286/600 30/15d	6851"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 6.113836 0.804902 75.000000

-	E 5.629921 1.508533 60.000000

-	C 0 0 23.622047 0.000000 23.622047 165.000000 15.000000

-	C 0 0 11.259843 0.000000 11.259843 150.000000 30.000000

-	END$SEGS

-TURNOUT TT "Berliner Track	Right Curve Turnout R286/600 30/15d	6852"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 6.113836 -0.804902 105.000000

-	E 5.629921 -1.508533 120.000000

-	C 0 0 23.622047 0.000000 -23.622047 0.000000 15.000000

-	C 0 0 11.259843 0.000000 -11.259843 0.000000 30.000000

-	END$SEGS

-TURNOUT TT "Berliner Track	Double-Slip Turnout 142mm 22.5d	6860"

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

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

-	E 0.000000 0.000000 270.000000

-	E 5.590551 0.000000 90.000000

-	E 0.212776 1.069701 292.500000

-	E 5.377775 -1.069701 112.500000

-	S 0 0.000000 0.000000 0.000000 0.944050 0.000000

-	S 0 0.000000 0.944050 0.000000 4.646501 0.000000

-	S 0 0.000000 4.646501 0.000000 5.590551 0.000000

-	S 0 0.000000 0.212776 1.069701 1.084895 0.708452

-	S 0 0.000000 1.084895 0.708452 4.505656 -0.708452

-	S 0 0.000000 4.505656 -0.708452 5.377775 -1.069701

-	C 0 0.000000 9.306875 0.944013 -9.306875 0.000076 22.500152

-	C 0 0.000000 -9.306875 4.646513 9.306870 180.000076 22.500152

-	END$SEGS

-

-

-SUBCONTENTS Berliner TT-Scale Track - Crossings

-TURNOUT TT "Berliner Track	Crossing 114mm 22.5d	6910"

-	P "Normal" 1 0 2

-	E 0.000000 0.000000 270.000000

-	E 4.488189 0.000000 90.000000

-	E 0.170820 0.858774 292.500000

-	E 4.317369 -0.858774 112.500000

-	S 0 0.000000 0.000000 0.000000 4.488189 0.000000

-	S 0 0.000000 0.170820 0.858774 4.317369 -0.858774

-	END$SEGS

-TURNOUT TT "Berliner Track	Crossing 57mm 45d	6920"

-	P "Normal" 1 0 2

-	E 0.000000 0.000000 270.000000

-	E 2.244094 0.000000 90.000000

-	E 0.328638 0.793405 315.000000

-	E 1.915456 -0.793405 135.000000

-	S 0 0.000000 0.000000 0.000000 2.244094 0.000000

-	S 0 0.000000 0.328638 0.793405 1.915456 -0.793405

-	END$SEGS

+CONTENTS Berliner Track System
+SUBCONTENTS Berliner TT-Scale Track - Straight Track
+TURNOUT TT  "Berliner Track	Straight 228mm	6110"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 8.976378 0.000000 90.000000
+	S 0 0 0.000000 0.000000 8.976378 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Straight 114mm	6120"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.488189 0.000000 90.000000
+	S 0 0 0.000000 0.000000 4.488189 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Straight 105mm	6130"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.133858 0.000000 90.000000
+	S 0 0 0.000000 0.000000 4.133858 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Straight 57mm	6140"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.244094 0.000000 90.000000
+	S 0 0 0.000000 0.000000 2.244094 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Straight 14.5mm	6150"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 0.570866 0.000000 90.000000
+	S 0 0 0.000000 0.000000 0.570866 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Straight 5.4mm	D"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 0.212598 0.000000 90.000000
+	S 0 0 0.000000 0.000000 0.212598 0.000000
+	END$SEGS
+
+
+SUBCONTENTS Berliner TT-Scale Track - Curve Track
+TURNOUT TT  "Berliner Track	Curve 286mm 7.5°	6210"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 1.469704 -0.096330 97.500000
+	C 0 0 11.259843 0.000000 -11.259843 0.000000 7.500000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Curve 286mm 11.25°	6220"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.196686 -0.216355 101.250000
+	C 0 0 11.259843 0.000000 -11.259843 0.000000 11.2500000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Curve 286mm 22.5°	6230"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.308955 -0.857104 112.500000
+	C 0 0 11.259843 0.000000 -11.259843 0.000000 22.500000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Curve 286mm 45°	6240"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 7.961911 -3.297932 135.000000
+	C 0 0 11.259843 0.000000 -11.259843 0.000000 45.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Curve 330mm 7.5°	6310"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 1.695813 -0.111149 97.500000
+	C 0 0 12.992126 0.000000 -12.992126 0.000000 7.500000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Curve 330mm 11.25°	6320"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.534638 -0.249640 101.250000
+	C 0 0 12.992126 0.000000 -12.992126 0.000000 11.2500000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Curve 330mm 22.5°	6330"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.971871 -0.988967 112.500000
+	C 0 0 12.992126 0.000000 -12.992126 0.000000 22.500000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Curve 556mm 15°	6340"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 5.665488 -0.745876 105.000000
+	C 0 0 21.889764 0.000000 -21.889764 0.000000 15.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Curve 600mm 15°	6350"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.113836 -0.804902 105.000000
+	C 0 0 23.622047 0.000000 -23.622047 0.000000 15.000000
+	END$SEGS
+
+
+SUBCONTENTS Berliner TT-Scale Track - Misc
+TURNOUT TT  "Berliner Track	Power Feed 57mm	6510"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.244094 0.000000 90.000000
+	S 0 0 0.000000 0.000000 2.244094 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Power Feed 286mm 45°	6520"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 7.961911 -3.297932 135.000000
+	C 0 0 11.259843 0.000000 -11.259843 0.000000 45.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Unbreaker 57mm	6610"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.244094 0.000000 90.000000
+	S 0 0 0.000000 0.000000 2.244094 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Separation 57mm	6620"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.244094 0.000000 90.000000
+	S 0 0 0.000000 0.000000 2.244094 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Rectifier 57mm	6630"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.244094 0.000000 90.000000
+	S 0 0 0.000000 0.000000 2.244094 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Switching 57mm	6640"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.244094 0.000000 90.000000
+	S 0 0 0.000000 0.000000 2.244094 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	uncoupling 114mm	6710"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.488189 0.000000 90.000000
+	S 0 0 0.000000 0.000000 4.488189 0.000000
+	END$SEGS
+TURNOUT TT  "Berliner Track	Buffer	6730"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	S 0 0 0.000000 0.000000 2.244094 0.000000
+	L3 9127187 1.000000 2.244094 0.000000 0 3.244094 0.000000 0
+	END$SEGS
+TURNOUT TT  "Berliner Track	Buffer	7150"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	S 0 0 0.000000 0.000000 1.000000 0.000000
+	L3 9127187 1.000000 0.000000 0.000000 0 1.000000 0.000000 0
+	END$SEGS
+
+
+SUBCONTENTS Berliner TT-Scale Track - Turnouts
+TURNOUT TT "Berliner Track	Left Turnout R286 22.5d	6813"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 4.488189 0.000000 90.000000
+	E 4.308955 0.857104 67.500000
+	S 0 0.000000 0.000000 0.000000 4.488189 0.000000
+	C 0 0 11.259843 0.000000 11.259843 157.500000 22.500000
+	END$SEGS
+TURNOUT TT "Berliner Track	Right Turnout R286 22.5d	6814"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 4.488189 0.000000 90.000000
+	E 4.308955 -0.857104 112.500000
+	S 0 0.000000 0.000000 0.000000 4.488189 0.000000
+	C 0 0 11.259843 0.000000 -11.259843 0.000000 22.500000
+	END$SEGS
+TURNOUT TT "Berliner Track	Left Curve Turnout R286/600 30/15d	6851"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 6.113836 0.804902 75.000000
+	E 5.629921 1.508533 60.000000
+	C 0 0 23.622047 0.000000 23.622047 165.000000 15.000000
+	C 0 0 11.259843 0.000000 11.259843 150.000000 30.000000
+	END$SEGS
+TURNOUT TT "Berliner Track	Right Curve Turnout R286/600 30/15d	6852"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 6.113836 -0.804902 105.000000
+	E 5.629921 -1.508533 120.000000
+	C 0 0 23.622047 0.000000 -23.622047 0.000000 15.000000
+	C 0 0 11.259843 0.000000 -11.259843 0.000000 30.000000
+	END$SEGS
+TURNOUT TT "Berliner Track	Double-Slip Turnout 142mm 22.5d	6860"
+	P "N" 1 2 3 0 4 5 6
+	P "R" 1 7 6 0 4 8 3
+	E 0.000000 0.000000 270.000000
+	E 5.590551 0.000000 90.000000
+	E 0.212776 1.069701 292.500000
+	E 5.377775 -1.069701 112.500000
+	S 0 0.000000 0.000000 0.000000 0.944050 0.000000
+	S 0 0.000000 0.944050 0.000000 4.646501 0.000000
+	S 0 0.000000 4.646501 0.000000 5.590551 0.000000
+	S 0 0.000000 0.212776 1.069701 1.084895 0.708452
+	S 0 0.000000 1.084895 0.708452 4.505656 -0.708452
+	S 0 0.000000 4.505656 -0.708452 5.377775 -1.069701
+	C 0 0.000000 9.306875 0.944013 -9.306875 0.000076 22.500152
+	C 0 0.000000 -9.306875 4.646513 9.306870 180.000076 22.500152
+	END$SEGS
+
+
+SUBCONTENTS Berliner TT-Scale Track - Crossings
+TURNOUT TT "Berliner Track	Crossing 114mm 22.5d	6910"
+	P "Normal" 1 0 2
+	E 0.000000 0.000000 270.000000
+	E 4.488189 0.000000 90.000000
+	E 0.170820 0.858774 292.500000
+	E 4.317369 -0.858774 112.500000
+	S 0 0.000000 0.000000 0.000000 4.488189 0.000000
+	S 0 0.000000 0.170820 0.858774 4.317369 -0.858774
+	END$SEGS
+TURNOUT TT "Berliner Track	Crossing 57mm 45d	6920"
+	P "Normal" 1 0 2
+	E 0.000000 0.000000 270.000000
+	E 2.244094 0.000000 90.000000
+	E 0.328638 0.793405 315.000000
+	E 1.915456 -0.793405 135.000000
+	S 0 0.000000 0.000000 0.000000 2.244094 0.000000
+	S 0 0.000000 0.328638 0.793405 1.915456 -0.793405
+	END$SEGS