Merge tag 'upstream/4.3.0'

Upstream version 4.3.0

17 files changed, 1887 insertions, 936 deletions

diff --git a/app/lib/CMakeLists.txt b/app/lib/CMakeLists.txt
index 2ec9d2d..3de124e 100644
--- a/app/lib/CMakeLists.txt
+++ b/app/lib/CMakeLists.txt
@@ -15,3 +15,14 @@ INSTALL(FILES
 	xtrkcad.xtq
 	DESTINATION ${XTRKCAD_SHARE_INSTALL_DIR}
 	)
+
+IF(UNIX AND NOT APPLE)
+	INSTALL(FILES
+		xtrkcad.desktop
+		DESTINATION "/usr/share/applications"
+		)
+	INSTALL(FILES
+		xtrkcad.png
+		DESTINATION "/usr/share/pixmaps"
+		)
+ENDIF(UNIX AND NOT APPLE)
\ No newline at end of file
diff --git a/app/lib/Readme.md b/app/lib/Readme.md
index 297fd18..dfa904d 100644
--- a/app/lib/Readme.md
+++ b/app/lib/Readme.md
@@ -1,4 +1,4 @@
-# XTrackCAD 4.2.4a #
+# XTrackCAD 4.3.0 #
 
 This file contains installation instructions and up-to-date information regarding XTrackCad.
 
@@ -39,6 +39,25 @@ you can find in the file COPYING.
 
 ## New features ##
 
+### Version 4.3.0 ###
+
+* Linux: Install xtrkcad.desktop and xtrkcad.png for desktop integration
+* All: Fix color button initialization
+* Add control and sensor types
+* Development of signal feature was finished
+* Add extra AppleHelp files
+* All: Add documentation for layout control elements
+* Write proper Describe, Move, and Rotate functions for Signals.
+* Add high lighting for signals.
+* Add AppleHelp bundle generation including index
+* First pass at high lighting layout control elements.
+* Linux/OSX: Set directory for rc file
+* All: Rework DXF export, add support for metric measurements
+* All: Add dynstring to build and modify DynstrMalloc interface
+* All: Add dynstring library and unit tests
+* All: enable unit testing with CMocka
+* Add Layout Control Element management dialog
+
 ### Version 4.2.4 ###
 * All: Parameter file for Minitrains HOe-009-HOn30 Track System
 * All: Improved and new parameter files Kato N and Super O
@@ -94,7 +113,46 @@ you can find in the file COPYING.
 * Update help CSS to the Wiki's new default look
 
 ## Bugs fixed ##
+
+### Version 4.3.0 ###
+* All: Save and set user defined values for Text command
+* All: Fix path handling error after Save/Save As
+* All: Fix color button initialization
+* Fix Malloc error (wrong size in ReadBlock, causing Guard1 hose error)
+* Updated cblock.c and cswitchmotor.c to handle possible broken blocks and switchmotors and not crash (check for NULL pointers)
+* Bulletproof against undefined (NULL pointer) track segments in SwitchMotor code.
+* Bulletproof against undefined (NULL pointer) track segments in Block code.
+* Linux/OSX: Preparing for GTK3 migration, second set of changes
+* Clean up help files for Apple Help Indexer
+* Linux/OSX: Preparing for GTK3 migration, first set of changes
+* All: New and updated parameter files for Lego and Peco H0 Code 83
+* Linux/OSX: Add OSX specific files
+* Linux/OSX: Split help functions in generic and platform specific piece
+* Description: Correct some translation typos
+* Linux/OSX: Fix #163 GCC format-security errors
+* All: Update parameter file for Kuehn TT track
+* Add forward reference resolution for Blocks and Switchmotors
+* Cleanly delete blocks and switch motors when their tracks are deleted (avoid dangling pointers)
+* Updated Spec file
+* Expand help path name for longer bundle directories
+* Attempt to fix help files crash issue
+* Add GLIB Schemas to GTK-Bundle
+* All: Improved German translations
+* Update Readme for OSX package
+* Add support for gtk-mac-bundler
+* fix bugs in xtrkcad-bundler code
+* Fix parm dialog default for GTK builds
+* Add a post-build script for auto-creating OSX images
+* Remove failing copy command for gtk-bundle share
+* Linux/OSX: Fix uninitialized param file directory on first run
+* All: Add TTi scale / gauge
+* All: New paramter files for Frateschi HO and Auhagen TTi
+
 ### Version 4.2.4a ###
+* All: Update help
+* Linux: Installation from self extracting archive accepts install path
+* Linux/OSX: Remove absolute path from source packages
+* All: remove all dependencies on obsolete XTRKCAD_USE_LAYOUTCONTROL conditional
 * All: New parameter file for Micro Engineering HOn3 Turnouts
 * Windows: Fix bug 157 Crash on color change when drawing lines
 * All: Updated parameter file for Kato N scale
@@ -242,19 +300,19 @@ self-installing program using the NSIS Installer from Nullsoft Inc.
 Using Windows Explorer, locate the directory in which you downloaded or copied your new version of XTrackCAD.
 
 Start the installation program by double clicking on the 
-**[xtrkcad-setup-4.2.4.exe][]** file icon.
+**[xtrkcad-setup-4.3.0.exe][]** file icon.
 
 Follow the steps in the installation program.
 
 The installation lets you define the directory into which XTrackCAD is 
 installed. The directory is created automatically if it doesn't already exist.
 
-A program folder named XTrackCAD 4.2.4 will be created during the installation 
+A program folder named XTrackCAD 4.3.0 will be created during the installation 
 process. This folder contains the program, documentation, parameter and 
 example files. An existing installation of earlier versions of XTrackCad is 
 not overwritten. 
 
-A new program group named XTrackCad 4.2.4 will be created in the Start menu. 
+A new program group named XTrackCad 4.3.0 will be created in the Start menu. 
 
 ## Linux ##
 
@@ -269,7 +327,7 @@ Use your operating system's package manager to install XTrackCAD.
 
 After downloading open a command line then 
 
-    ./xtrkcad-setup-4.2.4.x86_64.sh --prefix=/usr/local --exclude-subdir
+    ./xtrkcad-setup-4.3.0.x86_64.sh --prefix=/usr/local --exclude-subdir
 
 This will install the executable in /usr/local/bin. A directory named 
 xtrkcad will be created in /usr/local/share and all files will be unpacked
diff --git a/app/lib/Readme.txt b/app/lib/Readme.txt
index e98f6d6..568b2e5 100644
--- a/app/lib/Readme.txt
+++ b/app/lib/Readme.txt
@@ -1,492 +1,559 @@
-

-

-XTRACKCAD 4.2.4A

-

-

-This file contains installation instructions and up-to-date information

-regarding XTrackCad.

-

-

-Contents

-

--   About XTrackCad

--   License Information

--   New features in this release

--   Installation

--   Upgrading from earlier releases

--   Bugs fixed

--   Building

--   Where to go for support

-

-

-About XTrackCad

-

-XTrackCad is a powerful CAD program for designing Model Railroad

-layouts.

-

-Some highlights:

-

--   Easy to use.

--   Supports any scale.

--   Supplied with parameter libraries for many popular brands of

-    turnouts, plus the capability to define your own.

--   Automatic easement (spiral transition) curve calculation.

--   Extensive help files and video-clip demonstration mode.

-

-Availability: XTrkCad Fork is a project for further development of the

-original XTrkCad software. See the project homepage at

-http://www.xtrackcad.org/ for news and current releases.

-

-

-License Information

-

-COPYING:

-

-XTrackCad is copyrighted by Dave Bullis and Martin Fischer and licensed

-as free software under the terms of the GNU General Public License v2

-which you can find in the file COPYING.

-

-

-New features

-

-Version 4.2.4

-

--   All: Parameter file for Minitrains HOe-009-HOn30 Track System

--   All: Improved and new parameter files Kato N and Super O

--   All: Corrected parameter file for Peco HOn30/OO9 track

--   All: New parameter file for Peco HOn3 turnouts

--   All: New and updated parameter files for Z-scale

--   All: added a few more length formats

--   All: added additional zoom and marco zoom steps

--   All: Increase meximum number of layer buttons to 99

--   All: The parameter file dialog now allows loading and unloading

-    several files together

-

-Version 4.2.3

-

--   All: updated German translations

--   All: TT Kuehn added items

--   Linux/OSX: New printing system

--   All: tomix-n.xtp Added or Updated multiple items

--   All: Add length format with six decimal places for English units

-    (feature wish #33)

--   All: Feature Request #35: add hotkey for switching map window on and

-    off

--   All: Make the installation's param directory the default on initial

-    run

--   All: several new and updated parameter files

--   All: add Nm gauge and some Nm track parameters

-

-Version 4.2.2

-

--   All: Update German translations

--   All: extended parameter files fð² ‹ato HO and Walthers N structures

--   All: Added and extended parameter files

--   All: Add support for HOf scale/gauge and Busch track parameter files

--   Linux/OSX: Replace file selector dialog with newer file chooser

-    dialog

--   All: Make editing of custom track work

--   All: Fix Atlas HO Code 100 parameter file

--   All: new Kato Unitrack N-Scale parameter file

--   All: add measurement units to train speed

-

-Version 4.2.1

-

--   Increase the number of layer buttons to 99

--   All: Update Eishindo T Gauge parameter file

--   All: Paste clipboard content at position of mouse pointer

--   All: Never mark curve centers of turnouts

--   All: Make drawing of center markings (crosshair) an user option

--   add ability to set text color when creating them

--   Windows: Draw and print crosshair to mark the center of an arc

--   Add the ability to change layers of a piece of track in the

-    describe box.

-

-Version 4.2.0

-

--   New and updated parameter files and layout examples

--   Apply user preferences for dimensions to elevations

--   Add ability to update color of Text in properties

--   Fix compile problem on FreeBSD

--   Fix Oracle Solaris Studio 12.3 warnings

--   partially completed Brazilian Portuguese translation (57%)

--   Improve German translations

--   Merged webkit help system from Debian

--   Update help CSS to the Wiki's new default look

-

-

-Bugs fixed

-

-Version 4.2.4a

-

--   All: New parameter file for Micro Engineering HOn3 Turnouts

--   Windows: Fix bug 157 Crash on color change when drawing lines

--   All: Updated parameter file for Kato N scale

--   All: Fix build problem with block and switchmotor feature

-

-Version 4.2.4

-

--   Linux/OSX: Correct search order for config files

--   All: Layout control functions are always included

--   Linux/OSX: add a default file extension when none is present on save

--   Linux/OSX: Update package build

--   All: Fix compiler warnings for pointer to in casts on 64 bit systems

--   All: Correct file comments

--   All: Consistent spelling

--   All: Fix definition for Atlas Code 83 3/4" straight track

-

-Version 4.2.3b

-

--   Windows: Fix numeric overflow when reading layouts created on Linux

--   Linux/OSX: Fix crash when closing Train Control window

--   Linux/OSX: Fix crash when closing Change Elevation Window

--   All: new and improved parameter files for Tillig track

-

-Version 4.2.3a

-

--   Windows: Make UI translation work with directory structure of 64 bit

-    Windows

--   Linux/OSX: Use defaults for printer and page settings on first run

-

-Version 4.2.3

-

--   All: Fix bug #143: Roco N Turnout 22247

--   All: fix invalid const variable usage

--   Linux/OSX: cairo is required and no longer optional

--   All: Fix bug #137 remove accelerator keys from block and switchmotor

-    functions

--   All: Fixed wrapping of messages in status line

--   All: fix parameter files for On30

--   All: fix some compiler warnings

--   All: Fix bug #137 ie. crash on in intial run

--   All: fix possible signed / unsigned char problems

--   Windows: fix some compiler warnings

-

-Version 4.2.2

-

--   All: proper initialization of gauge on initial run

--   All: Added missing Language code header in Finnish and Brazilian

-    Portuguese translations

--   Linux/MacOSX Fix for string conversion issues found using

-    -Wformat-security default compiler flag on modern Linux distros

--   All: Bugfix: enable changing the layer of drawing elements from

-    Describe dialog

--   All: Fix formatting of parts list, use monospace font on Linux and

-    OSX

--   All: fix buffer overflow bug on overly long title lines (bug 120)

--   All: Fix memory violation bug on initial run of XTrackCAD

--   All: help and message fixes, load example directories on first start

--   All: Fix cmake backwards compatibility

--   All: Fix Backspace-Handling when field is emptied completly

--   All: Suppress warning from CMake versions 3.0

--   Linux: Additional files needed for Debian packages

-

-Version 4.2.1

-

--   All: Fix problem with blank line in American prototype file

--   All: fix one occurence if undo assert bug

--   All: Fix setting and getting minimum radius in Layout Options dialog

--   Windows: add round() missing in older Visual Studio versions

--   All: Fix locale problem with Export/Import

--   Linux/OSX: fix line width when printing

--   Linux/OSX: Add text rotation to gtk/cairo

--   Windows: Fix text rotation from Describe dialog

--   Fix initial HotBar Text Issue

--   Fix shift-modify abend

--   Fix redraw on Undo and Redo

--   All: fix bug 23 - make line width independent of zoom factor a

-    creation time

--   Remove Ruler Text when selecting ruler button

--   Windows: Correct size calculation for radio buttons and checkboxes

--   Fix ghosts after delete

--   Fix modify

--   Fix ghost tracks and text on mac

--   Fix color stack protection bug

--   Windows Fix Bug 108: make sure that the line width is at least 1

--   ALL Fix bug 110: Proper error message on invalid scale in parameter

-    file

--   Linux: Add valid ChangeLog to the RPM package

--   fix layerlist

--   Linux: Make RPM package generator work

--   Linux/OSX Draw and print crosshair to mark center of arc

--   ALL: Complete German translation for UI, messages and demos

--   Linux/OSX Fix bug 103: Icons are unreadable

--   Linux/OSX Fix bug 101: Print command fails with path+name > 42 chars

--   fix kato-n parameter file

--   Change the default input to be the same as the default output.

--   Correction to parameter file, Marklin 5119 is a Right not a Left

-    turnout

-

-Version 4.2.0

-

--   Fix I18N on Windows

--   Fix bug 48: created invalid XPMs when many colors were used

--   Windows: associate application icon to xtc files

--   Fixed installation problem on Windows 7 when profile directory did

-    not exist

--   Add math library libm to link library list.

--   sscanf extra format string parameter removed

--   Changed the font size used to print XtrackCAD in the engineering

-    data box.

--   Update in app/README - correct instructions for Mercurial access

--   Fixed bug 3121382 - made menu item and dialog box labeling

-    consistent for custom management

--   Fix bug 3310506, 3121372 (partly) - Minimum gauge is persisted,

-    gauge is automatically selected in Layout Options

--   Fixed bug 3524218: print scale is shown correctly on print out.

--   Fixed bug 3468014 - build instructions for OSX in README have been

-    updated

--   Fixed bug 3535258 - Broken PostScript in German locale

--   Fixed bug 3375218 - Odometer Reads A Multiple Of Locos

--   Fixed MSVC compile problem and added missing function to mswlib

--   Updated doxygen configuration file to doxygen version 1.8.2

--   Added code to properly determine the postscript fonts occurring in

-    a document.

--   Fixed the syntax of the Document Structure Comments.

--   Circle line tangent/center were interchanged

--   Fix cairo text drawing bugs by forcing painting with

-    frequent redraws.

--   Locale prefix change to conform to FHS (tracker bug 3049900)

--   Internationalization support added for help button text.

--   FIX: replaced hard-coded XTRKCAD_LOCALE_DIR path with 'locale' based

-    on application library directory (XTRKCAD_LOCALE_DIR is defined at

-    makefiles generation time and does not reflect the place where the

-    application is actually installed)

--   FIX: now it should work with CMake-2.8.1

--   Get command line parameter handling correct

--   make load last layout option work

--   Pango version check at compile time

--   Block and Switchmotor updates

--   FIX: "Gauge" translation support

--   FIX: application crash due to a double value used as a "%*" sprintf.

-    scenario is "Manage" -> "Parts List..." -> "Price" (checkbox).

--   Bug fix for setting the minimum radius

--   FIX: hotbar redraw too slow under gtk-quartz

--   FIX: linux still crashed due to a cairo context access after its

-    drawable destruction

--   FIX: workaround for OSX with GTK-Quartz -> pixmaps are not rendered

-    when using the mask; and replaced gtk_pixmap_new deprecated function

-    with gtk_image_new_from_pixmap

--   FIX: crash when displaying a non utf8 string in balloon help

--   FIX: warning removed: pointer targets in passing argument 1 of

-    'strcpy' differ in signedness

--   FIX: removed GTK run-time references to /opt/local in root directory

--   FIX: removed remained Xlib dependencies and added gtk configuration

-    files when generating the OSX bundle

--   FIX: image in about dialog box was not being displayed

--   FIX: deallocate PangoFontDescription using the right function

--   FIX: EXC_BAD_ACCESS when displaying about dialog

--   ENH: replace the old font select dialog with the GTK standard one,

-    and some code cleanup

--   FIX - text in layout and selection were not aligned

--   New 'About' and new icons

--   Add source for new button icons

--   LINUX Desktop File

--   New application icon

--   Improved support for bitmaps

--   New tip of the day icon

--   Enhanced bitmap display control

--   Improve internationalization support, use simple gettext on Win32

-

-

-

-INSTALLATION

-

-

-Windows

-

-XTrackCad has only been tested on Windows 7.

-

-The MS-Windows version of XTrackCad is shipped as a self-extracting/

-self-installing program using the NSIS Installer from Nullsoft Inc.

-

-Using Windows Explorer, locate the directory in which you downloaded or

-copied your new version of XTrackCAD.

-

-Start the installation program by double clicking on the

-[XTRKCAD-SETUP-4.2.4.EXE][] file icon.

-

-Follow the steps in the installation program.

-

-The installation lets you define the directory into which XTrackCAD is

-installed. The directory is created automatically if it doesn't already

-exist.

-

-A program folder named XTrackCAD 4.2.4 will be created during the

-installation process. This folder contains the program, documentation,

-parameter and example files. An existing installation of earlier

-versions of XTrackCad is not overwritten.

-

-A new program group named XTrackCad 4.2.4 will be created in the Start

-menu.

-

-

-Linux

-

-XTrackCAD for LINUX is shipped as a RPM file and a self extracting

-archive. You will need libc6, X11R6, GTK+2.0, webkitgtk.

-

-Installing from the RPM package.

-

-Use your operating system's package manager to install XTrackCAD.

-

-Installing from the self-extracting archive.

-

-After downloading open a command line then

-

-    ./xtrkcad-setup-4.2.4.x86_64.sh --prefix=/usr/local --exclude-subdir

-

-This will install the executable in /usr/local/bin. A directory named

-xtrkcad will be created in /usr/local/share and all files will be

-unpacked into it.

-

-If you install XTrackCAD into another directory, set the XTRKCADLIB

-environment variable to point to that directory.

-

-

-

-RELEASE INFO

-

-

-Upgrade Information

-

-The available options for number formats have been extended. Check your

-setting in Options>Preferences

-

-

-

-BUILDING

-

-

-Overview

-

-The following instructions detail building XTrackCAD using CMake. CMake

-is a cross-platform build system, available at http://www.cmake.org,

-that can be used to generate builds for a variety of build tools ranging

-from "make" to Visual Studio and XCode. Using CMake you can build

-XTrackCAD on Windows, GNU/Linux, and Mac OSX using the build tool(s) of

-your choice.

-

-Building XTrackCAD on GNU/Linux

-

--   Obtain the current sources from Mercurial; I assume that they are

-    stored locally at "~/src/xtrkcad". Note that the correct URL for

-    read-only access to Mercurial is

-    http://xtrkcad-fork.hg.sourceforge.net:8000/hgroot/xtrkcad-fork/xtrkcad

--   Create a separate build directory; for these instructions I assume

-    that your build directory is "~/build/xtrkcad".

--   Run CMake from the build directory, passing it the path to the

-    source directory:

-

-    $ cd ~/build/xtrkcad $ ccmake ~/src/xtrkcad

-

--   Press the "c" key to configure the build. After a few moments you

-    will see four options to configure: CMAKE_BUILD_TYPE,

-    CMAKE_INSTALL_PREFIX, XTRKCAD_USE_GTK, and XTRKCAD_USE_GTK_CAIRO.

--   Use CMAKE_BUILD_TYPE to control the build type. Enter "Debug" for a

-    debug build, "Release" for a release build, etc.

--   Use CMAKE_INSTALL_PREFIX to control where the software will be

-    installed. For this example, I assume "~/install/xtrkcad".

--   Use XTRKCAD_USE_GETTEXT to add new locales (language translations).

-    Choose "OFF" to use XTrackCAD's default language (English). Refer to

-    http://www.xtrkcad.org/Wikka/Internationalization for

-    additional information.

--   Use XTRKCAD_USE_GTK to control the user-interface back-end. Choose

-    "OFF" for Windows, "ON" for all other platforms.

--   Use XTRKCAD_USE_GTK_CAIRO to enable optional high-quality

-    antialiased Cairo rendering for the GTK back-end. This option has no

-    effect unless you are using the GTK back-end.

--   Use XTRKCAD_USE_DOXYGEN to enable the production of type, function,

-    etc., documentation from the the source code. Requires doxygen if

-    enabled. Enable if and only if you intend to hack on the code.

--   If you made any changes, press the "c" key again to update your

-    new configuration.

--   Once everything is configured to your satisfaction, press the "g"

-    key to generate makefiles for your build.

--   Compile XTrkCad using your new build:

-

-    $ make

-

--   Install the new binary:

-

-    $ make install

-

--   Run the installed binary:

-

-    $ ~/install/xtrkcad/bin/xtrkcad

-

--   If XTRKCAD_USE_DOXYGEN was enabled:

-

-    $ make docs-doxygen

-

-to create the internals documentation. Read this documentation by

-pointing your web browser at

-~/build/xtrkcad/docs/doxygen/html/index.html.

-

-Building XTrackCAD on Mac OSX

-

--   You will need to install the following dependencies - I recommend

-    using http://www.macports.org to obtain them:

--   GTK2

--   webkit

--   gnome-icon-theme

--   Once the prerequisites are installed the build instructions are the

-    same as for the GNU/Linux build, above.

--   Remember that to run XTrackCAD on OSX, you need to have X11 running

-    with your DISPLAY set.

-

-Building XTrackCAD on Windows

-

--   Obtain the current sources from Mercurial; I assume that they are

-    stored locally at "c:/src/xtrkcad". Note that the correct URL for

-    read-only access to Mercurial is

-    http://xtrkcad-fork.hg.sourceforge.net:8000/hgroot/xtrkcad-fork/xtrkcad

--   Use the Windows Start menu to run CMake (cmake-gui).

--   Specify the source and build directories in the CMake window. You

-    must provide a build directory outside the source tree - I

-    use "c:/build/xtrkcad".

--   Press the "Configure" button to configure the build. You will be

-    prompted for the type of build to generate. Choose your desired

-    tool - I used "Visual Studio 10". After a few moments you will see

-    three options to configure: CMAKE_INSTALL_PREFIX, XTRKCAD_USE_GTK,

-    and XTRKCAD_USE_GTK_CAIRO.

--   Use CMAKE_INSTALL_PREFIX to control where the software will be

-    installed. The default "c:/Program Files/XTrkCAD" is a good choice.

--   Use XTRKCAD_USE_GETTEXT to add new locales (language translations).

-    Choose "OFF" to use XTrackCAD's default language (English). Refer to

-    http://www.xtrkcad.org/Wikka/Internationalization for

-    additional information.

--   Use XTRKCAD_USE_GTK to control the user-interface back-end. Choose

-    "OFF" for Windows.

--   Use XTRKCAD_USE_GTK_CAIRO to enable optional high-quality

-    antialiased Cairo rendering for the GTK back-end. This option has no

-    effect unless on Windows.

--   Use XTRKCAD_USE_DOXYGEN to enable the production of type, function,

-    etc., documentation from the the source code. Requires doxygen if

-    enabled. Enable if and only if you intend to hack on the code.

--   If you made any changes, press the "Configure" button again to

-    update your new configuration.

--   Once everything is configured to your satisfaction, press the "OK"

-    button to generate project files for your build.

--   Compile XTrackCad using the new project files. For example, start

-    MSVC and open the "XTrkCAD.sln" solution file which is located in

-    your build directory.

--   Build the "BUILD_ALL" project to build the software.

--   Build the "INSTALL" project to install the software.

--   Run XTrackCAD by double-clicking its icon located in the install

-    directory - for example: c:/Program Files/XTrkCAD/bin/xtrkcad.exe.

-

-

-Where to go for support

-

-The following web addresses will be helpful for any questions or bug

-reports

-

--   The Yahoo!Group mailing list

-    http://groups.yahoo.com/projects/XTrkCad

--   The project website for the open source development

-    http://www.xtrackcad.org/

--   The official Sourceforge site

-    http://www.sourceforge.net/groups/xtrkcad-fork/

-

-Thanks for your interest in XTrackCAD.

+
+
+XTRACKCAD 4.3.0
+
+
+This file contains installation instructions and up-to-date information
+regarding XTrackCad.
+
+
+Contents
+
+-   About XTrackCad
+-   License Information
+-   New features in this release
+-   Installation
+-   Upgrading from earlier releases
+-   Bugs fixed
+-   Building
+-   Where to go for support
+
+
+About XTrackCad
+
+XTrackCad is a powerful CAD program for designing Model Railroad
+layouts.
+
+Some highlights:
+
+-   Easy to use.
+-   Supports any scale.
+-   Supplied with parameter libraries for many popular brands of
+    turnouts, plus the capability to define your own.
+-   Automatic easement (spiral transition) curve calculation.
+-   Extensive help files and video-clip demonstration mode.
+
+Availability: XTrkCad Fork is a project for further development of the
+original XTrkCad software. See the project homepage at
+http://www.xtrackcad.org/ for news and current releases.
+
+
+License Information
+
+COPYING:
+
+XTrackCad is copyrighted by Dave Bullis and Martin Fischer and licensed
+as free software under the terms of the GNU General Public License v2
+which you can find in the file COPYING.
+
+
+New features
+
+Version 4.3.0
+
+-   Linux: Install xtrkcad.desktop and xtrkcad.png for desktop
+    integration
+-   All: Fix color button initialization
+-   Add control and sensor types
+-   Development of signal feature was finished
+-   Add extra AppleHelp files
+-   All: Add documentation for layout control elements
+-   Write proper Describe, Move, and Rotate functions for Signals.
+-   Add high lighting for signals.
+-   Add AppleHelp bundle generation including index
+-   First pass at high lighting layout control elements.
+-   Linux/OSX: Set directory for rc file
+-   All: Rework DXF export, add support for metric measurements
+-   All: Add dynstring to build and modify DynstrMalloc interface
+-   All: Add dynstring library and unit tests
+-   All: enable unit testing with CMocka
+-   Add Layout Control Element management dialog
+
+Version 4.2.4
+
+-   All: Parameter file for Minitrains HOe-009-HOn30 Track System
+-   All: Improved and new parameter files Kato N and Super O
+-   All: Corrected parameter file for Peco HOn30/OO9 track
+-   All: New parameter file for Peco HOn3 turnouts
+-   All: New and updated parameter files for Z-scale
+-   All: added a few more length formats
+-   All: added additional zoom and marco zoom steps
+-   All: Increase meximum number of layer buttons to 99
+-   All: The parameter file dialog now allows loading and unloading
+    several files together
+
+Version 4.2.3
+
+-   All: updated German translations
+-   All: TT Kuehn added items
+-   Linux/OSX: New printing system
+-   All: tomix-n.xtp Added or Updated multiple items
+-   All: Add length format with six decimal places for English units
+    (feature wish #33)
+-   All: Feature Request #35: add hotkey for switching map window on and
+    off
+-   All: Make the installation's param directory the default on initial
+    run
+-   All: several new and updated parameter files
+-   All: add Nm gauge and some Nm track parameters
+
+Version 4.2.2
+
+-   All: Update German translations
+-   All: extended parameter files fð² ‹ato HO and Walthers N structures
+-   All: Added and extended parameter files
+-   All: Add support for HOf scale/gauge and Busch track parameter files
+-   Linux/OSX: Replace file selector dialog with newer file chooser
+    dialog
+-   All: Make editing of custom track work
+-   All: Fix Atlas HO Code 100 parameter file
+-   All: new Kato Unitrack N-Scale parameter file
+-   All: add measurement units to train speed
+
+Version 4.2.1
+
+-   Increase the number of layer buttons to 99
+-   All: Update Eishindo T Gauge parameter file
+-   All: Paste clipboard content at position of mouse pointer
+-   All: Never mark curve centers of turnouts
+-   All: Make drawing of center markings (crosshair) an user option
+-   add ability to set text color when creating them
+-   Windows: Draw and print crosshair to mark the center of an arc
+-   Add the ability to change layers of a piece of track in the
+    describe box.
+
+Version 4.2.0
+
+-   New and updated parameter files and layout examples
+-   Apply user preferences for dimensions to elevations
+-   Add ability to update color of Text in properties
+-   Fix compile problem on FreeBSD
+-   Fix Oracle Solaris Studio 12.3 warnings
+-   partially completed Brazilian Portuguese translation (57%)
+-   Improve German translations
+-   Merged webkit help system from Debian
+-   Update help CSS to the Wiki's new default look
+
+
+Bugs fixed
+
+Version 4.3.0
+
+-   All: Save and set user defined values for Text command
+-   All: Fix path handling error after Save/Save As
+-   All: Fix color button initialization
+-   Fix Malloc error (wrong size in ReadBlock, causing Guard1
+    hose error)
+-   Updated cblock.c and cswitchmotor.c to handle possible broken blocks
+    and switchmotors and not crash (check for NULL pointers)
+-   Bulletproof against undefined (NULL pointer) track segments in
+    SwitchMotor code.
+-   Bulletproof against undefined (NULL pointer) track segments in
+    Block code.
+-   Linux/OSX: Preparing for GTK3 migration, second set of changes
+-   Clean up help files for Apple Help Indexer
+-   Linux/OSX: Preparing for GTK3 migration, first set of changes
+-   All: New and updated parameter files for Lego and Peco H0 Code 83
+-   Linux/OSX: Add OSX specific files
+-   Linux/OSX: Split help functions in generic and platform specific
+    piece
+-   Description: Correct some translation typos
+-   Linux/OSX: Fix #163 GCC format-security errors
+-   All: Update parameter file for Kuehn TT track
+-   Add forward reference resolution for Blocks and Switchmotors
+-   Cleanly delete blocks and switch motors when their tracks are
+    deleted (avoid dangling pointers)
+-   Updated Spec file
+-   Expand help path name for longer bundle directories
+-   Attempt to fix help files crash issue
+-   Add GLIB Schemas to GTK-Bundle
+-   All: Improved German translations
+-   Update Readme for OSX package
+-   Add support for gtk-mac-bundler
+-   fix bugs in xtrkcad-bundler code
+-   Fix parm dialog default for GTK builds
+-   Add a post-build script for auto-creating OSX images
+-   Remove failing copy command for gtk-bundle share
+-   Linux/OSX: Fix uninitialized param file directory on first run
+-   All: Add TTi scale / gauge
+-   All: New paramter files for Frateschi HO and Auhagen TTi
+
+Version 4.2.4a
+
+-   All: Update help
+-   Linux: Installation from self extracting archive accepts install
+    path
+-   Linux/OSX: Remove absolute path from source packages
+-   All: remove all dependencies on obsolete XTRKCAD_USE_LAYOUTCONTROL
+    conditional
+-   All: New parameter file for Micro Engineering HOn3 Turnouts
+-   Windows: Fix bug 157 Crash on color change when drawing lines
+-   All: Updated parameter file for Kato N scale
+-   All: Fix build problem with block and switchmotor feature
+
+Version 4.2.4
+
+-   Linux/OSX: Correct search order for config files
+-   All: Layout control functions are always included
+-   Linux/OSX: add a default file extension when none is present on save
+-   Linux/OSX: Update package build
+-   All: Fix compiler warnings for pointer to in casts on 64 bit systems
+-   All: Correct file comments
+-   All: Consistent spelling
+-   All: Fix definition for Atlas Code 83 3/4" straight track
+
+Version 4.2.3b
+
+-   Windows: Fix numeric overflow when reading layouts created on Linux
+-   Linux/OSX: Fix crash when closing Train Control window
+-   Linux/OSX: Fix crash when closing Change Elevation Window
+-   All: new and improved parameter files for Tillig track
+
+Version 4.2.3a
+
+-   Windows: Make UI translation work with directory structure of 64 bit
+    Windows
+-   Linux/OSX: Use defaults for printer and page settings on first run
+
+Version 4.2.3
+
+-   All: Fix bug #143: Roco N Turnout 22247
+-   All: fix invalid const variable usage
+-   Linux/OSX: cairo is required and no longer optional
+-   All: Fix bug #137 remove accelerator keys from block and switchmotor
+    functions
+-   All: Fixed wrapping of messages in status line
+-   All: fix parameter files for On30
+-   All: fix some compiler warnings
+-   All: Fix bug #137 ie. crash on in intial run
+-   All: fix possible signed / unsigned char problems
+-   Windows: fix some compiler warnings
+
+Version 4.2.2
+
+-   All: proper initialization of gauge on initial run
+-   All: Added missing Language code header in Finnish and Brazilian
+    Portuguese translations
+-   Linux/MacOSX Fix for string conversion issues found using
+    -Wformat-security default compiler flag on modern Linux distros
+-   All: Bugfix: enable changing the layer of drawing elements from
+    Describe dialog
+-   All: Fix formatting of parts list, use monospace font on Linux and
+    OSX
+-   All: fix buffer overflow bug on overly long title lines (bug 120)
+-   All: Fix memory violation bug on initial run of XTrackCAD
+-   All: help and message fixes, load example directories on first start
+-   All: Fix cmake backwards compatibility
+-   All: Fix Backspace-Handling when field is emptied completly
+-   All: Suppress warning from CMake versions 3.0
+-   Linux: Additional files needed for Debian packages
+
+Version 4.2.1
+
+-   All: Fix problem with blank line in American prototype file
+-   All: fix one occurence if undo assert bug
+-   All: Fix setting and getting minimum radius in Layout Options dialog
+-   Windows: add round() missing in older Visual Studio versions
+-   All: Fix locale problem with Export/Import
+-   Linux/OSX: fix line width when printing
+-   Linux/OSX: Add text rotation to gtk/cairo
+-   Windows: Fix text rotation from Describe dialog
+-   Fix initial HotBar Text Issue
+-   Fix shift-modify abend
+-   Fix redraw on Undo and Redo
+-   All: fix bug 23 - make line width independent of zoom factor a
+    creation time
+-   Remove Ruler Text when selecting ruler button
+-   Windows: Correct size calculation for radio buttons and checkboxes
+-   Fix ghosts after delete
+-   Fix modify
+-   Fix ghost tracks and text on mac
+-   Fix color stack protection bug
+-   Windows Fix Bug 108: make sure that the line width is at least 1
+-   ALL Fix bug 110: Proper error message on invalid scale in parameter
+    file
+-   Linux: Add valid ChangeLog to the RPM package
+-   fix layerlist
+-   Linux: Make RPM package generator work
+-   Linux/OSX Draw and print crosshair to mark center of arc
+-   ALL: Complete German translation for UI, messages and demos
+-   Linux/OSX Fix bug 103: Icons are unreadable
+-   Linux/OSX Fix bug 101: Print command fails with path+name > 42 chars
+-   fix kato-n parameter file
+-   Change the default input to be the same as the default output.
+-   Correction to parameter file, Marklin 5119 is a Right not a Left
+    turnout
+
+Version 4.2.0
+
+-   Fix I18N on Windows
+-   Fix bug 48: created invalid XPMs when many colors were used
+-   Windows: associate application icon to xtc files
+-   Fixed installation problem on Windows 7 when profile directory did
+    not exist
+-   Add math library libm to link library list.
+-   sscanf extra format string parameter removed
+-   Changed the font size used to print XtrackCAD in the engineering
+    data box.
+-   Update in app/README - correct instructions for Mercurial access
+-   Fixed bug 3121382 - made menu item and dialog box labeling
+    consistent for custom management
+-   Fix bug 3310506, 3121372 (partly) - Minimum gauge is persisted,
+    gauge is automatically selected in Layout Options
+-   Fixed bug 3524218: print scale is shown correctly on print out.
+-   Fixed bug 3468014 - build instructions for OSX in README have been
+    updated
+-   Fixed bug 3535258 - Broken PostScript in German locale
+-   Fixed bug 3375218 - Odometer Reads A Multiple Of Locos
+-   Fixed MSVC compile problem and added missing function to mswlib
+-   Updated doxygen configuration file to doxygen version 1.8.2
+-   Added code to properly determine the postscript fonts occurring in
+    a document.
+-   Fixed the syntax of the Document Structure Comments.
+-   Circle line tangent/center were interchanged
+-   Fix cairo text drawing bugs by forcing painting with
+    frequent redraws.
+-   Locale prefix change to conform to FHS (tracker bug 3049900)
+-   Internationalization support added for help button text.
+-   FIX: replaced hard-coded XTRKCAD_LOCALE_DIR path with 'locale' based
+    on application library directory (XTRKCAD_LOCALE_DIR is defined at
+    makefiles generation time and does not reflect the place where the
+    application is actually installed)
+-   FIX: now it should work with CMake-2.8.1
+-   Get command line parameter handling correct
+-   make load last layout option work
+-   Pango version check at compile time
+-   Block and Switchmotor updates
+-   FIX: "Gauge" translation support
+-   FIX: application crash due to a double value used as a "%*" sprintf.
+    scenario is "Manage" -> "Parts List..." -> "Price" (checkbox).
+-   Bug fix for setting the minimum radius
+-   FIX: hotbar redraw too slow under gtk-quartz
+-   FIX: linux still crashed due to a cairo context access after its
+    drawable destruction
+-   FIX: workaround for OSX with GTK-Quartz -> pixmaps are not rendered
+    when using the mask; and replaced gtk_pixmap_new deprecated function
+    with gtk_image_new_from_pixmap
+-   FIX: crash when displaying a non utf8 string in balloon help
+-   FIX: warning removed: pointer targets in passing argument 1 of
+    'strcpy' differ in signedness
+-   FIX: removed GTK run-time references to /opt/local in root directory
+-   FIX: removed remained Xlib dependencies and added gtk configuration
+    files when generating the OSX bundle
+-   FIX: image in about dialog box was not being displayed
+-   FIX: deallocate PangoFontDescription using the right function
+-   FIX: EXC_BAD_ACCESS when displaying about dialog
+-   ENH: replace the old font select dialog with the GTK standard one,
+    and some code cleanup
+-   FIX - text in layout and selection were not aligned
+-   New 'About' and new icons
+-   Add source for new button icons
+-   LINUX Desktop File
+-   New application icon
+-   Improved support for bitmaps
+-   New tip of the day icon
+-   Enhanced bitmap display control
+-   Improve internationalization support, use simple gettext on Win32
+
+
+
+INSTALLATION
+
+
+Windows
+
+XTrackCad has only been tested on Windows 7.
+
+The MS-Windows version of XTrackCad is shipped as a self-extracting/
+self-installing program using the NSIS Installer from Nullsoft Inc.
+
+Using Windows Explorer, locate the directory in which you downloaded or
+copied your new version of XTrackCAD.
+
+Start the installation program by double clicking on the
+[XTRKCAD-SETUP-4.3.0.EXE][] file icon.
+
+Follow the steps in the installation program.
+
+The installation lets you define the directory into which XTrackCAD is
+installed. The directory is created automatically if it doesn't already
+exist.
+
+A program folder named XTrackCAD 4.3.0 will be created during the
+installation process. This folder contains the program, documentation,
+parameter and example files. An existing installation of earlier
+versions of XTrackCad is not overwritten.
+
+A new program group named XTrackCad 4.3.0 will be created in the Start
+menu.
+
+
+Linux
+
+XTrackCAD for LINUX is shipped as a RPM file and a self extracting
+archive. You will need libc6, X11R6, GTK+2.0, webkitgtk.
+
+Installing from the RPM package.
+
+Use your operating system's package manager to install XTrackCAD.
+
+Installing from the self-extracting archive.
+
+After downloading open a command line then
+
+    ./xtrkcad-setup-4.3.0.x86_64.sh --prefix=/usr/local --exclude-subdir
+
+This will install the executable in /usr/local/bin. A directory named
+xtrkcad will be created in /usr/local/share and all files will be
+unpacked into it.
+
+If you install XTrackCAD into another directory, set the XTRKCADLIB
+environment variable to point to that directory.
+
+
+
+RELEASE INFO
+
+
+Upgrade Information
+
+The available options for number formats have been extended. Check your
+setting in Options>Preferences
+
+
+
+BUILDING
+
+
+Overview
+
+The following instructions detail building XTrackCAD using CMake. CMake
+is a cross-platform build system, available at http://www.cmake.org,
+that can be used to generate builds for a variety of build tools ranging
+from "make" to Visual Studio and XCode. Using CMake you can build
+XTrackCAD on Windows, GNU/Linux, and Mac OSX using the build tool(s) of
+your choice.
+
+Building XTrackCAD on GNU/Linux
+
+-   Obtain the current sources from Mercurial; I assume that they are
+    stored locally at "~/src/xtrkcad". Note that the correct URL for
+    read-only access to Mercurial is
+    http://xtrkcad-fork.hg.sourceforge.net:8000/hgroot/xtrkcad-fork/xtrkcad
+-   Create a separate build directory; for these instructions I assume
+    that your build directory is "~/build/xtrkcad".
+-   Run CMake from the build directory, passing it the path to the
+    source directory:
+
+    $ cd ~/build/xtrkcad $ ccmake ~/src/xtrkcad
+
+-   Press the "c" key to configure the build. After a few moments you
+    will see four options to configure: CMAKE_BUILD_TYPE,
+    CMAKE_INSTALL_PREFIX, XTRKCAD_USE_GTK, and XTRKCAD_USE_GTK_CAIRO.
+-   Use CMAKE_BUILD_TYPE to control the build type. Enter "Debug" for a
+    debug build, "Release" for a release build, etc.
+-   Use CMAKE_INSTALL_PREFIX to control where the software will be
+    installed. For this example, I assume "~/install/xtrkcad".
+-   Use XTRKCAD_USE_GETTEXT to add new locales (language translations).
+    Choose "OFF" to use XTrackCAD's default language (English). Refer to
+    http://www.xtrkcad.org/Wikka/Internationalization for
+    additional information.
+-   Use XTRKCAD_USE_GTK to control the user-interface back-end. Choose
+    "OFF" for Windows, "ON" for all other platforms.
+-   Use XTRKCAD_USE_GTK_CAIRO to enable optional high-quality
+    antialiased Cairo rendering for the GTK back-end. This option has no
+    effect unless you are using the GTK back-end.
+-   Use XTRKCAD_USE_DOXYGEN to enable the production of type, function,
+    etc., documentation from the the source code. Requires doxygen if
+    enabled. Enable if and only if you intend to hack on the code.
+-   If you made any changes, press the "c" key again to update your
+    new configuration.
+-   Once everything is configured to your satisfaction, press the "g"
+    key to generate makefiles for your build.
+-   Compile XTrkCad using your new build:
+
+    $ make
+
+-   Install the new binary:
+
+    $ make install
+
+-   Run the installed binary:
+
+    $ ~/install/xtrkcad/bin/xtrkcad
+
+-   If XTRKCAD_USE_DOXYGEN was enabled:
+
+    $ make docs-doxygen
+
+to create the internals documentation. Read this documentation by
+pointing your web browser at
+~/build/xtrkcad/docs/doxygen/html/index.html.
+
+Building XTrackCAD on Mac OSX
+
+-   You will need to install the following dependencies - I recommend
+    using http://www.macports.org to obtain them:
+-   GTK2
+-   webkit
+-   gnome-icon-theme
+-   Once the prerequisites are installed the build instructions are the
+    same as for the GNU/Linux build, above.
+-   Remember that to run XTrackCAD on OSX, you need to have X11 running
+    with your DISPLAY set.
+
+Building XTrackCAD on Windows
+
+-   Obtain the current sources from Mercurial; I assume that they are
+    stored locally at "c:/src/xtrkcad". Note that the correct URL for
+    read-only access to Mercurial is
+    http://xtrkcad-fork.hg.sourceforge.net:8000/hgroot/xtrkcad-fork/xtrkcad
+-   Use the Windows Start menu to run CMake (cmake-gui).
+-   Specify the source and build directories in the CMake window. You
+    must provide a build directory outside the source tree - I
+    use "c:/build/xtrkcad".
+-   Press the "Configure" button to configure the build. You will be
+    prompted for the type of build to generate. Choose your desired
+    tool - I used "Visual Studio 10". After a few moments you will see
+    three options to configure: CMAKE_INSTALL_PREFIX, XTRKCAD_USE_GTK,
+    and XTRKCAD_USE_GTK_CAIRO.
+-   Use CMAKE_INSTALL_PREFIX to control where the software will be
+    installed. The default "c:/Program Files/XTrkCAD" is a good choice.
+-   Use XTRKCAD_USE_GETTEXT to add new locales (language translations).
+    Choose "OFF" to use XTrackCAD's default language (English). Refer to
+    http://www.xtrkcad.org/Wikka/Internationalization for
+    additional information.
+-   Use XTRKCAD_USE_GTK to control the user-interface back-end. Choose
+    "OFF" for Windows.
+-   Use XTRKCAD_USE_GTK_CAIRO to enable optional high-quality
+    antialiased Cairo rendering for the GTK back-end. This option has no
+    effect unless on Windows.
+-   Use XTRKCAD_USE_DOXYGEN to enable the production of type, function,
+    etc., documentation from the the source code. Requires doxygen if
+    enabled. Enable if and only if you intend to hack on the code.
+-   If you made any changes, press the "Configure" button again to
+    update your new configuration.
+-   Once everything is configured to your satisfaction, press the "OK"
+    button to generate project files for your build.
+-   Compile XTrackCad using the new project files. For example, start
+    MSVC and open the "XTrkCAD.sln" solution file which is located in
+    your build directory.
+-   Build the "BUILD_ALL" project to build the software.
+-   Build the "INSTALL" project to install the software.
+-   Run XTrackCAD by double-clicking its icon located in the install
+    directory - for example: c:/Program Files/XTrkCAD/bin/xtrkcad.exe.
+
+
+Where to go for support
+
+The following web addresses will be helpful for any questions or bug
+reports
+
+-   The Yahoo!Group mailing list
+    http://groups.yahoo.com/projects/XTrkCad
+-   The project website for the open source development
+    http://www.xtrackcad.org/
+-   The official Sourceforge site
+    http://www.sourceforge.net/groups/xtrkcad-fork/
+
+Thanks for your interest in XTrackCAD.
diff --git a/app/lib/astylerc b/app/lib/astylerc
new file mode 100644
index 0000000..e0815ce
--- /dev/null
+++ b/app/lib/astylerc
@@ -0,0 +1,8 @@
+style=1tbs
+break-blocks
+unpad-paren
+pad-header
+max-code-length=80
+break-after-logical
+mode=c
+
diff --git a/app/lib/params/HO-Frateschi.xtp b/app/lib/params/HO-Frateschi.xtp
new file mode 100644
index 0000000..60b63eb
--- /dev/null
+++ b/app/lib/params/HO-Frateschi.xtp
@@ -0,0 +1,196 @@
+CONTENTS Frateschi HO Track

+SUBCONTENTS Frateschi HO Track - Straight

+TURNOUT HO "Frateschi HO Track	Straight 880mm	4880/4980"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 34.645669 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 34.645669 0.000000

+END

+TURNOUT HO "Frateschi HO Track	Straight 220mm	4220/4920"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 8.661417 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 8.661417 0.000000

+END

+TURNOUT HO "Frateschi HO Track	Straight 110mm	4110/4910"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.330709 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 4.330709 0.000000

+END

+TURNOUT HO "Frateschi HO Track	Straight 55mm	4055/4955"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 2.165354 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 2.165354 0.000000

+END

+TURNOUT HO "Frateschi HO Track	Straight(old geometry) 45mm	4045"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.771654 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 1.771654 0.000000

+END

+SUBCONTENTS Frateschi HO Track - Misc

+TURNOUT HO "Frateschi HO Track	Uncoupler Straight 110mm	4110D/4910D"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.330709 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 4.330709 0.000000

+	F 0 0.000000 4

+		1.443570 0.250000 0

+		2.887139 0.250000 0

+		2.887139 -0.250000 0

+		1.443570 -0.250000 0

+END

+STRUCTURE HO "Frateschi HO Track	Bumper	1525"

+	X pier 0.000000 "B"

+	L 0 0.100000 0.000000 0.300000 -1.000000 0.300000

+	L 0 0.100000 -0.500000 0.600000 -0.500000 -0.600000

+	L 0 0.100000 0.000000 -0.300000 -1.000000 -0.300000

+END

+SUBCONTENTS Frateschi HO Track - Curve

+TURNOUT HO "Frateschi HO Track	Curve 360mm 30°	4188/4988"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 7.086614 -1.898853 120.000000

+	C 0 0.000000 14.173228 0.000000 -14.173228 0.000000 30.000000

+END

+TURNOUT HO "Frateschi HO Track	Curve 418mm 30°	4219/4919"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 8.228346 -2.204779 120.000000

+	C 0 0.000000 16.456693 0.000000 -16.456693 0.000000 30.000000

+END

+TURNOUT HO "Frateschi HO Track	Curve 480mm 20°	4166/4966"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.463373 -1.139667 110.000000

+	C 0 0.000000 18.897638 0.000000 -18.897638 0.000000 20.000000

+END

+TURNOUT HO "Frateschi HO Track	Curve 480mm 10°	4083/4983"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 3.281540 -0.287098 100.000000

+	C 0 0.000000 18.897638 0.000000 -18.897638 0.000000 10.000000

+END

+TURNOUT HO "Frateschi HO Track	Curve(old) 482mm 20°	4166"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.490304 -1.144416 110.000000

+	C 0 0.000000 18.976378 0.000000 -18.976378 0.000000 20.000000

+END

+TURNOUT HO "Frateschi HO Track	Curve(old) 482mm 10°	4083"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 3.295213 -0.288294 100.000000

+	C 0 0.000000 18.976378 0.000000 -18.976378 0.000000 10.000000

+END

+SUBCONTENTS Frateschi HO Track - Turnouts

+TURNOUT HO "Frateschi HO Track	Left Remote Turnout	4200L/4900L"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 8.661417 0.000000 90.000000

+	E 8.661417 1.141732 75.000000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 8.661417 0.000000

+	C 0 0.000000 -28.490603 0.649638 28.490603 164.999924 15.000152

+	S 0 0.000000 8.023578 0.970812 8.661417 1.141732

+	F 0 0.000000 6

+		2.887139 -0.600000 0

+		5.774278 -0.600000 0

+		5.774278 -1.050000 0

+		5.574278 -1.250000 0

+		3.087139 -1.250000 0

+		2.887139 -1.050000 0

+END

+TURNOUT HO "Frateschi HO Track	Curve 850mm 15°	4222/4922"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 8.661267 -1.140277 105.000000

+	C 0 0.000000 33.464567 0.000000 -33.464567 0.000000 15.000000

+END

+TURNOUT HO "Frateschi HO Track	Right Remote Turnout	4200R/4900R"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 8.661417 0.000000 90.000000

+	E 8.661417 -1.141732 105.000000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 8.661417 0.000000

+	C 0 0.000000 28.490603 0.649487 -28.490603 0.000076 15.000152

+	S 0 0.000000 8.023578 -0.970812 8.661417 -1.141732

+	F 0 0.000000 6

+		2.887139 0.600000 0

+		5.774278 0.600000 0

+		5.774278 1.050000 0

+		5.574278 1.250000 0

+		3.087139 1.250000 0

+		2.887139 1.050000 0

+END

+TURNOUT HO "Frateschi HO Track	Left Turnout (OLD)	4165L"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.496063 0.000000 90.000000

+	E 6.496063 1.144416 70.000000

+	S 0 0.000000 0.000000 0.000000 0.655402 0.000000

+	S 0 0.000000 0.655402 0.000000 6.496063 0.000000

+	C 0 0.000000 -15.292205 0.655422 15.292205 159.999924 20.000152

+	S 0 0.000000 5.885678 0.922245 6.496063 1.144416

+END

+TURNOUT HO "Frateschi HO Track	Right Turnout (OLD)	4165R"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.496063 0.000000 90.000000

+	E 6.496063 -1.144416 110.000000

+	S 0 0.000000 0.000000 0.000000 0.655402 0.000000

+	S 0 0.000000 0.655402 0.000000 6.496063 0.000000

+	C 0 0.000000 15.292205 0.655341 -15.292205 0.000076 20.000152

+	S 0 0.000000 5.885678 -0.922245 6.496063 -1.144416

+END

+SUBCONTENTS Frateschi HO Track - TurnTable

+TURNOUT HO	"Frateschi	Turntable 220mm 20d	4500"					

+	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					

+	E	0.000000	0.000000	180.000000				

+	E	0.000000	4.330709	0.000000				

+	E	1.481190	4.069535	20.000000				

+	E	2.783726	3.317515	40.000000				

+	E	3.750504	2.165354	60.000000				

+	E	4.264915	0.752020	80.000000				

+	E	4.264915	-0.752020	100.000000				

+	E	3.750504	-2.165354	120.000000				

+	E	2.783726	-3.317515	140.000000				

+	E	1.481190	-4.069535	160.000000				

+	E	0.000000	-4.330709	180.000000				

+	E	-1.481190	-4.069535	200.000000				

+	E	-2.783726	-3.317515	220.000000				

+	E	-3.750504	-2.165354	240.000000				

+	E	-4.264915	-0.752020	260.000000				

+	E	-4.264915	0.752020	280.000000				

+	E	-3.750504	2.165354	300.000000				

+	E	-2.783726	3.317515	320.000000				

+	E	-1.481190	4.069535	340.000000				

+	S	16777215	0	0.000000	4.330709	0.000000	-4.330709	

+	S	16777215	0	1.481190	4.069535	-1.481190	-4.069535	

+	S	16777215	0	2.783726	3.317515	-2.783726	-3.317515	

+	S	16777215	0	3.750504	2.165354	-3.750504	-2.165354	

+	S	16777215	0	4.264915	0.752020	-4.264915	-0.752020	

+	S	16777215	0	4.264915	-0.752020	-4.264915	0.752020	

+	S	16777215	0	3.750504	-2.165354	-3.750504	2.165354	

+	S	16777215	0	2.783726	-3.317515	-2.783726	3.317515	

+	S	16777215	0	1.481190	-4.069535	-1.481190	4.069535	

+	A	0	0.031250	4.330709	0.000000	0.000000	0.000000	360.000000

+	A	0	0.031250	5.080709	0.000000	0.000000	0.000000	360.000000

+	A	0	0.031250	1.377727	0.000000	0.000000	0.000000	360.000000

+	G	0	0.000000	0.750000	0.000000	0.000000	0.000000	360.000000

+END
\ No newline at end of file
diff --git a/app/lib/params/HOn3-BlackStoneProTraxx.xtp b/app/lib/params/HOn3-BlackStoneProTraxx.xtp
new file mode 100644
index 0000000..d47e2b8
--- /dev/null
+++ b/app/lib/params/HOn3-BlackStoneProTraxx.xtp
@@ -0,0 +1,21 @@
+CONTENTS Blackstone ProTraxx HOn3 Snap-Track

+

+SUBCONTENTS Blackstone ProTraxx HOn3 Snap-Track - Straight Track

+TURNOUT HOn3  "ProTraxx HOn3 Snap-Track	Straight 6.535 228mm	B500100"

+	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

+	L 11579568 0.053333 0.000000 0.629921 8.976378 0.629921

+	L 11579568 0.053333 0.000000 -0.629921 8.976378 -0.629921

+END

+

+SUBCONTENTS Blackstone ProTraxx HOn3 Snap-Track - Curve Track

+TURNOUT HOn3  "ProTraxx HOn3 Snap-Track	Curve 18.90R 480mm 22.5°	B500200"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 7.231813 -1.438497 112.500000

+	C 0 0 18.897638 0.000000 -18.897638 0.000000 22.500000

+	A 11579568 0.053333 18.267717 0.000000 -18.897638 0.000000 22.500000

+	A 11579568 0.053333 19.527559 0.000000 -18.897638 0.000000 22.500000

+END

diff --git a/app/lib/params/Lego-Track.xtp b/app/lib/params/Lego-Track.xtp
new file mode 100644
index 0000000..784635a
--- /dev/null
+++ b/app/lib/params/Lego-Track.xtp
@@ -0,0 +1,152 @@
+CONTENTS Lego Track Components

+# Created By Dwyane Ward 01Jan2013

+

+SUBCONTENTS Lego - 9V Track

+TURNOUT LEGO "Lego	Straight Track (9V)	2865/4515"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.039370 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 5.039370 0.000000

+	END

+TURNOUT LEGO "Lego	Curve Track (9V)	28674520"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.821209 0.958998 67.500000

+	C 0 0.000000 -12.598425 0.000000 12.598425 157.500000 22.500000

+	END

+TURNOUT LEGO "Lego	Crossing Track (9V)	320874519"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 5.039370 0.000000 90.000000

+	E 2.519692 2.519685 0.000000

+	E 2.519678 -2.519685 180.000000

+	S 0 0.000000 0.000000 0.000000 5.039370 0.000000

+	S 0 0.000000 2.519692 2.519685 2.519678 -2.519685

+	END

+TURNOUT LEGO "Lego	Left Switch (9V)	2861/4531"

+	P "P0" 1 5 4 3

+	P "P1" 2

+	E 0.000000 0.000000 270.000000

+	E 10.078740 -0.000027 90.000000

+	E 10.236648 4.068369 67.500000

+	C 0 0.000000 -6.377953 0.000017 6.377953 166.446760 13.553240

+	S 0 0.000000 0.000000 0.000000 10.078740 -0.000027

+	C 0 0.000000 6.377953 12.677383 -1.824092 323.058181 14.441819

+	C 0 0.000000 -15.666120 -0.571293 15.794471 143.057808 23.388952

+	S 0 0.000000 1.494665 0.177605 3.100081 0.564621

+	END

+TURNOUT LEGO "Lego	Right Switch (9V)	2859/4531"

+	P "P0" 1 5 4 3

+	P "P1" 2

+	E 0.000000 0.000000 269.999924

+	E 10.078723 0.000000 90.000000

+	E -0.157881 4.068390 292.500000

+	C 0 0.000000 6.377953 10.078740 6.377953 180.000000 13.553240

+	S 0 0.000000 10.078740 0.000000 0.000000 0.000000

+	C 0 0.000000 -6.377953 -2.598648 -1.824058 22.500000 14.441819

+	C 0 0.000000 15.666120 10.650075 15.794470 193.553240 23.388952

+	S 0 0.000000 8.584076 0.177609 6.978661 0.564629

+	END

+

+SUBCONTENTS Lego - 12V Track

+TURNOUT LEGO "Lego	Straight Track (12V)	3242"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.039370 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 5.039370 0.000000

+	END

+TURNOUT LEGO "Lego	Curve Track (12V)	3241"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.821209 0.958998 67.500000

+	C 0 0.000000 -12.598425 0.000000 12.598425 157.500000 22.500000

+	END

+TURNOUT LEGO "Lego	Crossing Track (12V)	3232"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 5.039370 0.000000 90.000000

+	E 2.519692 2.519685 360.000000

+	E 2.519678 -2.519685 180.000000

+	S 0 0.000000 0.000000 0.000000 5.039370 0.000000

+	S 0 0.000000 2.519692 2.519685 2.519678 -2.519685

+	END

+TURNOUT LEGO "Lego	Left Switch (12V)	73697/7859"

+	P "P0" 1

+	P "P1" 2 3 4

+	E 0.000000 0.000000 270.000000

+	E 10.078740 2.519685 90.000000

+	E 10.078740 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 10.078740 0.000000

+	C 0 0.000000 -10.236220 0.000000 10.236220 156.774050 23.225950

+	S 0 0.000000 4.036786 0.829585 6.042006 1.690111

+	C 0 0.000000 10.236220 10.078740 -7.716535 336.774050 23.225950

+	END

+TURNOUT LEGO "Lego	Right Switch (12V)	73696/7859"

+	P "P0" 1

+	P "P1" 2 3 4

+	E 0.000000 0.000000 270.000000

+	E 0.000000 2.519685 270.000000

+	E 10.078740 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 10.078740 0.000000

+	C 0 0.000000 10.236220 10.078740 10.236220 180.000000 23.225950

+	S 0 0.000000 6.042006 0.829585 4.036787 1.690111

+	C 0 0.000000 -10.236220 0.000000 -7.716535 0.000000 23.225950

+	END

+

+SUBCONTENTS Lego - RC Track

+TURNOUT LEGO "Lego	Straight Track (RC)	53401"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.039370 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 5.039370 0.000000

+	END

+TURNOUT LEGO "Lego	Curve Track (RC)	53400"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.821209 0.958998 67.500000

+	C 0 0.000000 -12.598425 0.000000 12.598425 157.500000 22.500000

+	END

+TURNOUT LEGO "Lego	Left Switch (RC)	53407"

+	P "P0" 1 5 4 3

+	P "P1" 2

+	E 0.000000 0.000000 270.000000

+	E 10.078740 -0.000027 90.000000

+	E 10.236648 4.068369 67.500000

+	C 0 0.000000 -6.377953 0.000017 6.377953 166.446760 13.553240

+	S 0 0.000000 0.000000 0.000000 10.078740 -0.000027

+	C 0 0.000000 6.377953 12.677383 -1.824092 323.058181 14.441819

+	C 0 0.000000 -15.666120 -0.571293 15.794471 143.057808 23.388952

+	S 0 0.000000 1.494665 0.177605 3.100081 0.564621

+	END

+TURNOUT LEGO "Lego	Right Switch (RC)	53404"

+	P "P0" 1 5 4 3

+	P "P1" 2

+	E 0.000000 0.000000 269.999924

+	E 10.078723 0.000000 90.000000

+	E -0.157881 4.068390 292.500000

+	C 0 0.000000 6.377953 10.078740 6.377953 180.000000 13.553240

+	S 0 0.000000 10.078740 0.000000 0.000000 0.000000

+	C 0 0.000000 -6.377953 -2.598648 -1.824058 22.500000 14.441819

+	C 0 0.000000 15.666120 10.650075 15.794470 193.553240 23.388952

+	S 0 0.000000 8.584076 0.177609 6.978661 0.564629

+	END

+TURNOUT LEGO "Lego	Double Crossover (RC)	60128"

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

+	P "Reverse" 1 7 8 9 6 0 4 10 11 12 3

+	E 0.000000 0.000000 270.000000

+	E 15.118110 0.000000 90.000000

+	E 0.000000 5.039370 270.000000

+	E 15.118110 5.039370 90.000000

+	S 0 0.000000 0.000000 0.000000 2.220991 0.000000

+	S 0 0.000000 2.220991 0.000000 12.897119 0.000000

+	S 0 0.000000 12.897119 0.000000 15.118110 0.000000

+	S 0 0.000000 0.000000 5.039370 2.220991 5.039370

+	S 0 0.000000 2.220991 5.039370 12.897119 5.039370

+	S 0 0.000000 12.897119 5.039370 15.118110 5.039370

+	C 0 0.000000 -6.425198 2.221000 6.425198 139.921630 40.078446

+	S 0 0.000000 6.357761 1.508868 8.760349 3.530502

+	C 0 0.000000 6.425198 12.897126 -1.385823 319.921630 40.078446

+	C 0 0.000000 6.425198 2.220966 -1.385828 0.000076 40.078446

+	S 0 0.000000 6.357761 3.530502 8.760349 1.508868

+	C 0 0.000000 -6.425198 12.897126 6.425193 180.000076 40.078446

+	END

diff --git a/app/lib/params/S-MTH S-Trax.xtp b/app/lib/params/S-MTH S-Trax.xtp
new file mode 100644
index 0000000..964c2a9
--- /dev/null
+++ b/app/lib/params/S-MTH S-Trax.xtp
@@ -0,0 +1,156 @@
+CONTENTS MTH S-Trax S Scale Track

+SUBCONTENTS MTH S-Trax S Scale Track - Straight Track

+TURNOUT S "MTH S-Trax	5"" Straight	35-1003"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 5.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 5.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 5.000000 -1.281250

+END

+TURNOUT S "MTH S-Trax	10"" Straight	35-1002"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 10.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 10.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 10.000000 -1.281250

+END

+TURNOUT S "MTH S-Trax	15"" Straight	35-1001"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 15.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 15.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 15.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 15.000000 -1.281250

+END

+TURNOUT S "MTH S-Trax	40"" Flex Straight	35-1004/5"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 40.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 40.000000 0.000000

+END

+

+SUBCONTENTS MTH S-Trax S Scale Track - Curve Track

+TURNOUT S "MTH S-Trax	20"" 30D Curve	35-1006"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 10.000000 -2.679492 120.000000

+	C 0 0 20.000000 0.000000 -20.000000 0.000000 30.000000

+	A 11579568 0.053333 21.281250 0.000000 -20.000000 0.000000 30.000000

+	A 11579568 0.053333 18.718750 0.000000 -20.000000 0.000000 30.000000

+END

+TURNOUT S "MTH S-Trax	20"" 15D Curve	35-1007"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.176381 -0.681483 105.000000

+	C 0 0 20.000000 0.000000 -20.000000 0.000000 15.000000

+	A 11579568 0.053333 21.281250 0.000000 -20.000000 0.000000 15.000000

+	A 11579568 0.053333 18.718750 0.000000 -20.000000 0.000000 15.000000

+END

+TURNOUT S "MTH S-Trax	25"" 30D Curve	35-1008"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 12.500000 -3.349365 120.000000

+	C 0 0 25.000000 0.000000 -25.000000 0.000000 30.000000

+	A 11579568 0.053333 26.281250 0.000000 -25.000000 0.000000 30.000000

+	A 11579568 0.053333 23.718750 0.000000 -25.000000 0.000000 30.000000

+END

+TURNOUT S "MTH S-Trax	25"" 15D Curve	35-1009"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.470476 -0.851854 105.000000

+	C 0 0 25.000000 0.000000 -25.000000 0.000000 15.000000

+	A 11579568 0.053333 26.281250 0.000000 -25.000000 0.000000 15.000000

+	A 11579568 0.053333 23.718750 0.000000 -25.000000 0.000000 15.000000

+END

+TURNOUT S "MTH S-Trax	30"" 30D Curve	35-1010"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 15.000000 -4.019238 120.000000

+	C 0 0 30.000000 0.000000 -30.000000 0.000000 30.000000

+	A 11579568 0.053333 31.281250 0.000000 -30.000000 0.000000 30.000000

+	A 11579568 0.053333 28.718750 0.000000 -30.000000 0.000000 30.000000

+END

+TURNOUT S "MTH S-Trax	30"" 15D Curve	35-1011"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 7.764571 -1.022225 105.000000

+	C 0 0 30.000000 0.000000 -30.000000 0.000000 15.000000

+	A 11579568 0.053333 31.281250 0.000000 -30.000000 0.000000 15.000000

+	A 11579568 0.053333 28.718750 0.000000 -30.000000 0.000000 15.000000

+END

+

+SUBCONTENTS MTH S-Trax S Scale Track - Misc Track

+TURNOUT S "MTH S-Trax	5"" Bumper	35-1021"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	S 0 0 0.000000 0.000000 5.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 6.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 6.000000 -1.281250

+	L 11579568 0.053333 6.000000 1.281250 6.000000 -1.281250

+	L 0 0.070000 4.000000 0.000000 5.000000 0.437000

+	L 0 0.070000 4.000000 0.000000 5.000000 -0.437000

+	L 0 0.070000 4.000000 0.437000 4.000000 -0.437000

+END

+TURNOUT S "MTH S-Trax	5"" Uncoupler	35-1022"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 5.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 5.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 5.000000 -1.281250

+	L 11579568 0.053333 1.000000 0.000000 4.000000 0.000000

+	F 12566463 0.000000 4

+		1.000000 0.250000 0

+		1.500000 0.250000 0

+		1.500000 -0.250000 0

+		1.000000 -0.250000 0

+	F 12566463 0.000000 4

+		3.500000 0.250000 0

+		4.000000 0.250000 0

+		4.000000 -0.250000 0

+		3.500000 -0.250000 0

+END

+TURNOUT S "MTH S-Trax	5"" Acc. Operator	35-1023"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 5.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 5.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 5.000000 -1.281250

+END

+

+SUBCONTENTS MTH S-Trax S Scale Track - Turnout

+TURNOUT S "MTH S-Trax	#3 Left Turnout	35-1019"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	E 10.000000 2.500000 60.000000

+	S 0 0.000000 0.000000 0.000000 1.543918 0.000000

+	S 0 0.000000 1.543918 0.000000 10.000000 0.000000

+	C 0 0.000000 -15.398371 1.543938 15.398371 149.999924 30.000152

+	S 0 0.000000 9.243132 2.063007 10.000000 2.500000

+	L 11579568 0.053333 -0.000003 -1.281250 9.999997 -1.281239

+	L 11579568 0.053333 0.000000 1.281250 1.543918 1.281252

+	A 11579568 0.053333 14.117121 1.543938 15.398371 149.999924 30.000152

+	L 11579568 0.053333 10.356817 1.226543 10.640643 1.390415

+	L 11579568 0.053333 8.602493 3.172594 9.359360 3.609587

+END

+TURNOUT S "MTH S-Trax	#3 Right Turnout	35-1018"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	E 10.000000 -2.500000 120.000000

+	S 0 0.000000 0.000000 0.000000 1.543918 0.000000

+	S 0 0.000000 1.543918 0.000000 10.000000 0.000000

+	C 0 0.000000 15.398371 1.543856 -15.398371 0.000076 30.000152

+	S 0 0.000000 9.243132 -2.063007 10.000000 -2.500000

+	L 11579568 0.053333 -0.000003 -1.281250 1.543914 -1.281248

+	L 11579568 0.053333 0.000000 1.281250 10.000000 1.281261

+	A 11579568 0.053333 14.117121 1.543856 -15.398371 0.000076 30.000152

+	L 11579568 0.053333 8.602487 -3.172591 9.359354 -3.609583

+	L 11579568 0.053333 10.356817 -1.226543 10.640643 -1.390415

+END
\ No newline at end of file
diff --git a/app/lib/params/S-SHelper S-Trax.xtp b/app/lib/params/S-SHelper S-Trax.xtp
new file mode 100644
index 0000000..5be8270
--- /dev/null
+++ b/app/lib/params/S-SHelper S-Trax.xtp
@@ -0,0 +1,200 @@
+CONTENTS S Helper Showcase Line Code 131 S Scale

+SUBCONTENTS S Helper Showcase Line Code 131 - Straight Track

+TURNOUT S "S Helper Showcase Line	C131 5"" Straight	297"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 5.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 5.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 5.000000 -1.281250

+	END

+TURNOUT S "S Helper Showcase Line	C131 10"" Straight	258"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 10.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 10.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 10.000000 -1.281250

+	END

+TURNOUT S "S Helper Showcase Line	C131 15"" Straight	257"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 15.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 15.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 15.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 15.000000 -1.281250

+	END

+TURNOUT S "S Helper Showcase Line	C131 36"" Straight	465"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 36.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 36.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 36.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 36.000000 -1.281250

+	END

+

+SUBCONTENTS S Helper Showcase Line Code 131 - Curve Track

+TURNOUT S "S Helper Showcase Line	C131 20"" 30D Curve	259"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 10.000000 -2.679492 120.000000

+	C 0 0 20.000000 0.000000 -20.000000 0.000000 30.000000

+	A 11579568 0.053333 21.281250 0.000000 -20.000000 0.000000 30.000000

+	A 11579568 0.053333 18.718750 0.000000 -20.000000 0.000000 30.000000

+	END

+TURNOUT S "S Helper Showcase Line	C131 20"" 15D Curve	291"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.176381 -0.681483 105.000000

+	C 0 0 20.000000 0.000000 -20.000000 0.000000 15.000000

+	A 11579568 0.053333 21.281250 0.000000 -20.000000 0.000000 15.000000

+	A 11579568 0.053333 18.718750 0.000000 -20.000000 0.000000 15.000000

+	END

+TURNOUT S "S Helper Showcase Line	C131 25"" 30D Curve	292"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 12.500000 -3.349365 120.000000

+	C 0 0 25.000000 0.000000 -25.000000 0.000000 30.000000

+	A 11579568 0.053333 26.281250 0.000000 -25.000000 0.000000 30.000000

+	A 11579568 0.053333 23.718750 0.000000 -25.000000 0.000000 30.000000

+	END

+TURNOUT S "S Helper Showcase Line	C131 25"" 15D Curve	293"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.470476 -0.851854 105.000000

+	C 0 0 25.000000 0.000000 -25.000000 0.000000 15.000000

+	A 11579568 0.053333 26.281250 0.000000 -25.000000 0.000000 15.000000

+	A 11579568 0.053333 23.718750 0.000000 -25.000000 0.000000 15.000000

+	END

+TURNOUT S "S Helper Showcase Line	C131 30"" 30D Curve	294"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 15.000000 -4.019238 120.000000

+	C 0 0 30.000000 0.000000 -30.000000 0.000000 30.000000

+	A 11579568 0.053333 31.281250 0.000000 -30.000000 0.000000 30.000000

+	A 11579568 0.053333 28.718750 0.000000 -30.000000 0.000000 30.000000

+	END

+TURNOUT S "S Helper Showcase Line	C131 30"" 15D Curve	296"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 7.764571 -1.022225 105.000000

+	C 0 0 30.000000 0.000000 -30.000000 0.000000 15.000000

+	A 11579568 0.053333 31.281250 0.000000 -30.000000 0.000000 15.000000

+	A 11579568 0.053333 28.718750 0.000000 -30.000000 0.000000 15.000000

+	END

+

+

+SUBCONTENTS S Helper Showcase Line Code 131 - Crossings

+TURNOUT S "S Helper Showcase Line	C131 5"" 90D Crossing	467"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 5.000000 0.000000 90.000000

+	E 2.500000 2.500000 0.000000

+	E 2.500000 -2.500000 180.000000

+	S 0 0 0.000000 0.000000 5.000000 0.000000

+	S 0 0 2.500000 2.500000 2.500000 -2.500000

+	L 11579568 0.053333 0.000000 1.281250 1.218750 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 1.218750 -1.281250

+	L 11579568 0.053333 3.781250 1.281250 5.000000 1.281250

+	L 11579568 0.053333 3.781250 -1.281250 5.000000 -1.281250

+	L 11579568 0.053333 1.218750 2.500000 1.218750 1.281250

+	L 11579568 0.053333 3.781250 2.500000 3.781250 1.281250

+	L 11579568 0.053333 1.218750 -1.281250 1.218750 -2.500000

+	L 11579568 0.053333 3.781250 -1.281250 3.781250 -2.500000

+	END

+

+

+

+SUBCONTENTS S Helper Showcase Line Code 131 - Misc Track

+TURNOUT S "S Helper Showcase Line	C131 5"" LED Bumper	468"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	S 0 0 0.000000 0.000000 4.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 5.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 5.000000 -1.281250

+	L 11579568 0.053333 5.000000 1.281250 5.000000 -1.281250

+	L 0 0.053333 3.126000 0.437000 4.000000 0.437000

+	L 0 0.053333 3.126000 -0.437000 4.000000 -0.437000

+	L 0 0.053333 4.000000 0.437000 4.000000 -0.437000

+	L 0 0.053333 3.126000 0.437000 3.126000 -0.437000

+	L 0 0.053333 3.126000 0.437000 4.000000 -0.437000

+	L 0 0.053333 3.126000 -0.437000 4.000000 0.437000

+	G 16711680 0.000000 0.150000 3.563000 0.000000 0

+	END

+TURNOUT S "S Helper Showcase Line	C131 5"" Bumper	926"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	S 0 0 0.000000 0.000000 4.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 5.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 5.000000 -1.281250

+	L 11579568 0.053333 5.000000 1.281250 5.000000 -1.281250

+	L 0 0.053333 3.126000 0.437000 4.000000 0.437000

+	L 0 0.053333 3.126000 -0.437000 4.000000 -0.437000

+	L 0 0.053333 4.000000 0.437000 4.000000 -0.437000

+	L 0 0.053333 3.126000 0.437000 3.126000 -0.437000

+	L 0 0.053333 3.126000 0.437000 4.000000 -0.437000

+	L 0 0.053333 3.126000 -0.437000 4.000000 0.437000

+	END

+TURNOUT S "S Helper Showcase Line	C131 5"" Uncoupler	670"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 5.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 5.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 5.000000 -1.281250

+	L 11579568 0.053333 1.000000 0.000000 4.000000 0.000000

+	F 12566463 0.000000 4

+		1.000000 0.250000 0

+		1.500000 0.250000 0

+		1.500000 -0.250000 0

+		1.000000 -0.250000 0

+	F 12566463 0.000000 4

+		3.500000 0.250000 0

+		4.000000 0.250000 0

+		4.000000 -0.250000 0

+		3.500000 -0.250000 0

+	END

+TURNOUT S "S Helper Showcase Line	C131 5"" Third Rail	671"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 5.000000 0.000000

+	L 11579568 0.053333 0.000000 1.281250 5.000000 1.281250

+	L 11579568 0.053333 0.000000 -1.281250 5.000000 -1.281250

+	L 0 0.053333 0.000000 1.281250 5.000000 1.281250

+	END

+

+	

+SUBCONTENTS S Helper Showcase Line Code 131 - Turnout

+TURNOUT S "S Helper Showcase Line	#3 Left Turnout	299"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	E 10.000000 2.500000 60.000000

+	S 0 0.000000 0.000000 0.000000 1.543918 0.000000

+	S 0 0.000000 1.543918 0.000000 10.000000 0.000000

+	C 0 0.000000 -15.398371 1.543938 15.398371 149.999924 30.000152

+	S 0 0.000000 9.243132 2.063007 10.000000 2.500000

+	L 11579568 0.053333 -0.000003 -1.281250 10.000000 -1.281239

+	L 11579568 0.053333 0.000000 1.281250 1.543918 1.281252

+	A 11579568 0.053333 14.117121 1.543938 15.398371 150.000000 30.000000

+	L 11579568 0.053333 10.356817 1.226543 10.640643 1.390415

+	L 11579568 0.053333 8.602493 3.172594 9.359360 3.609587

+	END

+TURNOUT S "S Helper Showcase Line	#3 Right Turnout	298"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	E 10.000000 -2.500000 120.000000

+	S 0 0.000000 0.000000 0.000000 1.543918 0.000000

+	S 0 0.000000 1.543918 0.000000 10.000000 0.000000

+	C 0 0.000000 15.398371 1.543856 -15.398371 0.000076 30.000152

+	S 0 0.000000 9.243132 -2.063007 10.000000 -2.500000

+	L 11579568 0.053333 -0.000003 -1.281250 1.543914 -1.281248

+	L 11579568 0.053333 0.000000 1.281250 10.000000 1.281261

+	A 11579568 0.053333 14.117121 1.543856 -15.398371 0.000000 30.000000

+	L 11579568 0.053333 8.602487 -3.172591 9.359354 -3.609583

+	L 11579568 0.053333 10.356817 -1.226543 10.640643 -1.390415

+END
\ No newline at end of file
diff --git a/app/lib/params/TT-Kuehn.xtp b/app/lib/params/TT-Kuehn.xtp
index 12585a5..a71f195 100644
--- a/app/lib/params/TT-Kuehn.xtp
+++ b/app/lib/params/TT-Kuehn.xtp
@@ -56,16 +56,16 @@ TURNOUT TT  "Kuehn Track	R2 Curve 14.37R 365mm 10°	72210"
 	E 2.495338 -0.218314 100.000000
 	C 0 0 14.370079 0.000000 -14.370079 0.000000 10.000000
 	END
-TURNOUT TT  "Kuehn Track	R2 Curve 14.37R 353mm 20°	72220"
+TURNOUT TT  "Kuehn Track	R2 Curve 14.37R 365mm 20°	72220"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
 	E 4.914856 -0.866622 110.000000
 	C 0 0 14.370079 0.000000 -14.370079 0.000000 20.000000
 	END
-TURNOUT TT  "Kuehn Track	R2 Curve 14.37R 353mm 30°	72230"
+TURNOUT TT  "Kuehn Track	R2 Curve 14.37R 365mm 30°	72230"
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
-	E 7.1185039 -1.925225 120.000000
+	E 7.1850394 -1.925225 120.000000
 	C 0 0 14.370079 0.000000 -14.370079 0.000000 30.000000
 	END
 
diff --git a/app/lib/params/TTi-AuhagenNG.xtp b/app/lib/params/TTi-AuhagenNG.xtp
new file mode 100644
index 0000000..4dc194c
--- /dev/null
+++ b/app/lib/params/TTi-AuhagenNG.xtp
@@ -0,0 +1,40 @@
+CONTENTS Auhagen Narrow Gauge TT Scale Track System

+SUBCONTENTS Auhagen TTi Narrow Gauge Track - Straight Track

+TURNOUT TTi  "Auhagen TTi Track	G44 Straight 1.65 41.7mm	43700-1"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.641732 0.000000 90.000000

+	S 0 0 0.000000 0.000000 1.641732 0.000000

+	END

+

+SUBCONTENTS Auhagen TTi Narrow Gauge Track - Curve Track

+TURNOUT TTi  "Auhagen TTi Track	Curve 1.65R 42mm 30°	43700-2"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 0.820866 -0.219950 120.000000

+	C 0 0 1.641732 0.000000 -1.641732 0.000000 30.000000

+	END

+

+SUBCONTENTS Auhagen TTi Narrow Gauge Track - Turnouts

+TURNOUT TTi "Auhagen TTi Track	Left Turnout	43700-3"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 1.212598 0.000000 90.000000

+	E 1.212598 0.437530 60.000000

+	S 0 0.000000 0.000000 0.000000 0.177000 0.000000

+	S 0 0.000000 0.177000 0.000000 1.212598 0.000000

+	C 0 0.000000 -1.036677 0.177001 1.036677 149.999924 30.000152

+	S 0 0.000000 0.695340 0.138889 1.212598 0.437530

+	END

+TURNOUT TTi "Auhagen TTi Track	Right Turnout	43700-4"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 1.212598 0.000000 90.000000

+	E 1.212598 -0.437530 120.000000

+	S 0 0.000000 0.000000 0.000000 0.177000 0.000000

+	S 0 0.000000 0.177000 0.000000 1.212598 0.000000

+	C 0 0.000000 1.036677 0.176996 -1.036677 0.000076 30.000152

+	S 0 0.000000 0.695340 -0.138889 1.212598 -0.437530

+	END

diff --git a/app/lib/params/TilligAdvTT.xtp b/app/lib/params/TilligAdvTT.xtp
index 20d085e..b9ddf8b 100644
--- a/app/lib/params/TilligAdvTT.xtp
+++ b/app/lib/params/TilligAdvTT.xtp
@@ -1,304 +1,323 @@
-CONTENTS Pilz/Tillig Advance Track System
-SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Straight Track
-TURNOUT TT  "Pilz/Tillig Track	G1 Straight 6.535 166mm	83101"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.535433 0.000000 90.000000
-	S 0 0 0.000000 0.000000 6.535433 0.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	G2 Straight 3.268 83mm	83102"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.267717 0.000000 90.000000
-	S 0 0 0.000000 0.000000 3.267717 0.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	G3 Straight 1.692 43mm	83105"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.692913 0.000000 90.000000
-	S 0 0 0.000000 0.000000 1.692913 0.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	G4 Straight 1.633 41.5mm	83103"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.633858 0.000000 90.000000
-	S 0 0 0.000000 0.000000 1.633858 0.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	G5 Straight 1.437 36.5mm	83104"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.437008 0.000000 90.000000
-	S 0 0 0.000000 0.000000 1.437008 0.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	Adapter Track 2.244 57mm	83132"
-	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
-
-SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Curve Track
-TURNOUT TT  "Pilz/Tillig Track	R01 Curve 10.51R 267mm 30°	83116"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 5.255906 -1.408316 120.000000
-	C 0 0 10.511811 0.000000 -10.511811 0.000000 30.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	R04 Curve 10.51R 267mm 7.5°	83115"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.372067 -0.089930 97.500000
-	C 0 0 10.511811 0.000000 -10.511811 0.000000 7.500000
-	END
-TURNOUT TT  "Pilz/Tillig Track	R11 Curve 12.20R 310mm 30°	83109"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.102362 -1.635123 120.000000
-	C 0 0 12.204724 0.000000 -12.204724 0.000000 30.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	R12 Curve 12.20R 310mm 15°	83110"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.158815 -0.415866 105.000000
-	C 0 0 12.204724 0.000000 -12.204724 0.000000 15.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	R14 Curve 12.20R 310mm 7.5°	83113"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.593036 -0.104413 97.500000
-	C 0 0 12.204724 0.000000 -12.204724 0.000000 7.500000
-	END
-TURNOUT TT  "Pilz/Tillig Track	R21 Curve 13.89R 353mm 30°	83106"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.948819 -1.861930 120.000000
-	C 0 0 13.897638 0.000000 -13.897638 0.000000 30.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	R22 Curve 13.89R 353mm 15°	83107"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.596973 -0.473551 105.000000
-	C 0 0 13.897638 0.000000 -13.897638 0.000000 15.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	R24 Curve 13.89R 353mm 7.5°	83114"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.814006 -0.118896 97.500000
-	C 0 0 13.897638 0.000000 -13.897638 0.000000 7.500000
-	END
-TURNOUT TT  "Pilz/Tillig Track	R31 Curve 15.59R 396mm 30°	83111"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 7.795276 -2.088738 120.000000
-	C 0 0 15.590551 0.000000 -15.590551 0.000000 30.000000
-	END
-TURNOUT TT  "Pilz/Tillig Track	R32 Curve 15.59R 396mm 15°	83112"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 4.035132 -0.531235 105.000000
-	C 0 0 15.590551 0.000000 -15.590551 0.000000 15.000000
-	END
-
-SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Function Track
-TURNOUT TT  "Pilz/Tillig Track	Straight Feeder 6.535 166mm	83149"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.535433 0.000000 90.000000
-	S 0 0 0.000000 0.000000 6.535433 0.000000
-	F 11579568 0.000000 4
-		0.500000 -0.500000 0
-		1.000000 -0.500000 0
-		1.000000 -1.000000 0
-		0.500000 -1.000000 0
-	END
-TURNOUT TT  "Pilz/Tillig Track	Uncouple Track 3.268 83mm	83201"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.267717 0.000000 90.000000
-	S 0 0 0.000000 0.000000 3.267717 0.000000
-	F 11579568 0.000000 4
-		0.000000 -0.500000 0
-		2.750000 -0.500000 0
-		2.750000 -1.000000 0
-		0.000000 -1.000000 0
-	F 11579568 0.000000 4
-		0.5000000 -0.200000 0
-		2.750000 -0.200000 0
-		2.750000 0.200000 0
-		0.500000 0.2000000 0
-	END
-TURNOUT TT  "Pilz/Tillig Track	Isolation Track 1.633 41.5mm	83150"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.633858 0.000000 90.000000
-	S 0 0 0.000000 0.000000 1.633858 0.000000
-	END
-
-SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Turnouts
-TURNOUT TT "Tillig	EW1-left	83322"
-	P "Normal" 1 
-	P "Reverse" 2 3 
-	E 0.000000 0.000000 270.000000
-	E 5.098425 0.000000 90.000000
-	E 4.985016 0.845476 75.000000
-	S 0 0.000000 0.000000 0.000000 5.098425 0.000000
-	C 0 0.000000 -13.897638 0.000000 13.897638 165.000000 15.000000
-	S 0 0.000000 3.596973 0.473551 4.985016 0.845476
-	END
-TURNOUT TT "Tillig	EW1-right	83321"
-	P "Normal" 1 
-	P "Reverse" 2 3
-	E 0.000000 0.000000 270.000000
-	E 5.098425 0.000000 90.000000
-	E 4.985016 -0.845476 105.000000
-	S 0 0.000000 0.000000 0.000000 5.098425 0.000000
-	C 0 0.000000 13.897638 0.000000 -13.897638 0.000000 15.000000
-	S 0 0.000000 3.596973 -0.473551 4.985016 -0.845476
-	END
-TURNOUT TT "Tillig	EW2-left	83322"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 6.535433 0.000000 90.000000
-	E 6.429717 0.846488 75.000000
-	S 0 0.000000 0.000000 0.000000 0.472063 0.000000
-	S 0 0.000000 0.472063 0.000000 6.535433 0.000000
-	C 0 0.000000 -21.257102 0.472091 21.257102 164.999924 15.000152
-	S 0 0.000000 5.973856 0.724332 6.429717 0.846488
-	END
-TURNOUT TT "Tillig	EW2-right	83321"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 6.535433 0.000000 90.000000
-	E 6.429717 -0.846488 105.000000
-	S 0 0.000000 0.000000 0.000000 0.472063 0.000000
-	S 0 0.000000 0.472063 0.000000 6.535433 0.000000
-	C 0 0.000000 21.257102 0.471978 -21.257102 0.000076 15.000152
-	S 0 0.000000 5.973856 -0.724332 6.429717 -0.846488
-	END
-TURNOUT TT "Tillig	EW3-left	83342"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 8.149606 0.000000 90.000000
-	E 8.054532 0.846565 78.000000
-	S 0 0.000000 0.000000 0.000000 0.472100 0.000000
-	S 0 0.000000 0.472100 0.000000 8.149606 0.000000
-	C 0 0.000000 -34.248932 0.472145 34.248932 167.999924 12.000152
-	S 0 0.000000 7.592936 0.748439 8.054532 0.846565
-	END
-TURNOUT TT "Tillig	EW3-right	83341"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 8.149606 0.000000 90.000000
-	E 8.054532 -0.846565 102.000000
-	S 0 0.000000 0.000000 0.000000 0.472100 0.000000
-	S 0 0.000000 0.472100 0.000000 8.149606 0.000000
-	C 0 0.000000 34.248932 0.471964 -34.248932 0.000076 12.000152
-	S 0 0.000000 7.592936 -0.748439 8.054532 -0.846565
-	END
-TURNOUT TT "Tillig	IBW-left	83362"
-	P "Normal" 1 4 5
-	P "Reverse" 1 2 3
-	E 0.000000 0.000000 270.000000
-	E 6.429717 0.846488 75.000000
-	E 6.102362 1.635123 60.000000
-	S 0 0.000000 0.000000 0.000000 0.472027 0.000000
-	C 0 0.000000 -10.443154 0.472041 10.443154 149.999924 30.000152
-	S 0 0.000000 5.693624 1.399129 6.102362 1.635123
-	C 0 0.000000 -21.257102 0.472091 21.257102 164.999924 15.000249
-	S 0 0.000000 5.973856 0.724332 6.429717 0.846488
-	END
-TURNOUT TT "Tillig	IBW-right	83361"
-	P "Normal" 1 4 5
-	P "Reverse" 1 2 3
-	E 0.000000 0.000000 270.000000
-	E 6.429717 -0.846488 105.000000
-	E 6.102362 -1.635123 120.000000
-	S 0 0.000000 0.000000 0.000000 0.472027 0.000000
-	C 0 0.000000 10.443154 0.471985 -10.443154 0.000076 30.000152
-	S 0 0.000000 5.693624 -1.399129 6.102362 -1.635123
-	C 0 0.000000 21.257102 0.472091 -21.257102 359.999979 15.000249
-	S 0 0.000000 5.973856 -0.724332 6.429717 -0.846488
-	END
-TURNOUT TT "Tillig	ABW-15 Wye	83380"
-	P "Left" 1 2 3
-	P "Right" 1 4 5
-	E 0.000000 0.000000 270.000000
-	E 6.552004 0.429441 82.500000
-	E 6.552004 -0.429441 97.500000
-	S 0 0.000000 0.000000 0.000000 0.472128 0.000000
-	C 0 0.000000 -42.994583 0.472185 42.994583 172.499924 7.500152
-	S 0 0.000000 6.084156 0.367839 6.552004 0.429441
-	C 0 0.000000 42.994583 0.471957 -42.994583 0.000076 7.500152
-	S 0 0.000000 6.084156 -0.367839 6.552004 -0.429441
-	END
-TURNOUT TT "Tillig	ABW-12 Wye	83382"
-	P "Left" 1 2 3
-	P "Right" 1 4 5
-	E 0.000000 0.000000 270.000000
-	E 8.172974 0.428327 84.000000
-	E 8.172974 -0.428327 96.000000
-	S 0 0.000000 0.000000 0.000000 0.472209 0.000000
-	C 0 0.000000 -69.180753 0.472300 69.180753 173.999924 6.000152
-	S 0 0.000000 7.703743 0.378998 8.172974 0.428327
-	C 0 0.000000 69.180753 0.471933 -69.180753 0.000076 6.000152
-	S 0 0.000000 7.703743 -0.378998 8.172974 -0.428327
-	END
-TURNOUT TT "Tillig	DKW15 DOuble-Slip	83300"
-	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.535433 0.000000 90.000000
-	E 0.111343 0.845742 285.000000
-	E 6.424090 -0.845742 105.000000
-	S 0 0.000000 0.000000 0.000000 0.944089 0.000000
-	S 0 0.000000 0.944089 0.000000 5.591344 0.000000
-	S 0 0.000000 5.591344 0.000000 6.535433 0.000000
-	S 0 0.000000 0.111343 0.845742 1.023131 0.601422
-	S 0 0.000000 1.023131 0.601422 5.512302 -0.601422
-	S 0 0.000000 5.512302 -0.601422 6.424090 -0.845742
-	C 0 0.000000 17.650057 0.944019 -17.650057 0.000076 15.000152
-	C 0 0.000000 -17.650057 5.591366 17.650051 180.000076 15.000152
-	END
-TURNOUT TT "Tillig	DGV Dbl. Crossover	83210"
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 8 9 6 0 4 10 11 12 3
-	E 0.000000 0.000000 270.000000
-	E 9.881890 0.000000 90.000000
-	E 0.000000 1.692913 270.000000
-	E 9.881890 1.692913 90.000000
-	S 0 0.000000 0.000000 0.000000 0.789084 0.000000
-	S 0 0.000000 0.789084 0.000000 9.092806 0.000000
-	S 0 0.000000 9.092806 0.000000 9.881890 0.000000
-	S 0 0.000000 0.000000 1.692913 0.789084 1.692913
-	S 0 0.000000 0.789084 1.692913 9.092806 1.692913
-	S 0 0.000000 9.092806 1.692913 9.881890 1.692913
-	C 0 0.000000 -10.474132 0.789097 10.474132 159.252360 20.747716
-	S 0 0.000000 4.499581 0.679253 5.382309 1.013660
-	C 0 0.000000 10.474132 9.092819 -8.781214 339.252360 20.747716
-	C 0 0.000000 10.474132 0.789042 -8.781219 0.000076 20.747716
-	S 0 0.000000 4.499581 1.013660 5.382309 0.679253
-	C 0 0.000000 -10.474132 9.092819 10.474127 180.000076 20.747716
-	END
-SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Crossings
-TURNOUT TT "Tillig	K1-15 Crossing	83160"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 6.535433 0.000000 90.000000
-	E 0.111343 0.845742 285.000000
-	E 6.424090 -0.845742 105.000000
-	S 0 0.000000 0.000000 0.000000 6.535433 0.000000
-	S 0 0.000000 0.111343 0.845742 6.424090 -0.845742
-	END
-TURNOUT TT "Tillig	K2-30 Crossing	83170"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 3.267717 0.000000 90.000000
-	E 0.218894 0.816927 300.000000
-	E 3.048823 -0.816927 120.000000
-	S 0 0.000000 0.000000 0.000000 3.267717 0.000000
-	S 0 0.000000 0.218894 0.816927 3.048823 -0.816927
-	END
+CONTENTS Pilz/Tillig Advance Track System

+SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Straight Track

+TURNOUT TT  "Pilz/Tillig Track	G1 Straight 6.535 166mm	83101"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.535433 0.000000 90.000000

+	S 0 0 0.000000 0.000000 6.535433 0.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	G2 Straight 3.268 83mm	83102"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 3.267717 0.000000 90.000000

+	S 0 0 0.000000 0.000000 3.267717 0.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	G3 Straight 1.692 43mm	83105"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.692913 0.000000 90.000000

+	S 0 0 0.000000 0.000000 1.692913 0.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	G4 Straight 1.633 41.5mm	83103"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.633858 0.000000 90.000000

+	S 0 0 0.000000 0.000000 1.633858 0.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	G5 Straight 1.437 36.5mm	83104"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.437008 0.000000 90.000000

+	S 0 0 0.000000 0.000000 1.437008 0.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	Adapter Track 2.244 57mm	83132"

+	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

+

+SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Curve Track

+TURNOUT TT  "Pilz/Tillig Track	R01 Curve 10.51R 267mm 30°	83116"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.255906 -1.408316 120.000000

+	C 0 0 10.511811 0.000000 -10.511811 0.000000 30.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	R04 Curve 10.51R 267mm 7.5°	83115"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.372067 -0.089930 97.500000

+	C 0 0 10.511811 0.000000 -10.511811 0.000000 7.500000

+	END

+TURNOUT TT  "Pilz/Tillig Track	R11 Curve 12.20R 310mm 30°	83109"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.102362 -1.635123 120.000000

+	C 0 0 12.204724 0.000000 -12.204724 0.000000 30.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	R12 Curve 12.20R 310mm 15°	83110"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 3.158815 -0.415866 105.000000

+	C 0 0 12.204724 0.000000 -12.204724 0.000000 15.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	R14 Curve 12.20R 310mm 7.5°	83113"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.593036 -0.104413 97.500000

+	C 0 0 12.204724 0.000000 -12.204724 0.000000 7.500000

+	END

+TURNOUT TT  "Pilz/Tillig Track	R21 Curve 13.89R 353mm 30°	83106"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.948819 -1.861930 120.000000

+	C 0 0 13.897638 0.000000 -13.897638 0.000000 30.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	R22 Curve 13.89R 353mm 15°	83107"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 3.596973 -0.473551 105.000000

+	C 0 0 13.897638 0.000000 -13.897638 0.000000 15.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	R24 Curve 13.89R 353mm 7.5°	83114"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.814006 -0.118896 97.500000

+	C 0 0 13.897638 0.000000 -13.897638 0.000000 7.500000

+	END

+TURNOUT TT  "Pilz/Tillig Track	R31 Curve 15.59R 396mm 30°	83111"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 7.795276 -2.088738 120.000000

+	C 0 0 15.590551 0.000000 -15.590551 0.000000 30.000000

+	END

+TURNOUT TT  "Pilz/Tillig Track	R32 Curve 15.59R 396mm 15°	83112"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.035132 -0.531235 105.000000

+	C 0 0 15.590551 0.000000 -15.590551 0.000000 15.000000

+	END

+

+SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Function Track

+TURNOUT TT  "Pilz/Tillig Track	Straight Feeder 6.535 166mm	83149"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.535433 0.000000 90.000000

+	S 0 0 0.000000 0.000000 6.535433 0.000000

+	F 11579568 0.000000 4

+		0.500000 -0.500000 0

+		1.000000 -0.500000 0

+		1.000000 -1.000000 0

+		0.500000 -1.000000 0

+	END

+TURNOUT TT  "Pilz/Tillig Track	Uncouple Track 3.268 83mm	83201"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 3.267717 0.000000 90.000000

+	S 0 0 0.000000 0.000000 3.267717 0.000000

+	F 11579568 0.000000 4

+		0.000000 -0.500000 0

+		2.750000 -0.500000 0

+		2.750000 -1.000000 0

+		0.000000 -1.000000 0

+	F 11579568 0.000000 4

+		0.5000000 -0.200000 0

+		2.750000 -0.200000 0

+		2.750000 0.200000 0

+		0.500000 0.2000000 0

+	END

+TURNOUT TT  "Pilz/Tillig Track	Isolation Track 1.633 41.5mm	83150"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.633858 0.000000 90.000000

+	S 0 0 0.000000 0.000000 1.633858 0.000000

+	END

+

+SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Turnouts

+TURNOUT TT "Tillig	EW1-left 15d	83322/27"

+	P "Normal" 1 

+	P "Reverse" 2 3 

+	E 0.000000 0.000000 270.000000

+	E 5.098425 0.000000 90.000000

+	E 4.985016 0.845476 75.000000

+	S 0 0.000000 0.000000 0.000000 5.098425 0.000000

+	C 0 0.000000 -13.897638 0.000000 13.897638 165.000000 15.000000

+	S 0 0.000000 3.596973 0.473551 4.985016 0.845476

+	END

+TURNOUT TT "Tillig	EW1-right 15d	83321/26"

+	P "Normal" 1 

+	P "Reverse" 2 3

+	E 0.000000 0.000000 270.000000

+	E 5.098425 0.000000 90.000000

+	E 4.985016 -0.845476 105.000000

+	S 0 0.000000 0.000000 0.000000 5.098425 0.000000

+	C 0 0.000000 13.897638 0.000000 -13.897638 0.000000 15.000000

+	S 0 0.000000 3.596973 -0.473551 4.985016 -0.845476

+	END

+TURNOUT TT "Tillig	EW2-left 15d	83332"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.535433 0.000000 90.000000

+	E 6.429717 0.846488 75.000000

+	S 0 0.000000 0.000000 0.000000 0.472063 0.000000

+	S 0 0.000000 0.472063 0.000000 6.535433 0.000000

+	C 0 0.000000 -21.257102 0.472091 21.257102 164.999924 15.000152

+	S 0 0.000000 5.973856 0.724332 6.429717 0.846488

+	END

+TURNOUT TT "Tillig	EW2-right 15d	83331"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 6.535433 0.000000 90.000000

+	E 6.429717 -0.846488 105.000000

+	S 0 0.000000 0.000000 0.000000 0.472063 0.000000

+	S 0 0.000000 0.472063 0.000000 6.535433 0.000000

+	C 0 0.000000 21.257102 0.471978 -21.257102 0.000076 15.000152

+	S 0 0.000000 5.973856 -0.724332 6.429717 -0.846488

+	END

+TURNOUT TT "Tillig	EW3-left 12d	83342"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 8.149606 0.000000 90.000000

+	E 8.054532 0.846565 78.000000

+	S 0 0.000000 0.000000 0.000000 0.472100 0.000000

+	S 0 0.000000 0.472100 0.000000 8.149606 0.000000

+	C 0 0.000000 -34.248932 0.472145 34.248932 167.999924 12.000152

+	S 0 0.000000 7.592936 0.748439 8.054532 0.846565

+	END

+TURNOUT TT "Tillig	EW3-right 12d	83341"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 8.149606 0.000000 90.000000

+	E 8.054532 -0.846565 102.000000

+	S 0 0.000000 0.000000 0.000000 0.472100 0.000000

+	S 0 0.000000 0.472100 0.000000 8.149606 0.000000

+	C 0 0.000000 34.248932 0.471964 -34.248932 0.000076 12.000152

+	S 0 0.000000 7.592936 -0.748439 8.054532 -0.846565

+	END

+TURNOUT TT "Tillig	IBW-left	83362"

+	P "Normal" 1 4 5

+	P "Reverse" 1 2 3

+	E 0.000000 0.000000 270.000000

+	E 6.429717 0.846488 75.000000

+	E 6.102362 1.635123 60.000000

+	S 0 0.000000 0.000000 0.000000 0.472027 0.000000

+	C 0 0.000000 -10.443154 0.472041 10.443154 149.999924 30.000152

+	S 0 0.000000 5.693624 1.399129 6.102362 1.635123

+	C 0 0.000000 -21.257102 0.472091 21.257102 164.999924 15.000249

+	S 0 0.000000 5.973856 0.724332 6.429717 0.846488

+	END

+TURNOUT TT "Tillig	IBW-right	83361"

+	P "Normal" 1 4 5

+	P "Reverse" 1 2 3

+	E 0.000000 0.000000 270.000000

+	E 6.429717 -0.846488 105.000000

+	E 6.102362 -1.635123 120.000000

+	S 0 0.000000 0.000000 0.000000 0.472027 0.000000

+	C 0 0.000000 10.443154 0.471985 -10.443154 0.000076 30.000152

+	S 0 0.000000 5.693624 -1.399129 6.102362 -1.635123

+	C 0 0.000000 21.257102 0.472091 -21.257102 359.999979 15.000249

+	S 0 0.000000 5.973856 -0.724332 6.429717 -0.846488

+	END

+SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Wyes

+TURNOUT TT "Tillig	ABW-15 Wye	83380"

+	P "Left" 1 2 3

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 6.552004 0.429441 82.500000

+	E 6.552004 -0.429441 97.500000

+	S 0 0.000000 0.000000 0.000000 0.472128 0.000000

+	C 0 0.000000 -42.994583 0.472185 42.994583 172.499924 7.500152

+	S 0 0.000000 6.084156 0.367839 6.552004 0.429441

+	C 0 0.000000 42.994583 0.471957 -42.994583 0.000076 7.500152

+	S 0 0.000000 6.084156 -0.367839 6.552004 -0.429441

+END

+TURNOUT TT "Tillig	ABW-12 Wye	83382"

+	P "Left" 1 2 3

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 8.172974 0.428327 84.000000

+	E 8.172974 -0.428327 96.000000

+	S 0 0.000000 0.000000 0.000000 0.472209 0.000000

+	C 0 0.000000 -69.180753 0.472300 69.180753 173.999924 6.000152

+	S 0 0.000000 7.703743 0.378998 8.172974 0.428327

+	C 0 0.000000 69.180753 0.471933 -69.180753 0.000076 6.000152

+	S 0 0.000000 7.703743 -0.378998 8.172974 -0.428327

+END

+TURNOUT TT "Tillig	DW-15 Asymmetrical 3-Way	83230"

+	P "Normal" 1 2 3

+	P "Right" 1 4 5

+	P "Left" 1 2 6 7

+	E 0.000000 0.000000 270.000000

+	E 6.535433 0.000000 90.000000

+	E 6.429717 0.846488 75.000000

+	E 6.429717 -0.846488 105.000000

+	S 0 0.000000 0.000000 0.000000 0.472063 0.000000

+	S 0 0.000000 0.472063 0.000000 0.964945 0.000000

+	S 0 0.000000 0.964945 0.000000 6.535433 0.000000

+	C 0 0.000000 -21.257102 0.472091 21.257102 165.000000 15.000000

+	S 0 0.000000 5.973856 0.724332 6.429717 0.846488

+	C 0 0.000000 21.257102 0.964945 -21.257102 0.000000 15.000000

+	S 0 0.000000 6.938801 -0.724332 7.394662 -0.846488

+END

+SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Slips

+TURNOUT TT "Tillig	DKW15 Double-Slip	83300/391"

+	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.535433 0.000000 90.000000

+	E 0.111343 0.845742 285.000000

+	E 6.424090 -0.845742 105.000000

+	S 0 0.000000 0.000000 0.000000 0.944089 0.000000

+	S 0 0.000000 0.944089 0.000000 5.591344 0.000000

+	S 0 0.000000 5.591344 0.000000 6.535433 0.000000

+	S 0 0.000000 0.111343 0.845742 1.023131 0.601422

+	S 0 0.000000 1.023131 0.601422 5.512302 -0.601422

+	S 0 0.000000 5.512302 -0.601422 6.424090 -0.845742

+	C 0 0.000000 17.650057 0.944019 -17.650057 0.000076 15.000152

+	C 0 0.000000 -17.650057 5.591366 17.650051 180.000076 15.000152

+END

+SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Double Crossover

+TURNOUT TT "Tillig	DGV Dbl. Crossover	83210"

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

+	P "Reverse" 1 7 8 9 6 0 4 10 11 12 3

+	E 0.000000 0.000000 270.000000

+	E 9.881890 0.000000 90.000000

+	E 0.000000 1.692913 270.000000

+	E 9.881890 1.692913 90.000000

+	S 0 0.000000 0.000000 0.000000 0.789084 0.000000

+	S 0 0.000000 0.789084 0.000000 9.092806 0.000000

+	S 0 0.000000 9.092806 0.000000 9.881890 0.000000

+	S 0 0.000000 0.000000 1.692913 0.789084 1.692913

+	S 0 0.000000 0.789084 1.692913 9.092806 1.692913

+	S 0 0.000000 9.092806 1.692913 9.881890 1.692913

+	C 0 0.000000 -10.474132 0.789097 10.474132 159.252360 20.747716

+	S 0 0.000000 4.499581 0.679253 5.382309 1.013660

+	C 0 0.000000 10.474132 9.092819 -8.781214 339.252360 20.747716

+	C 0 0.000000 10.474132 0.789042 -8.781219 0.000076 20.747716

+	S 0 0.000000 4.499581 1.013660 5.382309 0.679253

+	C 0 0.000000 -10.474132 9.092819 10.474127 180.000076 20.747716

+END

+SUBCONTENTS Pilz/Tillig TT-Scale Advance Track - Crossings

+TURNOUT TT "Tillig	K1-15 Crossing	83160"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 6.535433 0.000000 90.000000

+	E 0.111343 0.845742 285.000000

+	E 6.424090 -0.845742 105.000000

+	S 0 0.000000 0.000000 0.000000 6.535433 0.000000

+	S 0 0.000000 0.111343 0.845742 6.424090 -0.845742

+END

+TURNOUT TT "Tillig	K2-30 Crossing	83170"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 3.267717 0.000000 90.000000

+	E 0.218894 0.816927 300.000000

+	E 3.048823 -0.816927 120.000000

+	S 0 0.000000 0.000000 0.000000 3.267717 0.000000

+	S 0 0.000000 0.218894 0.816927 3.048823 -0.816927

+END

diff --git a/app/lib/params/atl83ho.xtp b/app/lib/params/atl83ho.xtp
index 4ce2387..d3271f4 100644
--- a/app/lib/params/atl83ho.xtp
+++ b/app/lib/params/atl83ho.xtp
@@ -385,7 +385,7 @@ TURNOUT HO "Atlas	C83 Bumper	518"
 	S 0 0 0.000000 0.000000 3.750000 0.000000

 	END

 

-TURNOUT HO "Atlas	C83 9" Warren Truss Bridge	590"

+TURNOUT HO "Atlas	C83 9"" Warren Truss Bridge	590"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 9.000000 0.000000 90.000000

@@ -397,7 +397,7 @@ TURNOUT HO "Atlas	C83 9" Warren Truss Bridge	590"
 	L 11579568 0.050000 0.000000 -0.750000 0.000000 -1.200000

 	L 11579568 0.050000 9.000000 -0.750000 9.000000 -1.200000

 	END

-TURNOUT HO "Atlas	C83 9" Deck Truss Bridge	591"

+TURNOUT HO "Atlas	C83 9"" Deck Truss Bridge	591"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 9.000000 0.000000 90.000000

@@ -409,7 +409,7 @@ TURNOUT HO "Atlas	C83 9" Deck Truss Bridge	591"
 	L 11579568 0.050000 0.000000 -0.600000 0.000000 -0.700000

 	L 11579568 0.050000 9.000000 -0.600000 9.000000 -0.700000

 	END

-TURNOUT HO "Atlas	C83 9" Plate Girder Bridge	592"

+TURNOUT HO "Atlas	C83 9"" Plate Girder Bridge	592"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 9.000000 0.000000 90.000000

@@ -421,7 +421,7 @@ TURNOUT HO "Atlas	C83 9" Plate Girder Bridge	592"
 	L 11579568 0.050000 0.000000 -0.750000 0.000000 -1.300000

 	L 11579568 0.050000 9.000000 -0.750000 9.000000 -1.300000

 	END

-TURNOUT HO "Atlas	C83 18" Through Truss Bridge	593/594"

+TURNOUT HO "Atlas	C83 18"" Through Truss Bridge	593/594"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 18.000000 0.000000 90.000000

diff --git a/app/lib/params/pecoho83.xtp b/app/lib/params/pecoho83.xtp
index 727ecaf..7af3cc2 100644
--- a/app/lib/params/pecoho83.xtp
+++ b/app/lib/params/pecoho83.xtp
@@ -1,126 +1,145 @@
-CONTENTS Peco North American Code 83 HO Scale Turnouts
-SUBCONTENTS Peco Code 83 HO Turnouts
-TURNOUT HO "PECO Code 83	#5 Left Hand Turnout	SL-8352/SLE-8352"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 8.307087 0.000000 90.000000
-	E 8.307087 1.019252 78.463031
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	S 0 0.000000 0.649600 0.000000 8.307087 0.000000
-	C 0 0.000000 -26.373333 0.649635 26.373333 168.462955 11.537121
-	S 0 0.000000 5.924335 0.532864 8.307087 1.019252
-	END
-TURNOUT HO "PECO Code 83	#5 Right Hand Turnout	SL-8351/SLE-8351"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 8.307087 0.000000 90.000000
-	E 8.307087 -1.019252 101.536969
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	S 0 0.000000 0.649600 0.000000 8.307087 0.000000
-	C 0 0.000000 26.373333 0.649495 -26.373333 0.000076 11.537121
-	S 0 0.000000 5.924335 -0.532864 8.307087 -1.019252
-	END
-TURNOUT HO "PECO Code 83	#6 Left Hand Turnout	SL-8362/SLE-8362"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 9.173228 0.000000 90.000000
-	E 9.173228 1.023622 77.000000
-	S 0 0.000000 0.000000 0.000000 0.838713 0.000000
-	S 0 0.000000 0.838713 0.000000 9.173228 0.000000
-	C 0 0.000000 -34.236656 0.838759 34.236656 166.999924 13.000152
-	S 0 0.000000 8.540367 0.877502 9.173228 1.023622
-	END
-TURNOUT HO "PECO Code 83	#6 Right Hand Turnout	SL-8361/SLE-8361"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 9.173228 0.000000 90.000000
-	E 9.173228 -1.023622 103.000000
-	S 0 0.000000 0.000000 0.000000 0.838713 0.000000
-	S 0 0.000000 0.838713 0.000000 9.173228 0.000000
-	C 0 0.000000 34.236656 0.838577 -34.236656 0.000076 13.000152
-	S 0 0.000000 8.540367 -0.877502 9.173228 -1.023622
-	END
-TURNOUT HO "PECO Code 83	#8 Left Hand Turnout	SL-8382/SLE-8382"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 12.677165 0.000000 90.000000
-	E 12.677165 1.019213 82.819238
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	S 0 0.000000 0.649600 0.000000 12.677165 0.000000
-	C 0 0.000000 -62.760069 0.649683 62.760069 172.819162 7.180914
-	S 0 0.000000 8.494774 0.492264 12.677165 1.019213
-	END
-TURNOUT HO "PECO Code 83	#8 Right Hand Turnout	SL-8381/SLE-8381"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 12.677165 0.000000 90.000000
-	E 12.677165 -1.019213 97.180762
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	S 0 0.000000 0.649600 0.000000 12.677165 0.000000
-	C 0 0.000000 62.760069 0.649350 -62.760069 0.000076 7.180914
-	S 0 0.000000 8.494774 -0.492264 12.677165 -1.019213
-	END
-TURNOUT HO "PECO Code 83	#4 WYE Turnout	SL-8348/SLE-8348"
-	P "Left" 1 2 3
-	P "Right" 1 4 5
-	E 0.000000 0.000000 270.000000
-	E 7.159055 0.500000 82.850000
-	E 7.159055 -0.500000 97.150000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 -40.393551 0.649654 40.393551 172.849924 7.150152
-	S 0 0.000000 5.677382 0.314125 7.159055 0.500000
-	C 0 0.000000 40.393551 0.649439 -40.393551 0.000076 7.150152
-	S 0 0.000000 5.677382 -0.314125 7.159055 -0.500000
-	END
-
-SUBCONTENTS Peco Code 83 HO Crossings
-TURNOUT HO "PECO Code 83	#6 Diamond Crossing	SL-8364/SLE-8364"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 12.035433 0.000000 90.000000
-	E 0.084167 1.002945 279.594076
-	E 11.951266 -1.002945 99.594076
-	S 0 0.000000 0.000000 0.000000 12.035433 0.000000
-	S 0 0.000000 0.084167 1.002945 11.951266 -1.002945
-	END
-TURNOUT HO "PECO Code 83	90d Crossing	SL-8390"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 2.000000 0.000000 90.000000
-	E 1.000000 -1.000000 180.000000
-	E 1.000000 1.000000 0.000000
-	S 0 0.000000 0.000000 0.000000 2.000000 0.000000
-	S 0 0.000000 1.000000 1.000000 1.000000 -1.000000
-	END
-
-SUBCONTENTS Peco Code 83 HO Curved Turnouts
-TURNOUT HO "Peco Code 83	#7 Curved Left Turnout	SL-8377/SLE-8377"
-	P "Normal" 1 4 5
-	P "Reverse" 1 2 3
-	E 0.000000 0.000000 270.000000
-	E 11.106693 0.984252 81.000000
-	E 10.865748 1.968504 72.000000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 -26.251070 0.649635 26.251070 161.999924 18.000152
-	S 0 0.000000 8.761686 1.284838 10.865748 1.968504
-	C 0 0.000000 -53.910688 0.649672 53.910688 170.999924 9.000152
-	S 0 0.000000 9.083224 0.663751 11.106693 0.984252
-	END
-TURNOUT HO "Peco Code 83	#7 Curved Right Turnout	SL-8376/SLE-8376"
-	P "Normal" 1 4 5
-	P "Reverse" 1 2 3
-	E 0.000000 0.000000 270.000000
-	E 11.106693 -0.984252 99.000000
-	E 10.865748 -1.968504 108.000000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 26.251070 0.649496 -26.251070 0.000076 18.000152
-	S 0 0.000000 8.761686 -1.284838 10.865748 -1.968504
-	C 0 0.000000 53.910688 0.649385 -53.910688 0.000076 9.000152
-	S 0 0.000000 9.083224 -0.663751 11.106693 -0.984252
-	END
+CONTENTS Peco North American Code 83 HO Scale Turnouts

+#Updated based on PECO Website and PDF's

+SUBCONTENTS Peco Code 83 HO Turnouts

+TURNOUT HO "PECO Code 83	#5 Left Hand Turnout	SL-8352/SLE-8352"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 8.259842 0.000000 90.000000

+	E 8.259842 1.000000 78.600000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 8.259842 0.000000

+	C 0 0.000000 -26.558075 0.649635 26.558075 168.599924 11.400152

+	S 0 0.000000 5.899063 0.523973 8.259842 1.000000

+	END

+TURNOUT HO "PECO Code 83	#5 Right Hand Turnout	SL-8351/SLE-8351"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 8.259842 0.000000 90.000000

+	E 8.259842 -1.000000 101.400000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 8.259842 0.000000

+	C 0 0.000000 26.558075 0.649494 -26.558075 0.000076 11.400152

+	S 0 0.000000 5.899063 -0.523973 8.259842 -1.000000

+	END

+TURNOUT HO "PECO Code 83	#6 Left Hand Turnout	SL-8362/SLE-8362"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 9.192913 0.000000 90.000000

+	E 9.192913 1.000000 80.500000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 9.192913 0.000000

+	C 0 0.000000 -30.900336 0.649641 30.900336 170.499924 9.500152

+	S 0 0.000000 5.749703 0.423792 9.192913 1.000000

+	END

+TURNOUT HO "PECO Code 83	#6 Right Hand Turnout	SL-8361/SLE-8361"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 9.192913 0.000000 90.000000

+	E 9.192913 -1.000000 99.500000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 9.192913 0.000000

+	C 0 0.000000 30.900336 0.649477 -30.900336 0.000076 9.500152

+	S 0 0.000000 5.749703 -0.423792 9.192913 -1.000000

+	END

+TURNOUT HO "PECO Code 83	#8 Left Hand Turnout	SL-8382/SLE-8382"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 12.649606 0.000000 90.000000

+	E 12.649606 1.000000 82.850000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 12.649606 0.000000

+	C 0 0.000000 -64.478236 0.649686 64.478236 172.849924 7.150152

+	S 0 0.000000 8.675202 0.501423 12.649606 1.000000

+	END

+TURNOUT HO "PECO Code 83	#8 Right Hand Turnout	SL-8381/SLE-8381"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 12.649606 0.000000 90.000000

+	E 12.649606 -1.000000 97.150000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 12.649606 0.000000

+	C 0 0.000000 64.478236 0.649343 -64.478236 0.000076 7.150152

+	S 0 0.000000 8.675202 -0.501423 12.649606 -1.000000

+	END

+SUBCONTENTS Peco Code 83 HO Wye Turnouts

+TURNOUT HO "PECO Code 83	#4 WYE Turnout	SL-8348/SLE-8348"

+	P "Left" 1 2 3

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 7.159055 0.500000 82.850000

+	E 7.159055 -0.500000 97.150000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	C 0 0.000000 -40.393551 0.649654 40.393551 172.849924 7.150152

+	S 0 0.000000 5.677382 0.314125 7.159055 0.500000

+	C 0 0.000000 40.393551 0.649439 -40.393551 0.000076 7.150152

+	S 0 0.000000 5.677382 -0.314125 7.159055 -0.500000

+	END

+

+SUBCONTENTS Peco Code 83 HO Crossings

+TURNOUT HO "PECO Code 83	#6 Diamond Crossing	SL-8364/SLE-8364"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 12.035433 0.000000 90.000000

+	E 0.082528 0.993201 279.500000

+	E 11.952905 -0.993201 99.500000

+	S 0 0.000000 0.000000 0.000000 12.035433 0.000000

+	S 0 0.000000 0.082528 0.993201 11.952905 -0.993201

+	END

+TURNOUT HO "PECO Code 83	90d Crossing	SL-8390"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 2.000000 0.000000 90.000000

+	E 1.000000 -1.000000 180.000000

+	E 1.000000 1.000000 0.000000

+	S 0 0.000000 0.000000 0.000000 2.000000 0.000000

+	S 0 0.000000 1.000000 1.000000 1.000000 -1.000000

+	END

+

+SUBCONTENTS Peco Code 83 HO Curved Turnouts

+TURNOUT HO "Peco Code 83	#7 Curved Left Turnout	SL-8377/SLE-8377"

+	P "Normal" 1 4 5

+	P "Reverse" 1 2 3

+	E 0.000000 0.000000 270.000000

+	E 11.106693 0.984252 81.000000

+	E 10.865748 1.968504 72.000000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	C 0 0.000000 -26.251070 0.649635 26.251070 161.999924 18.000152

+	S 0 0.000000 8.761686 1.284838 10.865748 1.968504

+	C 0 0.000000 -53.910688 0.649672 53.910688 170.999924 9.000152

+	S 0 0.000000 9.083224 0.663751 11.106693 0.984252

+	END

+TURNOUT HO "Peco Code 83	#7 Curved Right Turnout	SL-8376/SLE-8376"

+	P "Normal" 1 4 5

+	P "Reverse" 1 2 3

+	E 0.000000 0.000000 270.000000

+	E 11.106693 -0.984252 99.000000

+	E 10.865748 -1.968504 108.000000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	C 0 0.000000 26.251070 0.649496 -26.251070 0.000076 18.000152

+	S 0 0.000000 8.761686 -1.284838 10.865748 -1.968504

+	C 0 0.000000 53.910688 0.649385 -53.910688 0.000076 9.000152

+	S 0 0.000000 9.083224 -0.663751 11.106693 -0.984252

+	END

+SUBCONTENTS Peco Code 83 HO Slip Turnouts

+TURNOUT HO "Peco Code 83	#6 Double Slip Switch	SL-U8363"

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

+	E 0.082528 0.993201 279.500000

+	E 11.952905 -0.993201 99.500000

+	S 0 0.000000 0.000000 0.000000 1.299468 0.000000

+	S 0 0.000000 1.299468 0.000000 10.735965 0.000000

+	S 0 0.000000 10.735965 0.000000 12.035433 0.000000

+	S 0 0.000000 0.082528 0.993201 1.363761 0.778782

+	S 0 0.000000 1.363761 0.778782 10.671672 -0.778782

+	S 0 0.000000 10.671672 -0.778782 11.952905 -0.993201

+	C 0 0.000000 56.784006 1.299241 -56.784006 0.000076 9.500152

+	C 0 0.000000 -56.784006 10.736040 56.783993 180.000076 9.500152

+	END

diff --git a/app/lib/xtrkcad.desktop b/app/lib/xtrkcad.desktop
index 5b09cdc..a5f9dd6 100644
--- a/app/lib/xtrkcad.desktop
+++ b/app/lib/xtrkcad.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=XTrackCAD
 Comment=Design model railroad layouts
 Exec=xtrkcad
-Icon=xtrkcad
+Icon=xtrkcad.png
 Terminal=false
 Type=Application
-Categories=Application;Railroad;Game
+Categories=Graphics;Game
\ No newline at end of file
diff --git a/app/lib/icon.png b/app/lib/xtrkcad.png
index 4cdcdba..4cdcdba 100644
--- a/app/lib/icon.png
+++ b/app/lib/xtrkcad.png
diff --git a/app/lib/xtrkcad.xtq b/app/lib/xtrkcad.xtq
index be01d88..7b661e6 100644
--- a/app/lib/xtrkcad.xtq
+++ b/app/lib/xtrkcad.xtq
@@ -142,6 +142,10 @@ SCALE TTn3.5, 120.0, 0.3543
 	1560,37.5,1080
 	2160,45,1440
 	2640,52.5,1800
+SCALE TTi, 120.0, 0.177
+	1560,37.5,1080
+	2160,45,1440
+	2640,52.5,1800	
 SCALE Z, 220.0, 0.256
 	1560,37.5,1080
 	2160,45,1440