Merge tag 'upstream/4.2.4a'

Upstream version 4.2.4a

1 files changed, 354 insertions, 0 deletions

diff --git a/app/lib/params/N-BritishFinescaleFineTraxC40.xtp b/app/lib/params/N-BritishFinescaleFineTraxC40.xtp
new file mode 100644
index 0000000..5304685
--- /dev/null
+++ b/app/lib/params/N-BritishFinescaleFineTraxC40.xtp
@@ -0,0 +1,354 @@
+CONTENTS British Finescale Code 40 FineTrax Track System

+

+SUBCONTENTS British Finescale Code 40 FineTrax - Track

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax 1000mm Track	2MFL1000"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 39.370079 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 39.370079 0.000000

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax 500mm Track	2MFL500"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 19.685036 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 19.685036 0.000000

+	END

+

+SUBCONTENTS British Finescale Code 40 FineTrax - Turnouts

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax A4 Lefthand Turnout 120.8mm	2MA4L"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 4.755906 0.000000 90.000000

+	E 4.755906 0.606299 75.522476

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 4.755906 0.000000

+	C 0 0.000000 -16.166730 0.354321 16.166730 165.522400 14.477676

+	S 0 0.000000 4.396024 0.513372 4.755906 0.606299

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax A4 Righthand Turnout 120.8mm	2MA4R"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 4.755906 0.000000 90.000000

+	E 4.755906 -0.606299 104.477524

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 4.755906 0.000000

+	C 0 0.000000 16.166730 0.354236 -16.166730 0.000076 14.477676

+	S 0 0.000000 4.396024 -0.513372 4.755906 -0.606299

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax A5 Lefthand Turnout 129.7mm	2MA5L"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 5.106299 0.000000 90.000000

+	E 5.106299 0.566929 78.463031

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 5.106299 0.000000

+	C 0 0.000000 -19.547107 0.354326 19.547107 168.462955 11.537121

+	S 0 0.000000 4.263772 0.394942 5.106299 0.566929

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax A5 Righthand Turnout 129.7mm	2MA5R"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 5.106299 0.000000 90.000000

+	E 5.106299 -0.566929 101.536969

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 5.106299 0.000000

+	C 0 0.000000 19.547107 0.354222 -19.547107 0.000076 11.537121

+	S 0 0.000000 4.263772 -0.394942 5.106299 -0.566929

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax B6 Lefthand Turnout 147.3mm	2MB6L"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.877953 0.000000 90.000000

+	E 6.877953 0.511811 80.405924

+	S 0 0.000000 0.000000 0.000000 1.133581 0.000000

+	S 0 0.000000 1.133581 0.000000 6.877953 0.000000

+	C 0 0.000000 -32.370169 1.133624 32.370169 170.405848 9.594228

+	S 0 0.000000 6.528694 0.452766 6.877953 0.511811

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax B6 Righthand Turnout 147.3mm	2MB6R"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.877953 0.000000 90.000000

+	E 6.877953 -0.511811 99.594076

+	S 0 0.000000 0.000000 0.000000 1.133581 0.000000

+	S 0 0.000000 1.133581 0.000000 6.877953 0.000000

+	C 0 0.000000 32.370169 1.133452 -32.370169 0.000076 9.594228

+	S 0 0.000000 6.528694 -0.452766 6.877953 -0.511811

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax B7 Lefthand Turnout 156.5mm	2MB7L"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.161417 0.000000 90.000000

+	E 6.161417 0.511811 81.786782

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 6.161417 0.000000

+	C 0 0.000000 -31.495064 0.354342 31.495064 171.786706 8.213370

+	S 0 0.000000 4.853678 0.323047 6.161417 0.511811

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax B7 Righthand Turnout 156.5mm	2MB7R"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.161417 0.000000 90.000000

+	E 6.161417 -0.511811 98.213218

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 6.161417 0.000000

+	C 0 0.000000 31.495064 0.354175 -31.495064 0.000076 8.213370

+	S 0 0.000000 4.853678 -0.323047 6.161417 -0.511811

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax B8 Lefthand Turnout 169.8mm	2MB8L"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.685039 0.000000 90.000000

+	E 6.685039 0.511811 82.819238

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 6.685039 0.000000

+	C 0 0.000000 -36.152647 0.354348 36.152647 172.819162 7.180914

+	S 0 0.000000 4.873476 0.283567 6.685039 0.511811

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax B8 Righthand Turnout 169.8mm	2MB8R"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.685039 0.000000 90.000000

+	E 6.685039 -0.511811 97.180762

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 6.685039 0.000000

+	C 0 0.000000 36.152647 0.354156 -36.152647 0.000076 7.180914

+	S 0 0.000000 4.873476 -0.283567 6.685039 -0.511811

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax B9 Lefthand Turnout 171.6mm	2MB9L"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.755906 0.000000 90.000000

+	E 6.755906 0.511811 83.620624

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 6.755906 0.000000

+	C 0 0.000000 -32.728726 0.354343 32.728726 173.620548 6.379528

+	S 0 0.000000 3.990911 0.202666 6.755906 0.511811

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax B9 Righthand Turnout 171.6mm	2MB9R"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.755906 0.000000 90.000000

+	E 6.755906 -0.511811 96.379376

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 6.755906 0.000000

+	C 0 0.000000 32.728726 0.354170 -32.728726 0.000076 6.379528

+	S 0 0.000000 3.990911 -0.202666 6.755906 -0.511811

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax C10 Lefthand Turnout 174.7mm	2MC10L"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.877953 0.000000 90.000000

+	E 6.877953 0.511811 84.260825

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 6.877953 0.000000

+	C 0 0.000000 -28.554033 0.354338 28.554033 174.260749 5.739327

+	S 0 0.000000 3.209779 0.143136 6.877953 0.511811

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax C10 Righthand Turnout 174.7mm	2MC10R"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.877953 0.000000 90.000000

+	E 6.877953 -0.511811 95.739175

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	S 0 0.000000 0.354300 0.000000 6.877953 0.000000

+	C 0 0.000000 28.554033 0.354186 -28.554033 0.000076 5.739327

+	S 0 0.000000 3.209779 -0.143136 6.877953 -0.511811

+	END

+

+SUBCONTENTS British Finescale Code 40 FineTrax - ThreeWay Turnouts

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax B6 Threeway Turnout 196.0mm	2M2W6"

+	P "Left" 1 2 3

+	P "Normal" 1 6

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 7.716535 0.511811 80.405924

+	E 7.716535 -0.511811 99.594076

+	E 7.716535 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 1.972177 0.000000

+	C 0 0.000000 -32.370087 1.972220 32.370087 170.405848 9.594228

+	S 0 0.000000 7.367276 0.452765 7.716535 0.511811

+	C 0 0.000000 32.370087 1.972048 -32.370087 0.000076 9.594228

+	S 0 0.000000 7.367276 -0.452765 7.716535 -0.511811

+	S 0 0.000000 1.972177 0.000000 7.716535 0.000000

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax B8 Threeway Turnout 196.0mm	2M3W8"

+	P "Left" 1 2 3

+	P "Normal" 1 6

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 7.716535 0.511811 82.819238

+	E 7.716535 -0.511811 97.180762

+	E 7.716535 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 0.354300 0.000000

+	C 0 0.000000 -52.592035 0.354370 52.592035 172.819162 7.180914

+	S 0 0.000000 6.928443 0.412510 7.716535 0.511811

+	C 0 0.000000 52.592035 0.354091 -52.592035 0.000076 7.180914

+	S 0 0.000000 6.928443 -0.412510 7.716535 -0.511811

+	S 0 0.000000 0.354300 0.000000 7.716535 0.000000

+	END

+

+SUBCONTENTS British Finescale Code 40 FineTrax - Crossings

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax DC4 Crossing 113.0mm	2MDC4"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 4.448819 0.000000 90.000000

+	E 0.070634 0.556100 284.477524

+	E 4.378185 -0.556100 104.477524

+	S 0 0.000000 0.000000 0.000000 4.448819 0.000000

+	S 0 0.000000 0.070634 0.556100 4.378185 -0.556100

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax DC5 Crossing 142.2mm	2MDC5"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 5.598425 0.000000 90.000000

+	E 0.056555 0.559839 281.536969

+	E 5.541870 -0.559839 101.536969

+	S 0 0.000000 0.000000 0.000000 5.598425 0.000000

+	S 0 0.000000 0.056555 0.559839 5.541870 -0.559839

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax DC6 Crossing 160.6mm	2MDC6"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 6.322835 0.000000 90.000000

+	E 0.044217 0.526899 279.594076

+	E 6.278618 -0.526899 99.594076

+	S 0 0.000000 0.000000 0.000000 6.322835 0.000000

+	S 0 0.000000 0.044217 0.526899 6.278618 -0.526899

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax DC7 Crossing 180.4mm	2MDC7"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 7.102362 0.000000 90.000000

+	E 0.036423 0.507307 278.213218

+	E 7.065940 -0.507307 98.213218

+	S 0 0.000000 0.000000 0.000000 7.102362 0.000000

+	S 0 0.000000 0.036423 0.507307 7.065940 -0.507307

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax DC8 Crossing 200.6mm	2MDC8"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 7.897638 0.000000 90.000000

+	E 0.030971 0.493597 277.180762

+	E 7.866667 -0.493597 97.180762

+	S 0 0.000000 0.000000 0.000000 7.897638 0.000000

+	S 0 0.000000 0.030971 0.493597 7.866667 -0.493597

+	END

+

+SUBCONTENTS British Finescale Code 40 FineTrax - Single Slip Switches

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax SS6 Single Slipswitch 160.2mm	2MSS6"

+	P "Normal" 1 2 0 3 4

+	P "Reverse" 1 5 4

+	E 0.000000 0.000000 270.000000

+	E 6.307087 0.000000 90.000000

+	E 0.044107 0.525586 279.594076

+	E 6.262980 -0.525586 99.594076

+	S 0 0.000000 0.000000 0.000000 0.708738 0.000000

+	S 0 0.000000 0.708738 0.000000 6.307087 0.000000

+	S 0 0.000000 0.044107 0.525586 5.564367 -0.407492

+	S 0 0.000000 5.564367 -0.407492 6.262980 -0.525586

+	C 0 0.000000 29.133317 0.708622 -29.133317 0.000076 9.594228

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax SS7 Single Slipswitch 179.6mm	2MSS7"

+	P "Normal" 1 2 0 3 4

+	P "Reverse" 1 5 4

+	E 0.000000 0.000000 270.000000

+	E 7.070866 0.000000 90.000000

+	E 0.036261 0.505057 278.213218

+	E 7.034605 -0.505057 98.213218

+	S 0 0.000000 0.000000 0.000000 0.708783 0.000000

+	S 0 0.000000 0.708783 0.000000 7.070866 0.000000

+	S 0 0.000000 0.036261 0.505057 6.333377 -0.403835

+	S 0 0.000000 6.333377 -0.403835 7.034605 -0.505057

+	C 0 0.000000 39.371434 0.708626 -39.371434 0.000076 8.213370

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax SS8 Single Slipswitch 200.2mm	2MSS8"

+	P "Normal" 1 2 0 3 4

+	P "Reverse" 1 5 4

+	E 0.000000 0.000000 270.000000

+	E 7.881890 0.000000 90.000000

+	E 0.030909 0.492613 277.180762

+	E 7.850981 -0.492613 97.180762

+	S 0 0.000000 0.000000 0.000000 0.708835 0.000000

+	S 0 0.000000 0.708835 0.000000 7.881890 0.000000

+	S 0 0.000000 0.030909 0.492613 7.148074 -0.404046

+	S 0 0.000000 7.148074 -0.404046 7.850981 -0.492613

+	C 0 0.000000 51.512831 0.708630 -51.512831 0.000076 7.180914

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax OS8 Single Slipswitch 226.5mm	2MOS8"

+	P "Normal" 1 2 0 3 4

+	P "Reverse" 1 5 4

+	E 0.000000 0.000000 270.000000

+	E 8.917323 0.000000 90.000000

+	E 0.034970 0.557327 277.180762

+	E 8.882353 -0.557327 97.180762

+	S 0 0.000000 0.000000 0.000000 0.708868 0.000000

+	S 0 0.000000 0.708868 0.000000 8.917323 0.000000

+	S 0 0.000000 0.034970 0.557327 8.179469 -0.468761

+	S 0 0.000000 8.179469 -0.468761 8.882353 -0.557327

+	C 0 0.000000 59.763549 0.708630 -59.763549 0.000076 7.180914

+	END

+

+SUBCONTENTS British Finescale Code 40 FineTrax - Double Slip Switches

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax DS6 Double Slipswicth 160.2mm	2MDS6"

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

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

+	E 0.000000 0.000000 270.000000

+	E 6.307087 0.000000 90.000000

+	E 0.044107 0.525586 279.594076

+	E 6.262980 -0.525586 99.594076

+	S 0 0.000000 0.000000 0.000000 0.708738 0.000000

+	S 0 0.000000 0.708738 0.000000 5.598348 0.000000

+	S 0 0.000000 5.598348 0.000000 6.307087 0.000000

+	S 0 0.000000 0.044107 0.525586 0.742719 0.407492

+	S 0 0.000000 0.742719 0.407492 5.564367 -0.407492

+	S 0 0.000000 5.564367 -0.407492 6.262980 -0.525586

+	C 0 0.000000 29.133317 0.708622 -29.133317 0.000076 9.594228

+	C 0 0.000000 -29.133317 5.598386 29.133310 180.000076 9.594228

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax DS7 Double Slipswitch 179.6mm	2MDS7"

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

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

+	E 0.000000 0.000000 270.000000

+	E 7.070866 0.000000 90.000000

+	E 0.036261 0.505057 278.213218

+	E 7.034605 -0.505057 98.213218

+	S 0 0.000000 0.000000 0.000000 0.708783 0.000000

+	S 0 0.000000 0.708783 0.000000 6.362083 0.000000

+	S 0 0.000000 6.362083 0.000000 7.070866 0.000000

+	S 0 0.000000 0.036261 0.505057 0.737489 0.403835

+	S 0 0.000000 0.737489 0.403835 6.333377 -0.403835

+	S 0 0.000000 6.333377 -0.403835 7.034605 -0.505057

+	C 0 0.000000 39.371434 0.708626 -39.371434 0.000076 8.213370

+	C 0 0.000000 -39.371434 6.362135 39.371426 180.000076 8.213370

+	END

+TURNOUT N "British Finescale Code 40 FineTrax	FineTrax DS8 Double Slipswitch 200.2mm	2MDS8"

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

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

+	E 0.000000 0.000000 270.000000

+	E 7.881890 0.000000 90.000000

+	E 0.030909 0.492613 277.180762

+	E 7.850981 -0.492613 97.180762

+	S 0 0.000000 0.000000 0.000000 0.708835 0.000000

+	S 0 0.000000 0.708835 0.000000 7.173055 0.000000

+	S 0 0.000000 7.173055 0.000000 7.881890 0.000000

+	S 0 0.000000 0.030909 0.492613 0.733815 0.404046

+	S 0 0.000000 0.733815 0.404046 7.148074 -0.404046

+	S 0 0.000000 7.148074 -0.404046 7.850981 -0.492613

+	C 0 0.000000 51.512831 0.708630 -51.512831 0.000076 7.180914

+	C 0 0.000000 -51.512831 7.173123 51.512822 180.000076 7.180914

+	END