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

1 files changed, 1672 insertions, 1619 deletions

diff --git a/app/bin/cturnout.c b/app/bin/cturnout.c
index 150f381..9bae6ae 100644
--- a/app/bin/cturnout.c
+++ b/app/bin/cturnout.c
@@ -1,5 +1,5 @@
 /** \file cturnout.c
- * T_TURNOUT
+ * Turnout object handling
  */
 
 /*  XTrkCad - Model Railroad CAD
@@ -17,14 +17,10 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <ctype.h>
-#include <math.h>
-#include <stdint.h>
-#include <string.h>
-
+#include "common.h"
 #include "ccurve.h"
 #include "tbezier.h"
 #include "tcornu.h"
@@ -34,14 +30,13 @@
 #include "cundo.h"
 #include "custom.h"
 #include "fileio.h"
-#include "i18n.h"
 #include "layout.h"
-#include "messages.h"
 #include "param.h"
+#include "cselect.h"
 #include "include/paramfile.h"
 #include "track.h"
-#include "trackx.h"
-#include "utility.h"
+#include "trkendpt.h"
+#include "common-ui.h"
 
 EXPORT TRKTYP_T T_TURNOUT = -1;
 
@@ -51,57 +46,63 @@ EXPORT TRKTYP_T T_TURNOUT = -1;
 
 EXPORT dynArr_t turnoutInfo_da;
 
-EXPORT turnoutInfo_t * curTurnout = NULL;
+EXPORT turnoutInfo_t* curTurnout = NULL;
 EXPORT long curTurnoutEp = 0;
-static int curTurnoutInx = -1;
+//static int curTurnoutInx = -1;
 
+/** @logcmd @showrefby turnout=n cturnout.c */
 static int log_turnout = 0;
+/** @logcmd @showrefby traverseTurnout=n cturnout.c */
 static int log_traverseTurnout = 0;
+/** @logcmd @showrefby suppresscheckpaths=n cturnout.c */
 static int log_suppressCheckPaths = 0;
+/** @logcmd @showrefby splitturnout=n cturnout.c */
 static int log_splitturnout = 0;
 
 static wMenu_p turnoutPopupM;
 
 #ifdef TURNOUTCMD
 static drawCmd_t turnoutD = {
-		NULL,
-		&screenDrawFuncs,
-		0,
-		1.0,
-		0.0,
-		{0.0,0.0}, {0.0,0.0},
-		Pix2CoOrd, CoOrd2Pix };
+	NULL,
+	&screenDrawFuncs,
+	0,
+	1.0,
+	0.0,
+	{0.0,0.0}, {0.0,0.0},
+	Pix2CoOrd, CoOrd2Pix
+};
 
 static wIndex_t turnoutHotBarCmdInx;
 static wIndex_t turnoutInx;
 static long hideTurnoutWindow;
-static void RedrawTurnout(void);
-static void SelTurnoutEndPt( wIndex_t, coOrd );
-static void HilightEndPt( void );
+static void RedrawTurnout( wDraw_p d, void * context, wWinPix_t x,
+                           wWinPix_t y );
+static void SelTurnoutEndPt(wIndex_t, coOrd);
+static void HilightEndPt(void);
 
-static wPos_t turnoutListWidths[] = { 80, 80, 220 };
-static const char * turnoutListTitles[] = { N_("Manufacturer"), N_("Part No"), N_("Description") };
+static wWinPix_t turnoutListWidths[] = { 80, 80, 220 };
+static const char* turnoutListTitles[] = { N_("Manufacturer"), N_("Part No"), N_("Description") };
 static paramListData_t listData = { 13, 400, 3, turnoutListWidths, turnoutListTitles };
-static const char * hideLabels[] = { N_("Hide"), NULL };
-static paramDrawData_t turnoutDrawData = { 490, 200, (wDrawRedrawCallBack_p)RedrawTurnout, SelTurnoutEndPt, &turnoutD };
+static const char* hideLabels[] = { N_("Hide"), NULL };
+static paramDrawData_t turnoutDrawData = { 490, 200, RedrawTurnout, SelTurnoutEndPt, &turnoutD };
 static paramData_t turnoutPLs[] = {
 #define I_LIST		(0)
 #define turnoutListL    ((wList_p)turnoutPLs[I_LIST].control)
-	{   PD_LIST, &turnoutInx, "list", PDO_NOPREF|PDO_DLGRESIZEW, &listData, NULL, BL_DUP },
+	{   PD_LIST, &turnoutInx, "list", PDO_NOPREF | PDO_DLGRESIZEW, &listData, NULL, BL_DUP },
 #define I_DRAW		(1)
 #define turnoutDrawD    ((wDraw_p)turnoutPLs[I_DRAW].control)
-	{   PD_DRAW, NULL, "canvas", PDO_NOPSHUPD|PDO_DLGUNDERCMDBUTT|PDO_DLGRESIZE, &turnoutDrawData, NULL, 0 },
+	{   PD_DRAW, NULL, "canvas", PDO_NOPSHUPD | PDO_DLGUNDERCMDBUTT | PDO_DLGRESIZE, &turnoutDrawData, NULL, 0 },
 #define I_NEW		(2)
 #define turnoutNewM     ((wMenu_p)turnoutPLs[I_NEW].control)
 	{   PD_MENU, NULL, "new", PDO_DLGCMDBUTTON, NULL, N_("New") },
 #define I_HIDE		(3)
 #define turnoutHideT    ((wChoice_p)turnoutPLs[I_HIDE].control)
-	{   PD_TOGGLE, &hideTurnoutWindow, "hide", PDO_DLGCMDBUTTON, /*CAST_AWAY_CONST*/(void*)hideLabels, NULL, BC_NOBORDER } };
-static paramGroup_t turnoutPG = { "turnout", 0, turnoutPLs, sizeof turnoutPLs/sizeof turnoutPLs[0] };
+	{   PD_TOGGLE, &hideTurnoutWindow, "hide", PDO_DLGCMDBUTTON, hideLabels, NULL, BC_NOBORDER }
+};
+static paramGroup_t turnoutPG = { "newFixedTrack", 0, turnoutPLs, COUNT( turnoutPLs ) };
 #endif
 
 
-
 /****************************************
  *
  * TURNOUT LIST MANAGEMENT
@@ -109,90 +110,94 @@ static paramGroup_t turnoutPG = { "turnout", 0, turnoutPLs, sizeof turnoutPLs/si
  */
 
 
-EXPORT turnoutInfo_t * CreateNewTurnout(
-		char * scale,
-		char * title,
-		wIndex_t segCnt,
-		trkSeg_p segData,
-		wIndex_t pathLen,
-		PATHPTR_T paths,
-		EPINX_T endPtCnt,
-		trkEndPt_t * endPts,
-		DIST_T * radii,
-		wBool_t updateList )
+EXPORT turnoutInfo_t* CreateNewTurnout(
+        char* scale,
+        char* title,
+        wIndex_t segCnt,
+        trkSeg_p segData,
+        PATHPTR_T paths,
+        EPINX_T endPtCnt,
+        trkEndPt_p endPts,
+        wBool_t updateList,
+        long options)
 {
-	turnoutInfo_t * to;
-	long changes=0;
+	turnoutInfo_t* to;
+	long changes = 0;
 
-	to = FindCompound( FIND_TURNOUT, scale, title );
+	to = FindCompound(FIND_TURNOUT, scale, title);
 	if (to == NULL) {
-		DYNARR_APPEND( turnoutInfo_t *, turnoutInfo_da, 10 );
-		to = (turnoutInfo_t*)MyMalloc( sizeof *to );
-		turnoutInfo(turnoutInfo_da.cnt-1) = to;
-		to->title = MyStrdup( title );
-		to->scaleInx = LookupScale( scale );
+		DYNARR_APPEND(turnoutInfo_t*, turnoutInfo_da, 10);
+		to = (turnoutInfo_t*)MyMalloc(sizeof * to);
+		turnoutInfo(turnoutInfo_da.cnt - 1) = to;
+		to->title = MyStrdup(title);
+		to->scaleInx = LookupScale(scale);
 		changes = CHANGE_PARAMS;
 	}
 	to->segCnt = segCnt;
 	trkSeg_p seg_p;
-	to->segs = (trkSeg_p)memdup( segData, (sizeof (*segData) * segCnt ));
+	to->segs = (trkSeg_p)memdup(segData, (sizeof(*segData) * segCnt));
 	seg_p = to->segs;
-	for (int i=0;i<segCnt;i++) {
-		seg_p[i].bezSegs.ptr = NULL;
-		seg_p[i].bezSegs.cnt = 0;
-		seg_p[i].bezSegs.max = 0;
-	}
-	CopyPoly(to->segs,segCnt);
-	FixUpBezierSegs(to->segs,to->segCnt);
-	GetSegBounds( zero, 0.0, segCnt, to->segs, &to->orig, &to->size );
+	for (int i = 0; i < segCnt; i++) {
+		DYNARR_INIT( trackSeg_t, seg_p[i].bezSegs );
+	}
+	CopyPoly(to->segs, segCnt);
+	FixUpBezierSegs(to->segs, to->segCnt);
+	GetSegBounds(zero, 0.0, segCnt, to->segs, &to->orig, &to->size);
 	to->endCnt = endPtCnt;
-	to->endPt = (trkEndPt_t*)memdup( endPts, (sizeof *endPts) * to->endCnt );
+	to->endPt = (trkEndPt_p)memdup(endPts, EndPtSize(to->endCnt));
 
-	to->pathLen = pathLen;
-	to->paths = (PATHPTR_T)memdup( paths, (sizeof *to->paths) * to->pathLen );
+	if (options & COMPOUND_OPTION_PATH_OVERRIDE) {
+		to->pathOverRide = TRUE;
+	}
+	if (options & COMPOUND_OPTION_PATH_NOCOMBINE) {
+		to->pathNoCombine = TRUE;
+	}
+	SetParamPaths( to, paths );
 	to->paramFileIndex = curParamFileIndex;
-	if (curParamFileIndex == PARAM_CUSTOM)
+	if (curParamFileIndex == PARAM_CUSTOM) {
 		to->contentsLabel = MyStrdup("Custom Turnouts");
-	else
+	} else {
 		to->contentsLabel = curSubContents;
+	}
 #ifdef TURNOUTCMD
 	if (updateList && turnoutListL != NULL) {
-		FormatCompoundTitle( LABEL_TABBED|LABEL_MANUF|LABEL_PARTNO|LABEL_DESCR, title );
-		if (message[0] != '\0')
-			wListAddValue( turnoutListL, message, NULL, to );
+		FormatCompoundTitle(LABEL_TABBED | LABEL_MANUF | LABEL_PARTNO | LABEL_DESCR,
+		                    title);
+		if (message[0] != '\0') {
+			wListAddValue(turnoutListL, message, NULL, to);
+		}
 	}
 #endif
 
-	to->barScale = curBarScale>0?curBarScale:-1;
+	to->barScale = curBarScale > 0 ? curBarScale : -1;
 	to->special = TOnormal;
-	if (radii) {
-		to->special = TOcurved;
-		DYNARR_SET(DIST_T,to->u.curved.radii,to->endCnt);
-		for (int i=0;i<to->endCnt;i++) {
-			DYNARR_N(DIST_T,to->u.curved.radii,i) = radii[i];
-		}
+	if (updateList && changes) {
+		DoChangeNotification(changes);
 	}
-	if (updateList && changes)
-		DoChangeNotification( changes );
 	return to;
 }
 
 /**
  * Delete a turnout parameter from the list and free the related memory
  *
- * \param [IN] to turnout definition to be deleted 
+ * \param [IN] toInfo turnout definition to be deleted
+ *
+ * \returns True if it succeeds
  */
 
 BOOL_T
-DeleteTurnout(void *toInfo)
+DeleteTurnout(void* toInfo)
 {
-	turnoutInfo_t * to = (turnoutInfo_t *)toInfo;
+	turnoutInfo_t* to = (turnoutInfo_t*)toInfo;
 	MyFree(to->title);
 	MyFree(to->segs);
 	MyFree(to->endPt);
 	MyFree(to->paths);
 	if (to->special) {
-		DYNARR_FREE(DIST_T, to->u.curved.radii);
+		switch (to->special) {
+		case TOadjustable:
+		default:;
+		}
 	}
 
 	MyFree(to);
@@ -200,299 +205,283 @@ DeleteTurnout(void *toInfo)
 }
 
 /**
- * Delete all turnout definitions that came from a specific parameter file. 
- * Due to the way the definitions are loaded from file it is safe to 
+ * Delete all turnout definitions that came from a specific parameter file.
+ * Due to the way the definitions are loaded from file it is safe to
  * assume that they form a contiguous block in the array.
- * 
+ *
  * \param [IN] fileIndex parameter file
  */
 
 void
 DeleteTurnoutParams(int fileIndex)
 {
-    int inx=0;
-    int startInx = -1;
-    int cnt = 0;
-
-    // go to the start of the block
-    while (inx < turnoutInfo_da.cnt &&
-            turnoutInfo(inx)->paramFileIndex != fileIndex) {
-        startInx = inx++;
-    }
-
-    // delete them
-    for (; inx < turnoutInfo_da.cnt &&
-            turnoutInfo(inx)->paramFileIndex == fileIndex; inx++) {
-        turnoutInfo_t * to = turnoutInfo(inx);
-        if (to->paramFileIndex == fileIndex) {
-            DeleteTurnout(to);
-            cnt++;
-        }
-    }
-
-    // copy down the rest of the list to fill the gap
-    startInx++;
-    while (inx < turnoutInfo_da.cnt) {
-        turnoutInfo(startInx++) = turnoutInfo(inx++);
-    }
-
-    // and reduce the actual number
-    turnoutInfo_da.cnt -= cnt;
+	int inx = 0;
+	int startInx = -1;
+	int cnt = 0;
+
+	// go to the start of the block
+	while (inx < turnoutInfo_da.cnt &&
+	       turnoutInfo(inx)->paramFileIndex != fileIndex) {
+		startInx = inx++;
+	}
+
+	// delete them
+	for (; inx < turnoutInfo_da.cnt &&
+	     turnoutInfo(inx)->paramFileIndex == fileIndex; inx++) {
+		turnoutInfo_t* to = turnoutInfo(inx);
+		if (to->paramFileIndex == fileIndex) {
+			DeleteTurnout(to);
+			cnt++;
+			if ( to == curTurnout ) {
+				curTurnout = NULL;
+			}
+		}
+	}
+
+	// copy down the rest of the list to fill the gap
+	startInx++;
+	while (inx < turnoutInfo_da.cnt) {
+		turnoutInfo(startInx++) = turnoutInfo(inx++);
+	}
+
+	// and reduce the actual number
+	turnoutInfo_da.cnt -= cnt;
 }
 
-/** 
- * Check to find out to what extent the contents of the parameter file can be used with 
- * the current layout scale / gauge. 
- * 
+/**
+ * Check to find out to what extent the contents of the parameter file can be used with
+ * the current layout scale / gauge.
+ *
  * If parameter scale == layout and parameter gauge == layout we have an exact fit.
- * If parameter gauge == layout we have compatible track. 
- * OO scale is special cased. If the layout is in OO scale track in HO is considered 
+ * If parameter gauge == layout we have compatible track.
+ * OO, O and N scales are special cased. If the layout is in OO scale track in HO is considered
  * an exact fit in spite of scale differences.
- * 
+ *
  * \param paramFileIndex
  * \param scaleIndex
- * \return 
+ * \return enum paraFileState
  */
 
-enum paramFileState 
-GetTrackCompatibility(int paramFileIndex, SCALEINX_T scaleIndex)
-{
+enum paramFileState
+GetTrackCompatibility(int paramFileIndex, SCALEINX_T scaleIndex) {
 	int i;
 	enum paramFileState ret = PARAMFILE_NOTUSABLE;
-	DIST_T gauge = GetScaleTrackGauge(scaleIndex);
+//	DIST_T gauge = GetScaleTrackGauge(scaleIndex);
 
-	if (!IsParamValid(paramFileIndex)) {
+	if (!IsParamValid(paramFileIndex))
+	{
 		return(PARAMFILE_UNLOADED);
 	}
 
 	// loop over all parameter entries or until a exact fit is found
-	for (i = 0; i < turnoutInfo_da.cnt && ret < PARAMFILE_FIT; i++) {
-		turnoutInfo_t *to = turnoutInfo( i );
-		if (to->paramFileIndex == paramFileIndex ) {
-			if (to->scaleInx == scaleIndex ) {
+	for (i = 0; i < turnoutInfo_da.cnt && ret < PARAMFILE_FIT; i++)
+	{
+		turnoutInfo_t* to = turnoutInfo(i);
+		if (to->paramFileIndex == paramFileIndex) {
+			SCALE_FIT_T fit = CompatibleScale(FIT_TURNOUT, to->scaleInx, scaleIndex);
+			if (fit == FIT_EXACT) {
 				ret = PARAMFILE_FIT;
 				break;
-			} else {
-				if (GetScaleTrackGauge(to->scaleInx) == gauge &&
-					ret < PARAMFILE_COMPATIBLE) {
-					ret = PARAMFILE_COMPATIBLE;
-					// handle special cases
-					// if layout is OO scale, HO scale track is considered exact
-					char *layoutScaleName = GetScaleName(scaleIndex);
-					char *paramScaleName = GetScaleName(to->scaleInx);
-					if (!strcmp(layoutScaleName, "OO") &&
-						!strcmp(paramScaleName, "HO")) {
-						ret = PARAMFILE_FIT;
-					}
-					//if layout is in Japanese or British N scale, N scale is exact
-					if ((!strcmp(layoutScaleName, "N(UK)") ||
-						!strcmp(layoutScaleName, "N(JP)")) &&
-						!strcmp(paramScaleName, "N")) {
-						ret = PARAMFILE_FIT;
-					}
-				}
+			} else if (fit == FIT_COMPATIBLE) {
+				ret = PARAMFILE_COMPATIBLE;
 			}
 		}
 	}
 	return(ret);
 }
 
-
+/**
+ * Check Paths verifies that each track segment is on at least one path.
+ * It will assume new-P or old-P order is possible and does not change it.
+ *
+ * \param segCnt
+ * \param segs
+ * \param paths
+ *
+ * \returns -1 if a track segment is not on a path
+ */
 EXPORT wIndex_t CheckPaths(
-		wIndex_t segCnt,
-		trkSeg_p segs,
-		PATHPTR_T paths )
+        wIndex_t segCnt,
+        trkSeg_p segs,
+        PATHPTR_T paths,
+        char * sTitle )
 {
-	if ((segCnt == 0) || !segs) return -1;
+	if ((segCnt == 0) || !segs) { return -1; }
+	if (!paths) { return -1; }
 	int pc, ps;
 	PATHPTR_T pp = 0;
-	int inx;
-	static dynArr_t segMap_da;
+
 	int segInx[2], segEp[2];
-	int segTrkLast = -1;
-	
+//	int segTrkLast = -1;
+
 	// Check that each track segment is on at least one path
-	int suppressCheckPaths = log_suppressCheckPaths > 0 ? logTable(log_suppressCheckPaths).level : 0;
-	if ( suppressCheckPaths == 0 ) {
-		char trkSegInx = 0;
-		for ( int inx = 0; inx<segCnt; inx++ ) {
-			if ( IsSegTrack( &segs[inx] ) ) {
-				trkSegInx++;
+	// Note - In new-P the tracks may be preceded by draws (or interspersed by them)
+	int suppressCheckPaths = log_suppressCheckPaths > 0 ? logTable(
+	                                 log_suppressCheckPaths).level : 0;
+	if (suppressCheckPaths == 0) {
+		for (int inx = 0; inx < segCnt; inx++) {
+			if (IsSegTrack(&segs[inx])) {
+				if ( inx > MAX_PATH_SEGS ) {
+					InputError("Too many segments %d in Turnout definition %s", FALSE, inx + 1,
+					           PutTitle(sTitle));
+					return -1;
+				}
 				PATHPTR_T cp = paths;
-				while ( *cp ) {
-					// path is: 'N' 'A' 'M' 'E' 0 1 2 0 3 4 0 0
-					// skip name
-					for ( ; *cp; cp++ );
+				while (*cp) {
+					// 0-9 are x00 to x09 or the negative equivalent (backwards)
+					// Pathlist is: Path00Path000
+					// Path is: NAME01203400
+					for (; *cp; cp++);  //Skip Name
+					cp++; //Skip 0 after name
+					// check each path component
+					for (; cp[0]
+					     || cp[1]; cp++) {  //keeps going even if there are two or more parts
+						if (!cp[0]) { continue; }   //ignore the 0 between parts of the same PATH!!
+						GetSegInxEP(cp[0], &segInx[0],
+						            &segEp[0]); //GetSegInxEP subtracts one to match inx
+						if (segInx[0] == inx) { break; }  //Found it!
+					}
+					if (*cp) {	// we broke early
+						break;        // get out - we found it
+					}
 					cp++;
-					// check each path component 
-					for ( ; cp[0] || cp[1];  cp++ )
-						if ( abs(*cp) == trkSegInx )
-							 break;
-					if ( *cp )	// we broke early
-						break;
-					cp += 2;; // Skip 2nd 0
+					cp++;  // Go to next path - past two 0s
 				}
-				if ( !*cp ) {	// we looked and didn't find
-					InputError( "Track segment %d not on Path",  FALSE, inx+1 );
+				if (!*cp) {	// we looked through all the paths and didn't find it
+//					InputError("Track segment %d not on Path", FALSE, inx + 1);
+					NoticeMessage(MSG_SEGMENT_NOT_ON_PATH, _("OK"), NULL, inx + 1,
+					              PutTitle(sTitle));
 					return -1;;
 				}
 			}
 		}
 	}
 
-typedef struct {
-	trkSeg_p seg;
-	int indx;
-} segMap_t, * segMap_p;
-
-#define segMap(N) DYNARR_N( segMap_t, segMap_da, N )
-	segMap_p sg;
-	DYNARR_RESET( segMap_t, segMap_da );
-	// Don't reshuffle segs, but build an offset map instead just of the tracks
-	// Use the map to set up the paths to point at the correct segs in the Turnout
-	for ( inx=0; inx<segCnt; inx++ ) {
-		if ( IsSegTrack(&segs[inx]) ) {
-			DYNARR_APPEND( segMap_t, segMap_da, 10 );
-			sg = &DYNARR_LAST(segMap_t,segMap_da);
-			sg->seg = &segs[inx];
-			sg->indx = inx;
-		}
-	}
-
-	for ( pc=0,pp=paths; *pp; pp+=2,pc++ ) {
-		for ( ps=0,pp+=strlen((char *)pp)+1; pp[0]!=0 || pp[1]!=0; pp++,ps++ ) {
-#ifdef LATER
-			if (*pp >= '0' && *pp <= '9')
-				*pp -= '0';
-			else if (*pp >= 'A' && *pp <= 'Z')
-				*pp -= 'A' - 10;
-			if (*pp < 0 || *pp > segCnt) {
-				InputError( _("Turnout path[%d:%d] out of bounds: %d"),
-						FALSE, pc, ps, *pp);
-				return -1;
-			}
-#endif
-			//Rewrite the Path to point to the nth Track seg using the Map
-			int old_inx;
-			EPINX_T old_EP;
-			if (pp[0]!=0 && ps==0) {  // First or only one
-				GetSegInxEP( pp[0], &old_inx, &old_EP );
-				if (old_inx<0 || old_inx>= segMap_da.cnt) {
-					InputError( _("Turnout path[%d] %d is not a valid track segment"),
-						FALSE, pc, ps );
-					return -1;
-				}
-				SetSegInxEP( &pp[0], DYNARR_N(segMap_t,segMap_da,old_inx).indx, old_EP);
+	for (pc = 0, pp = paths; *pp; pp += 2, pc++) {
+		for (ps = 0, pp += strlen((char*)pp) + 1; pp[0] != 0
+		     || pp[1] != 0; pp++, ps++) {
+			if (pp[0] != 0 && ps == 0) {  // First or only one
 			}
-			if (pp[0]!=0 && pp[1]!=0 ) {
-				//Rewrite the Path to point to the nth Track seg using the Map
-				GetSegInxEP( pp[1], &old_inx, &old_EP );
-				if (old_inx<0 || old_inx>= segMap_da.cnt) {
-					InputError( _("Turnout path[%d] %d is not a valid track segment"),
-						FALSE, pc, ps );
-					return -1;
-				}
-				SetSegInxEP( &pp[1], DYNARR_N(segMap_t,segMap_da,old_inx).indx, old_EP);
+			if (pp[0] != 0 && pp[1] != 0) {
 				/* check connectivity */
 				DIST_T d;
-				GetSegInxEP( pp[0], &segInx[0], &segEp[0] );
-				GetSegInxEP( pp[1], &segInx[1], &segEp[1] );
-				if ( !IsSegTrack( &segs[segInx[0]] ) ) {
-					InputError( _("Turnout path[%d] %d is not a track segment"),
-						FALSE, pc, pp[0] );
+				GetSegInxEP(pp[0], &segInx[0], &segEp[0]);
+				GetSegInxEP(pp[1], &segInx[1], &segEp[1]);
+				if (!IsSegTrack(&segs[segInx[0]])) {
+					InputError(_("CheckPath: Turnout path[%d] %d is not a track segment"),
+					           FALSE, pc, pp[0]);
 					return -1;
 				}
-				if ( !IsSegTrack( &segs[segInx[1]] ) ) {
-					InputError( _("Turnout path[%d] %d is not a track segment"),
-						FALSE, pc, pp[1] );
+				if (!IsSegTrack(&segs[segInx[1]])) {
+					InputError(_("CheckPath: Turnout path[%d] %d is not a track segment"),
+					           FALSE, pc, pp[1]);
 					return -1;
 				}
-				coOrd p0 = GetSegEndPt( &segs[segInx[0]], 1-segEp[0], FALSE, NULL );
-				coOrd p1 = GetSegEndPt( &segs[segInx[1]], segEp[1], FALSE, NULL );
-				d = FindDistance(p0,p1);
+				coOrd p0 = GetSegEndPt(&segs[segInx[0]], 1 - segEp[0], FALSE, NULL);
+				coOrd p1 = GetSegEndPt(&segs[segInx[1]], segEp[1], FALSE, NULL);
+				d = FindDistance(p0, p1);
 				if (d > MIN_TURNOUT_SEG_CONNECT_DIST) {
-					InputError( _("Turnout path[%d] %d-%d not connected: %0.3f P0(%f,%f) P1(%f,%f)"),
-						FALSE, pc, pp[0], pp[1], d, p0.x, p0.y, p1.x, p1.y );
+					InputError(
+					        _("CheckPath: Turnout path[%d] %d-%d not connected: %0.3f P0(%f,%f) P1(%f,%f)"),
+					        FALSE, pc, pp[0], pp[1], d, p0.x, p0.y, p1.x, p1.y);
 					return -1;
 				}
 			}
 
 		}
 	}
-	return pp-paths+1;
+	return (wIndex_t)(pp - paths + 1);
 }
 
 
 static BOOL_T ReadTurnoutParam(
-		char * firstLine )
+        char* firstLine)
 {
 	char scale[10];
-	char *title;
-	turnoutInfo_t * to;
+	char* title;
+	turnoutInfo_t* to;
+	PATHPTR_T cp;
+	long options = 0;
 
-	if ( !GetArgs( firstLine+8, "sq", scale, &title ) )
+	if (!GetArgs(firstLine + 8, "sqc", scale, &title, &cp)) {
 		return FALSE;
-	DYNARR_RESET( trkEndPt_t, tempEndPts_da );
+	}
+	if (cp != NULL)
+		if (!GetArgs((char*)cp, "l", &options)) {
+			return FALSE;
+		}
+	TempEndPtsReset();
 	pathCnt = 0;
-	if ( !ReadSegs() )
+	if (!ReadSegs()) {
 		return FALSE;
-	CheckPaths( tempSegs_da.cnt, &tempSegs(0), pathPtr );
-	to = CreateNewTurnout( scale, title, tempSegs_da.cnt, &tempSegs(0),
-					pathCnt, pathPtr, tempEndPts_da.cnt, &tempEndPts(0), NULL, FALSE );
-	MyFree( title );
-	if (to == NULL)
+	}
+	PATHPTR_T pPaths = NULL;
+	if ( pathPtr && pathPtr[0] && pathCnt > 0 ) {
+		pPaths = pathPtr;
+	}
+	CheckPaths( tempSegs_da.cnt, &tempSegs(0), pPaths, title );
+	to = CreateNewTurnout(scale, title, tempSegs_da.cnt, &tempSegs(0),
+	                      pPaths, TempEndPtsCount(), TempEndPt(0), FALSE, options );
+	MyFree(title);
+	if (to == NULL) {
 		return FALSE;
+	}
 	if (tempSpecial[0] != '\0') {
-		if (strncmp( tempSpecial, ADJUSTABLE, strlen(ADJUSTABLE) ) == 0) {
+		if (strncmp(tempSpecial, ADJUSTABLE, strlen(ADJUSTABLE)) == 0) {
 			to->special = TOadjustable;
-			if ( !GetArgs( tempSpecial+strlen(ADJUSTABLE), "ff",
-					&to->u.adjustable.minD, &to->u.adjustable.maxD ) )
+			if (!GetArgs(tempSpecial + strlen(ADJUSTABLE), "ff",
+			             &to->u.adjustable.minD, &to->u.adjustable.maxD)) {
 				return FALSE;
+			}
 		} else {
 			InputError(_("Unknown special case"), TRUE);
 			return FALSE;
 		}
 	}
 	if (tempCustom[0] != '\0') {
-		to->customInfo = MyStrdup( tempCustom );
+		to->customInfo = MyStrdup(tempCustom);
 	}
 	return TRUE;
 }
 
 
-EXPORT turnoutInfo_t * TurnoutAdd( long mode, SCALEINX_T scale, wList_p list, coOrd * maxDim, EPINX_T epCnt )
+EXPORT turnoutInfo_t* TurnoutAdd(long mode, SCALEINX_T scale, wList_p list,
+                                 coOrd* maxDim, EPINX_T epCnt)
 {
 	wIndex_t inx;
-	turnoutInfo_t * to, * to1 = NULL;
+	turnoutInfo_t* to, * to1 = NULL;
 	turnoutInx = 0;
-	for ( inx = 0; inx < turnoutInfo_da.cnt; inx++ ) {
+	for (inx = 0; inx < turnoutInfo_da.cnt; inx++) {
 		to = turnoutInfo(inx);
-		if ( IsParamValid(to->paramFileIndex) &&
-			 to->segCnt > 0 &&
-			 CompatibleScale( TRUE, to->scaleInx, scale ) &&
-			 /*strcasecmp( to->scale, scaleName ) == 0 && */
-			 ( epCnt <= 0 || epCnt == to->endCnt ) ) {
-			if (to1==NULL)
+		if (IsParamValid(to->paramFileIndex) &&
+		    to->segCnt > 0 &&
+		    (FIT_NONE != CompatibleScale(FIT_TURNOUT, to->scaleInx, scale)) &&
+		    /*strcasecmp( to->scale, scaleName ) == 0 && */
+		    (epCnt <= 0 || epCnt == to->endCnt)) {
+			if (to1 == NULL) {
 				to1 = to;
-			if ( to == curTurnout ) {
+			}
+			if (to == curTurnout) {
 				to1 = to;
-				turnoutInx = wListGetCount( list );
+				turnoutInx = wListGetCount(list);
 			}
-			FormatCompoundTitle( mode, to->title );
+			FormatCompoundTitle(mode, to->title);
 			if (message[0] != '\0') {
-				wListAddValue( list, message, NULL, to );
+				wListAddValue(list, message, NULL, to);
 				if (maxDim) {
-					if (to->size.x > maxDim->x) 
+					if (to->size.x > maxDim->x) {
 						maxDim->x = to->size.x;
-					if (to->size.y > maxDim->y) 
+					}
+					if (to->size.y > maxDim->y) {
 						maxDim->y = to->size.y;
+					}
 				}
 			}
 		}
 	}
 	return to1;
 }
-
+
 /****************************************
  *
  * Adjustable Track Support
@@ -501,20 +490,22 @@ EXPORT turnoutInfo_t * TurnoutAdd( long mode, SCALEINX_T scale, wList_p list, co
 
 
 static void ChangeAdjustableEndPt(
-		track_p trk,
-		EPINX_T ep,
-		DIST_T d )
+        track_p trk,
+        EPINX_T ep,
+        DIST_T d)
 {
-	struct extraData * xx = GetTrkExtraData(trk);
+	struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT,
+	                                 extraDataCompound_t);
 	coOrd pos;
 	trkSeg_p segPtr;
-	ANGLE_T angle = GetTrkEndAngle( trk, ep );
-	Translate( &pos, GetTrkEndPos( trk, 1-ep ), angle, d );
+	ANGLE_T angle = GetTrkEndAngle(trk, ep);
+	Translate(&pos, GetTrkEndPos(trk, 1 - ep), angle, d);
 	UndoModify(trk);
-	SetTrkEndPoint( trk, ep, pos, angle );
-	if ( ep == 0 )
+	SetTrkEndPoint(trk, ep, pos, angle);
+	if (ep == 0) {
 		xx->orig = pos;
-	for ( segPtr=xx->segs; segPtr<&xx->segs[xx->segCnt]; segPtr++ ) {
+	}
+	for (segPtr = xx->segs; segPtr < &xx->segs[xx->segCnt]; segPtr++) {
 		switch (segPtr->type) {
 		case SEG_STRLIN:
 		case SEG_STRTRK:
@@ -524,19 +515,19 @@ static void ChangeAdjustableEndPt(
 			;
 		}
 	}
-	ComputeBoundingBox( trk );
-	DrawNewTrack( trk );
+	ComputeBoundingBox(trk);
+	DrawNewTrack(trk);
 }
 
 
 EXPORT BOOL_T ConnectAdjustableTracks(
-		track_p trk1,
-		EPINX_T ep1,
-		track_p trk2,
-		EPINX_T ep2 )
+        track_p trk1,
+        EPINX_T ep1,
+        track_p trk2,
+        EPINX_T ep2)
 {
-	struct extraData * xx1;
-	struct extraData * xx2;
+	struct extraDataCompound_t* xx1;
+	struct extraDataCompound_t* xx2;
 	BOOL_T adj1, adj2;
 	coOrd p1, p2;
 	ANGLE_T a, a1, a2;
@@ -545,149 +536,79 @@ EXPORT BOOL_T ConnectAdjustableTracks(
 	coOrd off;
 	DIST_T beyond;
 
-	xx1 = GetTrkExtraData(trk1);
-	xx2 = GetTrkExtraData(trk2);
+	if ((GetTrkType(trk1) != T_TURNOUT) && (GetTrkType(trk2) != T_TURNOUT)) { return FALSE; }
+
 	adj1 = adj2 = FALSE;
-	if (GetTrkType(trk1) == T_TURNOUT && xx1->special == TOadjustable)
-		adj1 = TRUE;
-	if (GetTrkType(trk2) == T_TURNOUT && xx2->special == TOadjustable)
-		adj2 = TRUE;
-	if (adj1 == FALSE && adj2 == FALSE)
+
+	if (GetTrkType(trk1) == T_TURNOUT) {
+		xx1 = GET_EXTRA_DATA(trk1, T_TURNOUT, extraDataCompound_t);
+		if (xx1->special == TOadjustable) {
+			adj1 = TRUE;
+		}
+	}
+	if (GetTrkType(trk2) == T_TURNOUT) {
+		xx2 = GET_EXTRA_DATA(trk2, T_TURNOUT, extraDataCompound_t);
+		if (xx2->special == TOadjustable) {
+			adj2 = TRUE;
+		}
+	}
+	if (adj1 == FALSE && adj2 == FALSE) {
 		return FALSE;
-	a1 = GetTrkEndAngle( trk1, ep1 );
-	a2 = GetTrkEndAngle( trk2, ep2 );
-	a = NormalizeAngle( a1 - a2 + 180.0 + connectAngle/2.0);
-	if (a>connectAngle)
+	}
+	a1 = GetTrkEndAngle(trk1, ep1);
+	a2 = GetTrkEndAngle(trk2, ep2);
+	a = NormalizeAngle(a1 - a2 + 180.0 + connectAngle / 2.0);
+	if (a > connectAngle) {
 		return FALSE;
-	UndoStart( _("Connect Adjustable Tracks"), "changeAdjustableEndPt" );
+	}
+	UndoStart(_("Connect Adjustable Tracks"), "changeAdjustableEndPt");
 	maxD = 0.0;
 	if (adj1) {
-		p1 = GetTrkEndPos( trk1, 1-ep1 );
-		Translate( &p1, p1, a1, xx1->u.adjustable.minD );
-		maxD += xx1->u.adjustable.maxD-xx1->u.adjustable.minD;
+		p1 = GetTrkEndPos(trk1, 1 - ep1);
+		Translate(&p1, p1, a1, xx1->u.adjustable.minD);
+		maxD += xx1->u.adjustable.maxD - xx1->u.adjustable.minD;
 	} else {
-		p1 = GetTrkEndPos( trk1, ep1 );
+		p1 = GetTrkEndPos(trk1, ep1);
 	}
 	if (adj2) {
-		p2 = GetTrkEndPos( trk2, 1-ep2 );
-		Translate( &p2, p2, a2, xx2->u.adjustable.minD );
-		maxD += xx2->u.adjustable.maxD-xx2->u.adjustable.minD;
+		p2 = GetTrkEndPos(trk2, 1 - ep2);
+		Translate(&p2, p2, a2, xx2->u.adjustable.minD);
+		maxD += xx2->u.adjustable.maxD - xx2->u.adjustable.minD;
 	} else {
-		p2 = GetTrkEndPos( trk2, ep2 );
+		p2 = GetTrkEndPos(trk2, ep2);
 	}
-	d = FindDistance( p1, p2 );
+	d = FindDistance(p1, p2);
 	rc = TRUE;
 	if (d > maxD) {
 		d = maxD;
 		rc = FALSE;
 	}
-	FindPos( &off, &beyond, p1, p2, a1, 10000.0 );
-	if (fabs(off.y) > connectDistance)
+	FindPos(&off, &beyond, p1, p2, a1, DIST_INF);
+	if (fabs(off.y) > connectDistance) {
 		rc = FALSE;
+	}
 	if (adj1) {
-		UndrawNewTrack( trk1 );
-		d1 = d * (xx1->u.adjustable.maxD-xx1->u.adjustable.minD)/maxD + xx1->u.adjustable.minD;
-		ChangeAdjustableEndPt( trk1, ep1, d1 );
+		UndrawNewTrack(trk1);
+		d1 = d * (xx1->u.adjustable.maxD - xx1->u.adjustable.minD) / maxD +
+		     xx1->u.adjustable.minD;
+		ChangeAdjustableEndPt(trk1, ep1, d1);
 	}
 	if (adj2) {
-		UndrawNewTrack( trk2 );
-		d2 = d * (xx2->u.adjustable.maxD-xx2->u.adjustable.minD)/maxD + xx2->u.adjustable.minD;
-		ChangeAdjustableEndPt( trk2, ep2, d2 );
+		UndrawNewTrack(trk2);
+		d2 = d * (xx2->u.adjustable.maxD - xx2->u.adjustable.minD) / maxD +
+		     xx2->u.adjustable.minD;
+		ChangeAdjustableEndPt(trk2, ep2, d2);
 	}
 	if (rc) {
-		DrawEndPt( &mainD, trk1, ep1, wDrawColorWhite );
-		DrawEndPt( &mainD, trk2, ep2, wDrawColorWhite );
-		ConnectTracks( trk1, ep1, trk2, ep2 );
-		DrawEndPt( &mainD, trk1, ep1, wDrawColorBlack );
-		DrawEndPt( &mainD, trk2, ep2, wDrawColorBlack );
+		DrawEndPt(&mainD, trk1, ep1, wDrawColorWhite);
+		DrawEndPt(&mainD, trk2, ep2, wDrawColorWhite);
+		ConnectTracks(trk1, ep1, trk2, ep2);
+		DrawEndPt(&mainD, trk1, ep1, wDrawColorBlack);
+		DrawEndPt(&mainD, trk2, ep2, wDrawColorBlack);
 	}
 	return rc;
 }
-
-/****************************************
- *
- * Draw Turnout Roadbed
- *
- */
-
-int roadbedOnScreen = 0;
-
-
-void DrawTurnoutRoadbedSide( drawCmd_p d, wDrawColor color, coOrd orig, ANGLE_T angle, trkSeg_p sp, ANGLE_T side, int first, int last )
-{
-	segProcData_t data;
-	if (last<=first)
-		return;
-	data.drawRoadbedSide.first = first;
-	data.drawRoadbedSide.last = last;
-	data.drawRoadbedSide.side = side;
-	data.drawRoadbedSide.roadbedWidth = roadbedWidth;
-	data.drawRoadbedSide.rbw = (wDrawWidth)floor(roadbedLineWidth*(d->dpi/d->scale)+0.5);
-	data.drawRoadbedSide.orig = orig;
-	data.drawRoadbedSide.angle = angle;
-	data.drawRoadbedSide.color = color;
-	data.drawRoadbedSide.d = d;
-	SegProc( SEGPROC_DRAWROADBEDSIDE, sp, &data );
-}
 
-
-static void ComputeAndDrawTurnoutRoadbedSide(
-		drawCmd_p d,
-		wDrawColor color,
-		coOrd orig,
-		ANGLE_T angle,
-		trkSeg_p segPtr,
-		int segCnt,
-		int segInx,
-		ANGLE_T side )
-{
-	unsigned long res, res1;
-	int b0, b1;
-	res = ComputeTurnoutRoadbedSide( segPtr, segCnt, segInx, side, roadbedWidth );
-	if (res == 0L) {
-	} else if (res == 0xFFFFFFFF) {
-		DrawTurnoutRoadbedSide( d, color, orig, angle, &segPtr[segInx], side, 0, 32 );
-	} else {
-		for ( b0=0, res1=0x00000001; res1&&(res1&res); b0++,res1<<=1 );
-		for ( b1=32,res1=0x80000000; res1&&(res1&res); b1--,res1>>=1 );
-		DrawTurnoutRoadbedSide( d, color, orig, angle, &segPtr[segInx], side, 0, b0 );
-		DrawTurnoutRoadbedSide( d, color, orig, angle, &segPtr[segInx], side, b1, 32 );
-	}
-}
-
-
-static void DrawTurnoutRoadbed(
-		drawCmd_p d,
-		wDrawColor color,
-		coOrd orig,
-		ANGLE_T angle,
-		trkSeg_p segPtr,
-		int segCnt )
-{
-	int inx, trkCnt=0, segInx=0;
-	for (inx=0;inx<segCnt;inx++) {
-		if ( IsSegTrack(&segPtr[inx]) ) {
-			segInx = inx;
-			trkCnt++;
-			if (trkCnt>1)
-				break;
-		}
-	}
-	if (trkCnt==0)
-		return;
-	if (trkCnt == 1) {
-		DrawTurnoutRoadbedSide( d, color, orig, angle, &segPtr[segInx], +90, 0, 32 );
-		DrawTurnoutRoadbedSide( d, color, orig, angle, &segPtr[segInx], -90, 0, 32 );
-	} else {
-		for (inx=0;inx<segCnt;inx++) {
-			if ( IsSegTrack(&segPtr[inx]) ) {
-				ComputeAndDrawTurnoutRoadbedSide( d, color, orig, angle, segPtr, segCnt, inx, +90 );
-				ComputeAndDrawTurnoutRoadbedSide( d, color, orig, angle, segPtr, segCnt, inx, -90 );
-			}
-		}
-	}
-}
-
 /****************************************
  *
  * HAND LAID TURNOUTS
@@ -695,47 +616,44 @@ static void DrawTurnoutRoadbed(
  */
 
 track_p NewHandLaidTurnout(
-		coOrd p0,
-		ANGLE_T a0,
-		coOrd p1,
-		ANGLE_T a1,
-		coOrd p2,
-		ANGLE_T a2,
-		ANGLE_T frogA )
+        coOrd p0,
+        ANGLE_T a0,
+        coOrd p1,
+        ANGLE_T a1,
+        coOrd p2,
+        ANGLE_T a2,
+        ANGLE_T frogA)
 {
 	track_p trk;
-	struct extraData * xx;
+	struct extraDataCompound_t* xx;
 	trkSeg_t segs[2];
-	sprintf( message, "\tHand Laid Turnout, Angle=%0.1f\t", frogA );
-	DYNARR_SET( trkEndPt_t, tempEndPts_da, 2 );
-	memset( &tempEndPts(0), 0, tempEndPts_da.cnt * sizeof tempEndPts(0) );
-	tempEndPts(0).pos = p0;
-	tempEndPts(0).angle = a0;
-	tempEndPts(1).pos = p1;
-	tempEndPts(1).angle = a1;
-	tempEndPts(2).pos = p2;
-	tempEndPts(2).angle = a2;
-	Rotate( &p1, p0, -a0 );
+	sprintf(message, "\tHand Laid Turnout, Angle=%0.1f\t", frogA);
+	TempEndPtsSet( 3 );
+	SetEndPt( TempEndPt(0), p0, a0 );
+	SetEndPt( TempEndPt(1), p1, a1 );
+	SetEndPt( TempEndPt(2), p2, a2 );
+	Rotate(&p1, p0, -a0);
 	p1.x -= p0.x;
 	p1.y -= p0.y;
 	segs[0].type = SEG_STRTRK;
 	segs[0].color = wDrawColorBlack;
 	segs[0].u.l.pos[0] = zero;
 	segs[0].u.l.pos[1] = p1;
-	Rotate( &p2, p0, -a0 );
+	Rotate(&p2, p0, -a0);
 	p2.x -= p0.x;
 	p2.y -= p0.y;
 	segs[1].type = SEG_STRTRK;
 	segs[1].color = wDrawColorBlack;
 	segs[1].u.l.pos[0] = zero;
 	segs[1].u.l.pos[1] = p2;
-	trk = NewCompound( T_TURNOUT, 0, p0, a0, message, 3, &tempEndPts(0), NULL, 22, "Normal\0\1\0\0Reverse\0\2\0\0\0", 2, segs );
-	xx = GetTrkExtraData(trk);
+	trk = NewCompound(T_TURNOUT, 0, p0, a0, message, 3, TempEndPt(0),
+	                  (PATHPTR_T)"Normal\0\1\0\0Reverse\0\2\0\0\0", 2, segs);
+	xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t);
 	xx->handlaid = TRUE;
 
 	return trk;
 }
-
+
 /****************************************
  *
  * GENERIC FUNCTIONS
@@ -743,137 +661,120 @@ track_p NewHandLaidTurnout(
  */
 
 static coOrd MapPathPos(
-		struct extraData * xx,
-		signed char segInx,
-		EPINX_T ep )
+        struct extraDataCompound_t* xx,
+        signed char segInx,
+        EPINX_T ep)
 {
 	trkSeg_p segPtr;
 	coOrd pos;
 
-	if ( segInx < 0 ) {
-		segInx = - segInx;
-		ep = 1-ep;
+	if (segInx < 0) {
+		segInx = -segInx;
+		ep = 1 - ep;
 	}
 
-	segPtr=xx->segs+(segInx-1);
+	segPtr = xx->segs + (segInx - 1);
 	if (!IsSegTrack(segPtr)) {
-		fprintf( stderr, "mapPathPos: bad segInx: %d\n", segInx );
+		fprintf(stderr, "mapPathPos: bad segInx: %d\n", segInx);
 		return zero;
 	}
-	pos = GetSegEndPt( segPtr, ep, FALSE, NULL );
-	REORIGIN1( pos, xx->angle, xx->orig );
+	pos = GetSegEndPt(segPtr, ep, FALSE, NULL);
+	REORIGIN1(pos, xx->angle, xx->orig);
 	return pos;
 
 }
 
-
-static void DrawTurnout(
-		track_p trk,
-		drawCmd_p d,
-		wDrawColor color )
+static trkSeg_p MapPathSeg(
+        struct extraDataCompound_t* xx,
+        signed char segInx)
 {
-	struct extraData *xx = GetTrkExtraData(trk);
-	wIndex_t i;
-	long widthOptions = 0;
-	DIST_T scale2rail;
-
-	widthOptions = DTS_LEFT|DTS_RIGHT;
-    
-	scale2rail = (d->options&DC_PRINT)?(twoRailScale*2+1):twoRailScale;
-	DrawSegsO( d, trk, xx->orig, xx->angle, xx->segs, xx->segCnt, GetTrkGauge(trk), color, widthOptions | DTS_NOCENTER );  // no curve center for turnouts
 
-
-	for (i=0; i<GetTrkEndPtCnt(trk); i++) {
-		DrawEndPt( d, trk, i, color );
-	}
-	if ( (d->options & DC_SIMPLE) == 0 &&
-		 (labelWhen == 2 || (labelWhen == 1 && (d->options&DC_PRINT))) &&
-		 labelScale >= d->scale &&
-		 ( GetTrkBits( trk ) & TB_HIDEDESC ) == 0 ) {
-		DrawCompoundDescription( trk, d, color );
-		if (!xx->handlaid)
-			LabelLengths( d, trk, color );
+	if (segInx < 0) {
+		segInx = -segInx;
 	}
-	if ( roadbedWidth > GetTrkGauge(trk) &&
-		( ((d->options&DC_PRINT) && d->scale <= (twoRailScale*2+1)/2.0) ||
-		  (roadbedOnScreen && d->scale <= twoRailScale) ) )
-		DrawTurnoutRoadbed( d, color, xx->orig, xx->angle, xx->segs, xx->segCnt );
-
+	return xx->segs + (segInx - 1);
 }
 
 
 static BOOL_T ReadTurnout(
-		char * line )
+        char* line)
 {
-	if ( !ReadCompound( line+8, T_TURNOUT ) )
+	if (!ReadCompound(line + 8, T_TURNOUT)) {
 		return FALSE;
+	}
 	return TRUE;
 }
 
 
 static ANGLE_T GetAngleTurnout(
-		track_p trk,
-		coOrd pos,
-		EPINX_T *ep0,
-		EPINX_T *ep1 )
+        track_p trk,
+        coOrd pos,
+        EPINX_T* ep0,
+        EPINX_T* ep1)
 {
-	struct extraData * xx = GetTrkExtraData(trk);
+	struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT,
+	                                 extraDataCompound_t);
 	wIndex_t segCnt, segInx;
 	ANGLE_T angle;
 
-	if ( ep0 && ep1 )
-		*ep0 = *ep1 = PickEndPoint( pos, trk );
-	coOrd pos0=pos;
-	double dd = 10000.0;
+	if (ep0 && ep1) {
+		*ep0 = *ep1 = PickEndPoint(pos, trk);
+	}
+	coOrd pos0 = pos;
+	double dd = DIST_INF;
 	int found = -1;
 	//Cope with tracks not being first
-	for (segCnt =0; segCnt<xx->segCnt ; segCnt++ ) {
+	for (segCnt = 0; segCnt < xx->segCnt; segCnt++) {
 		if (IsSegTrack(&xx->segs[segCnt])) {
-			double d = DistanceSegs( xx->orig, xx->angle, 1, &xx->segs[segCnt], &pos0, NULL );
-			if (d<dd) {
+			double d = DistanceSegs(xx->orig, xx->angle, 1, &xx->segs[segCnt], &pos0, NULL);
+			if (d < dd) {
 				dd = d;
 				found = segCnt;
 			}
 		}
 		pos0 = pos;
 	}
-	if (found>=0) {
+	if (found >= 0) {
 		pos.x -= xx->orig.x;
 		pos.y -= xx->orig.y;
-		Rotate( &pos, zero, -xx->angle );
-		angle = GetAngleSegs( 1, &xx->segs[found], &pos, &segInx, NULL, NULL, NULL, NULL );
-		return NormalizeAngle( angle+xx->angle );
-	} else return 0.0;
+		Rotate(&pos, zero, -xx->angle);
+		angle = GetAngleSegs(1, &xx->segs[found], &pos, &segInx, NULL, NULL, NULL,
+		                     NULL);
+		return NormalizeAngle(angle + xx->angle);
+	} else { return 0.0; }
 }
 
 
 static BOOL_T SplitTurnoutCheckPath(
-		wIndex_t segInxEnd,
-		PATHPTR_T pp1,
-		int dir1,
-		PATHPTR_T pp2,
-		int dir2,
-		trkSeg_p segs,
-		coOrd epPos )
+        wIndex_t segInxEnd,
+        PATHPTR_T pp1,
+        int dir1,
+        PATHPTR_T pp2,
+        int dir2,
+        trkSeg_p segs,
+        coOrd epPos)
 {
 	wIndex_t segInx1, segInx2;
 	EPINX_T segEP;
 	coOrd pos;
 	DIST_T dist;
 
-	GetSegInxEP( pp2[0], &segInx2, &segEP );
-	if ( dir2 < 0 ) segEP = 1-segEP;
-	pos = GetSegEndPt( &segs[segInx2], segEP, FALSE, NULL );
-	dist = FindDistance( pos, epPos );
-	if ( dist>connectDistance )
+	GetSegInxEP(pp2[0], &segInx2, &segEP);
+	if (dir2 < 0) { segEP = 1 - segEP; }
+	pos = GetSegEndPt(&segs[segInx2], segEP, FALSE, NULL);
+	dist = FindDistance(pos, epPos);
+	if (dist > connectDistance) {
 		return TRUE;
-	while ( pp2[0] ) {
-		GetSegInxEP( pp1[0], &segInx1, &segEP );
-		GetSegInxEP( pp2[0], &segInx2, &segEP );
-		if ( segInx1 != segInx2 )
+	}
+	while (pp2[0]) {
+		GetSegInxEP(pp1[0], &segInx1, &segEP);
+		GetSegInxEP(pp2[0], &segInx2, &segEP);
+		if (segInx1 != segInx2) {
 			break;
-		if ( segInxEnd == segInx2 )
+		}
+		if (segInxEnd == segInx2) {
 			return TRUE;
+		}
 		pp1 += dir1;
 		pp2 += dir2;
 	}
@@ -882,22 +783,25 @@ static BOOL_T SplitTurnoutCheckPath(
 
 
 static BOOL_T SplitTurnoutCheckEP(
-		wIndex_t segInx0,
-		coOrd epPos,
-		PATHPTR_T pp1,
-		int dir1,
-		PATHPTR_T pp,
-		trkSeg_p segs )
+        wIndex_t segInx0,
+        coOrd epPos,
+        PATHPTR_T pp1,
+        int dir1,
+        PATHPTR_T pp,
+        trkSeg_p segs)
 {
-	while ( pp[0] ) {
-		pp += strlen((char *)pp)+1;
-		while ( pp[0] ) {
-			if (!SplitTurnoutCheckPath( segInx0, pp1, dir1, pp, 1, segs, epPos ))
+	while (pp[0]) {
+		pp += strlen((char*)pp) + 1;
+		while (pp[0]) {
+			if (!SplitTurnoutCheckPath(segInx0, pp1, dir1, pp, 1, segs, epPos)) {
 				return FALSE;
-			while ( pp[0] )
+			}
+			while (pp[0]) {
 				pp++;
-			if (!SplitTurnoutCheckPath( segInx0, pp1, dir1, pp-1, -1, segs, epPos ))
+			}
+			if (!SplitTurnoutCheckPath(segInx0, pp1, dir1, pp - 1, -1, segs, epPos)) {
 				return FALSE;
+			}
 			pp++;
 		}
 		pp++;
@@ -907,11 +811,12 @@ static BOOL_T SplitTurnoutCheckEP(
 
 
 EXPORT EPINX_T TurnoutPickEndPt(
-		coOrd epPos,
-		track_p trk )
+        coOrd epPos,
+        track_p trk)
 {
-	struct extraData * xx = GetTrkExtraData(trk);
-	wIndex_t segCnt, segInx, segInx0;
+	struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT,
+	                                 extraDataCompound_t);
+	wIndex_t segInx, segInx0;
 	EPINX_T segEP;
 	PATHPTR_T cp, cq, pps[2];
 	coOrd pos;
@@ -920,39 +825,40 @@ EXPORT EPINX_T TurnoutPickEndPt(
 	EPINX_T ep, epCnt, eps[2];
 	BOOL_T unique_eps[2];
 
-	for ( segCnt=0; segCnt<xx->segCnt && IsSegTrack(&xx->segs[segCnt]); segCnt++ );
-	DistanceSegs( xx->orig, xx->angle, segCnt, xx->segs, &epPos, &segInx0 );
-	Rotate( &epPos, xx->orig, xx->angle );
+	DistanceSegs(xx->orig, xx->angle, xx->segCnt, xx->segs, &epPos, &segInx0);
+	Rotate(&epPos, xx->orig, xx->angle);
 	epPos.x -= xx->orig.x;
 	epPos.y -= xx->orig.y;
 	epCnt = GetTrkEndPtCnt(trk);
-	cp = xx->paths;
+	cp = GetPaths(trk);
 	eps[0] = eps[1] = -1;
 	unique_eps[0] = unique_eps[1] = TRUE;
-	while ( cp[0] ) {
-		cp += strlen((char *)cp)+1;
-		while ( cp[0] ) {
-			while ( cp[0] ) {
-				GetSegInxEP( cp[0], &segInx, &segEP );
-				if ( segInx == segInx0 ) {
-					for ( dir=0; dir<2; dir++ ) {
-						for ( cq=cp; cq[dir?-1:1]; cq += (dir?-1:1) );
-						GetSegInxEP( cq[0], &segInx, &segEP );
-						if ( dir==0 ) segEP = 1-segEP;
-						pos = GetSegEndPt( &xx->segs[segInx], segEP, FALSE, NULL );
-						dist = FindDistance( pos, epPos );
-						if ( eps[dir] < 0 || dist < dists[dir] ) {
+	while (cp[0]) {
+		cp += strlen((char*)cp) + 1;
+		while (cp[0]) {
+			while (cp[0]) {
+				GetSegInxEP(cp[0], &segInx, &segEP);
+				if (segInx == segInx0) {
+					for (dir = 0; dir < 2; dir++) {
+						for (cq = cp; cq[dir ? -1 : 1]; cq += (dir ? -1 : 1));
+						GetSegInxEP(cq[0], &segInx, &segEP);
+						if (dir == 0) { segEP = 1 - segEP; }
+						pos = GetSegEndPt(&xx->segs[segInx], segEP, FALSE, NULL);
+						dist = FindDistance(pos, epPos);
+						if (eps[dir] < 0 || dist < dists[dir]) {
 							dists[dir] = dist;
 							pos.x += xx->orig.x;
 							pos.y += xx->orig.y;
-							Rotate( &pos, xx->orig, xx->angle );
-							for ( ep=0; ep<epCnt; ep++ ) {
-								if ( FindDistance( pos, GetTrkEndPos(trk,ep) ) < connectDistance )
+							Rotate(&pos, xx->orig, xx->angle);
+							for (ep = 0; ep < epCnt; ep++) {
+								if (FindDistance(pos, GetTrkEndPos(trk, ep)) < connectDistance) {
 									break;
+								}
 							}
-							if ( ep<epCnt ) {
-								if ( eps[dir] >= 0 && eps[dir] != ep )
+							if (ep < epCnt) {
+								if (eps[dir] >= 0 && eps[dir] != ep) {
 									unique_eps[dir] = FALSE;
+								}
 								eps[dir] = ep;
 								dists[dir] = dist;
 								pps[dir] = cq;
@@ -967,27 +873,33 @@ EXPORT EPINX_T TurnoutPickEndPt(
 		cp++;
 	}
 
-	for ( dir=0; dir<2; dir++ ) {
-		if ( unique_eps[dir] && eps[dir] >= 0 ) {
-			GetSegInxEP( pps[dir][0], &segInx, &segEP );
-			if ( dir == 0 ) segEP = 1-segEP;
-			epPos = GetSegEndPt( &xx->segs[segInx], segEP, FALSE, NULL );
-			if ( ! SplitTurnoutCheckEP( segInx0, epPos, pps[dir], dir?1:-1, xx->paths, xx->segs ) )
-				unique_eps[dir] = FALSE; 
+	for (dir = 0; dir < 2; dir++) {
+		if (unique_eps[dir] && eps[dir] >= 0) {
+			GetSegInxEP(pps[dir][0], &segInx, &segEP);
+			if (dir == 0) { segEP = 1 - segEP; }
+			epPos = GetSegEndPt(&xx->segs[segInx], segEP, FALSE, NULL);
+			if (!SplitTurnoutCheckEP(segInx0, epPos, pps[dir], dir ? 1 : -1, GetPaths(trk),
+			                         xx->segs)) {
+				unique_eps[dir] = FALSE;
+			}
 		}
 	}
 
-	if ( unique_eps[0] == unique_eps[1] ) {
-		if ( eps[0] >= 0 && eps[1] >= 0 )
-			return ( dists[0] < dists[1] ) ? eps[0] : eps[1] ;
+	if (unique_eps[0] == unique_eps[1]) {
+		if (eps[0] >= 0 && eps[1] >= 0) {
+			return (dists[0] < dists[1]) ? eps[0] : eps[1];
+		}
 	}
-	if ( unique_eps[0] && eps[0] >= 0 )
+	if (unique_eps[0] && eps[0] >= 0) {
 		return eps[0];
-	if ( unique_eps[1] && eps[1] >= 0 )
+	}
+	if (unique_eps[1] && eps[1] >= 0) {
 		return eps[1];
-	if ( eps[0] >= 0 && eps[1] >= 0 )
-		return ( dists[0] < dists[1] ) ? eps[0] : eps[1] ;
-	return eps[0] >= 0 ? eps[0] : eps[1] ;
+	}
+	if (eps[0] >= 0 && eps[1] >= 0) {
+		return (dists[0] < dists[1]) ? eps[0] : eps[1];
+	}
+	return eps[0] >= 0 ? eps[0] : eps[1];
 }
 
 
@@ -996,11 +908,11 @@ static PATHPTR_T splitTurnoutRoot;
 static int splitTurnoutDir;
 
 static void SplitTurnoutCheckEndPt(
-		PATHPTR_T path,
-		int dir,
-		trkSeg_p segs,
-		coOrd epPos,
-		coOrd splitPos )
+        PATHPTR_T path,
+        int dir,
+        trkSeg_p segs,
+        coOrd epPos,
+        coOrd splitPos)
 {
 	PATHPTR_T path0;
 	wIndex_t segInx;
@@ -1009,21 +921,25 @@ static void SplitTurnoutCheckEndPt(
 	DIST_T dist, minDist;
 
 	path0 = path;
-	GetSegInxEP( path[0], &segInx, &segEP );
-	if ( dir < 0 ) segEP = 1-segEP;
-	pos = GetSegEndPt( &segs[segInx], segEP, FALSE, NULL );
-	dist = FindDistance( pos, epPos );
-	LOG( log_splitturnout, 1, ( "  SPTChkEp P%d DIR:%d SegInx:%d SegEP:%d POS[%0.3f %0.3f] DIST:%0.3f\n", *path, dir, segInx, segEP, pos.x, pos.y, dist ) );
-	if ( dist>connectDistance )
+	GetSegInxEP(path[0], &segInx, &segEP);
+	if (dir < 0) { segEP = 1 - segEP; }
+	pos = GetSegEndPt(&segs[segInx], segEP, FALSE, NULL);
+	dist = FindDistance(pos, epPos);
+	LOG(log_splitturnout, 1,
+	    ("  SPTChkEp P%d DIR:%d SegInx:%d SegEP:%d POS[%0.3f %0.3f] DIST:%0.3f\n",
+	     *path, dir, segInx, segEP, pos.x, pos.y, dist));
+	if (dist > connectDistance) {
 		return;
+	}
 	minDist = trackGauge;
-	while ( path[0] ) {
-		GetSegInxEP( path[0], &segInx, &segEP );
-		if ( dir < 0 ) segEP = 1-segEP;
+	while (path[0]) {
+		GetSegInxEP(path[0], &segInx, &segEP);
+		if (dir < 0) { segEP = 1 - segEP; }
 		pos = splitPos;
-		dist = DistanceSegs( zero, 0.0, 1, &segs[segInx], &pos, NULL );
-		LOG( log_splitturnout, 1, ( "  - P:%d SegInx:%d SegEP:%d DIST:%0.3f\n", path[0], segInx, segEP, dist ) );
-		if ( dist < minDist ) {
+		dist = DistanceSegs(zero, 0.0, 1, &segs[segInx], &pos, NULL);
+		LOG(log_splitturnout, 1, ("  - P:%d SegInx:%d SegEP:%d DIST:%0.3f\n", path[0],
+		                          segInx, segEP, dist));
+		if (dist < minDist) {
 			minDist = dist;
 			splitTurnoutPath = path;
 			splitTurnoutDir = -dir;
@@ -1034,26 +950,29 @@ static void SplitTurnoutCheckEndPt(
 }
 
 EXPORT BOOL_T SplitTurnoutCheck(
-			track_p trk,
-			coOrd pos,
-			EPINX_T ep,
-			track_p *leftover,
-			EPINX_T * ep0,
-			EPINX_T * ep1,
-			BOOL_T check,
-			coOrd * outPos,
-			ANGLE_T * outAngle )
-	{
-	struct extraData * xx = GetTrkExtraData( trk );
+        track_p trk,
+        coOrd pos,
+        EPINX_T ep,
+        track_p* leftover,
+        EPINX_T* ep0,
+        EPINX_T* ep1,
+        BOOL_T check,
+        coOrd* outPos,
+        ANGLE_T* outAngle)
+{
+	struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT,
+	                                 extraDataCompound_t);
 	wIndex_t segInx0, segInx, segCnt;
-	EPINX_T segEP, epCnt, ep2=0, epN;
+	EPINX_T segEP, ep2 = 0, epN;
+//	EPINX_T epCnt;
 	PATHPTR_T pp, pp1, pp2;
 	unsigned char c;
-	char * cp;
-	int negCnt, posCnt, pathCnt, dir;
+	char* cp;
+	int negCnt, posCnt, dir;
+//	int pathCnt;
 	segProcData_t segProcDataSplit;
 	segProcData_t segProcDataNewTrack;
-	track_p trk2=NULL;
+	track_p trk2 = NULL;
 	static dynArr_t segIndexMap_da;
 #define segIndexMap(N) DYNARR_N( int, segIndexMap_da, N )
 	static dynArr_t newPath_da;
@@ -1064,72 +983,83 @@ EXPORT BOOL_T SplitTurnoutCheck(
 	int s0, s1;
 	trkSeg_t newSeg;
 
-	if ( (MyGetKeyState()&WKEY_SHIFT) == 0 ) {
-		if (!check)
-			ErrorMessage( MSG_CANT_SPLIT_TRK, _("Turnout") );
+	if ((MyGetKeyState() & WKEY_SHIFT) == 0) {
+		if (!check) {
+			ErrorMessage(MSG_CANT_SPLIT_TRK, _("Turnout"));
+		}
 		return FALSE;
 	}
 
 	/*
 	 * 1. Find segment on path that ends at 'ep'
 	 */
-	epCnt = GetTrkEndPtCnt(trk);
-	epPos = GetTrkEndPos( trk, ep );
-	for ( segCnt=0; segCnt<xx->segCnt && IsSegTrack(&xx->segs[segCnt]); segCnt++ );
-	Rotate( &pos, xx->orig, -xx->angle );
+//	epCnt = GetTrkEndPtCnt(trk);
+	epPos = GetTrkEndPos(trk, ep);
+	for (segCnt = 0; segCnt < xx->segCnt
+	     && IsSegTrack(&xx->segs[segCnt]); segCnt++);
+	Rotate(&pos, xx->orig, -xx->angle);
 	pos.x -= xx->orig.x;
 	pos.y -= xx->orig.y;
-	Rotate( &epPos, xx->orig, -xx->angle );
+	Rotate(&epPos, xx->orig, -xx->angle);
 	epPos.x -= xx->orig.x;
 	epPos.y -= xx->orig.y;
 	splitTurnoutPath = NULL;
-	pp = xx->paths;
-	LOG( log_splitturnout, 1, ( "SplitTurnoutCheck T%d POS[%0.3f %0.3f] EP:%d CHK:%d EPPOS[%0.3f %0.3f]\n", trk?trk->index:0, pos.x, pos.y, ep, check, epPos.x, epPos.y ) );
-	while ( pp[0] ) {
-		pp += strlen((char *)pp)+1;
-		while ( pp[0] ) {
-			SplitTurnoutCheckEndPt( pp, 1, xx->segs, epPos, pos );
-			if ( splitTurnoutPath != NULL )
+	pp = GetPaths(trk);
+	LOG(log_splitturnout, 1,
+	    ("SplitTurnoutCheck T%d POS[%0.3f %0.3f] EP:%d CHK:%d EPPOS[%0.3f %0.3f]\n",
+	     trk ? GetTrkIndex( trk ): 0, pos.x, pos.y, ep, check, epPos.x, epPos.y));
+	while (pp[0]) {
+		pp += strlen((char*)pp) + 1;
+		while (pp[0]) {
+			SplitTurnoutCheckEndPt(pp, 1, xx->segs, epPos, pos);
+			if (splitTurnoutPath != NULL) {
 				goto foundSeg;
-			while ( pp[0] )
+			}
+			while (pp[0]) {
 				pp++;
-			SplitTurnoutCheckEndPt( pp-1, -1, xx->segs, epPos, pos );
-			if ( splitTurnoutPath != NULL )
+			}
+			SplitTurnoutCheckEndPt(pp - 1, -1, xx->segs, epPos, pos);
+			if (splitTurnoutPath != NULL) {
 				goto foundSeg;
+			}
 			pp++;
 		}
 		pp++;
 	}
-	if (!check)
-		ErrorMessage( _("splitTurnout: can't find segment") );
+	if (!check) {
+		ErrorMessage(_("splitTurnout: can't find segment"));
+	}
 	return FALSE;
 foundSeg:
 
 	/*
 	 * 2a. Check that all other paths thru found segment are the same
 	 */
-	GetSegInxEP( splitTurnoutPath[0], &segInx0, &segEP );
-	LOG( log_splitturnout, 1, (" Found Seg: %d SEG:%d EP:%d\n", *splitTurnoutPath, segInx0, segEP ) );
-	pp = xx->paths;
-	pathCnt = 0;
-	while ( pp[0] ) {
-		pp += strlen((char *)pp)+1;
-		while ( pp[0] ) {
-			while ( pp[0] ) {
-				GetSegInxEP( pp[0], &segInx, &segEP );
-				if ( segInx == segInx0 ) {
+	GetSegInxEP(splitTurnoutPath[0], &segInx0, &segEP);
+	LOG(log_splitturnout, 1, (" Found Seg: %d SEG:%d EP:%d\n", *splitTurnoutPath,
+	                          segInx0, segEP));
+	pp = GetPaths(trk);
+//	pathCnt = 0;
+	while (pp[0]) {
+		pp += strlen((char*)pp) + 1;
+		while (pp[0]) {
+			while (pp[0]) {
+				GetSegInxEP(pp[0], &segInx, &segEP);
+				if (segInx == segInx0) {
 					pp1 = splitTurnoutPath;
 					pp2 = pp;
-					dir = (pp2[0]>0?1:-1) * splitTurnoutDir;
-					while ( pp1[0] && pp2[0] ) {
-						if ( splitTurnoutDir * pp1[0] != dir * pp2[0] )
+					dir = (pp2[0] > 0 ? 1 : -1) * splitTurnoutDir;
+					while (pp1[0] && pp2[0]) {
+						if (splitTurnoutDir * pp1[0] != dir * pp2[0]) {
 							break;
+						}
 						pp1 += splitTurnoutDir;
 						pp2 += dir;
 					}
-					if ( pp1[0]!='\0' || pp2[0]!='\0' ) {
-						if (!check)
-							ErrorMessage( MSG_SPLIT_POS_BTW_MERGEPTS );
+					if (pp1[0] != '\0' || pp2[0] != '\0') {
+						if (!check) {
+							ErrorMessage(MSG_SPLIT_POS_BTW_MERGEPTS);
+						}
 						return FALSE;
 					}
 				}
@@ -1143,20 +1073,22 @@ foundSeg:
 	/*
 	 * 2b. Check that all paths from ep pass thru segInx0
 	 */
-	if ( !SplitTurnoutCheckEP( segInx0, epPos, splitTurnoutRoot, -splitTurnoutDir, xx->paths, xx->segs ) ) {
-		if (!check)
-			ErrorMessage( MSG_SPLIT_PATH_NOT_UNIQUE );
+	if (!SplitTurnoutCheckEP(segInx0, epPos, splitTurnoutRoot, -splitTurnoutDir,
+	                         GetPaths(trk), xx->segs)) {
+		if (!check) {
+			ErrorMessage(MSG_SPLIT_PATH_NOT_UNIQUE);
+		}
 		return FALSE;
 	}
 
 	if (check) {
 		segProcDataSplit.getAngle.pos = pos;
-		SegProc( SEGPROC_GETANGLE, xx->segs+segInx0, &segProcDataSplit );
-		*outAngle = NormalizeAngle(segProcDataSplit.getAngle.angle+xx->angle);
+		SegProc(SEGPROC_GETANGLE, xx->segs + segInx0, &segProcDataSplit);
+		*outAngle = NormalizeAngle(segProcDataSplit.getAngle.angle + xx->angle);
 		*outPos = segProcDataSplit.getAngle.pos;
 		(*outPos).x += xx->orig.x;
 		(*outPos).y += xx->orig.y;
-		Rotate( outPos, xx->orig, xx->angle );
+		Rotate(outPos, xx->orig, xx->angle);
 		return TRUE;
 	}
 
@@ -1165,53 +1097,57 @@ foundSeg:
 	 */
 	segProcDataSplit.split.pos = pos;
 	s0 = (splitTurnoutPath[0] > 0) != (splitTurnoutDir > 0);
-	s1 = 1-s0;
-	SegProc( SEGPROC_SPLIT, xx->segs+segInx0, &segProcDataSplit );
-	if ( segProcDataSplit.split.length[s1] <= minLength ) {
-		if ( splitTurnoutPath[splitTurnoutDir] == '\0' )
+	s1 = 1 - s0;
+	SegProc(SEGPROC_SPLIT, xx->segs + segInx0, &segProcDataSplit);
+	if (segProcDataSplit.split.length[s1] <= minLength) {
+		if (splitTurnoutPath[splitTurnoutDir] == '\0') {
 			return FALSE;
+		}
 		segProcDataSplit.split.length[s0] += segProcDataSplit.split.length[s1];
 		segProcDataSplit.split.length[s1] = 0;
 		segProcDataSplit.split.newSeg[s0] = xx->segs[segInx0];
-		epPos = GetSegEndPt( &segProcDataSplit.split.newSeg[s0], s1, FALSE, &epAngle );
-	} else if ( segProcDataSplit.split.length[s0] <= minLength ) {
+		epPos = GetSegEndPt(&segProcDataSplit.split.newSeg[s0], s1, FALSE, &epAngle);
+	} else if (segProcDataSplit.split.length[s0] <= minLength) {
 		segProcDataSplit.split.length[s1] += segProcDataSplit.split.length[s0];
 		segProcDataSplit.split.length[s0] = 0;
 		segProcDataSplit.split.newSeg[s1] = xx->segs[segInx0];
-		epPos = GetSegEndPt( &segProcDataSplit.split.newSeg[s1], s0, FALSE, &epAngle );
+		epPos = GetSegEndPt(&segProcDataSplit.split.newSeg[s1], s0, FALSE, &epAngle);
 		epAngle += 180.0;
 	} else {
-		epPos = GetSegEndPt( &segProcDataSplit.split.newSeg[s1], s0, FALSE, &epAngle );
+		epPos = GetSegEndPt(&segProcDataSplit.split.newSeg[s1], s0, FALSE, &epAngle);
 		epAngle += 180.0;
 	}
 
 	/*
 	 * 4. Map the old segments to new
 	 */
-	DYNARR_SET( int, segIndexMap_da, xx->segCnt );
-	for ( segInx=0; segInx<xx->segCnt; segInx++ )
-		segIndexMap(segInx) = segInx+1;
+	DYNARR_SET(int, segIndexMap_da, xx->segCnt);
+	for (segInx = 0; segInx < xx->segCnt; segInx++) {
+		segIndexMap(segInx) = segInx + 1;
+	}
 	pp = splitTurnoutPath;
-	if ( segProcDataSplit.split.length[s0] > minLength )
+	if (segProcDataSplit.split.length[s0] > minLength) {
 		pp += splitTurnoutDir;
+	}
 	negCnt = 0;
-	while ( *pp ) {
-		GetSegInxEP( *pp, &segInx, &segEP );
-		segIndexMap(segInx) = - segIndexMap(segInx);
+	while (*pp) {
+		GetSegInxEP(*pp, &segInx, &segEP);
+		segIndexMap(segInx) = -segIndexMap(segInx);
 		negCnt++;
 		pp += splitTurnoutDir;
 	}
-	for ( segInx=posCnt=0; segInx<xx->segCnt; segInx++ ) {
-		if ( segIndexMap(segInx) > 0 )
+	for (segInx = posCnt = 0; segInx < xx->segCnt; segInx++) {
+		if (segIndexMap(segInx) > 0) {
 			segIndexMap(segInx) = ++posCnt;
+		}
 	}
-	DYNARR_SET( trkSeg_t, tempSegs_da, posCnt );
-	for ( segInx=posCnt=0; segInx<xx->segCnt; segInx++ ) {
-		if ( segIndexMap(segInx) > 0 ) {
-			if ( segInx == segInx0 ) {
-				tempSegs(segIndexMap(segInx)-1) = segProcDataSplit.split.newSeg[s0];
+	DYNARR_SET(trkSeg_t, tempSegs_da, posCnt);
+	for (segInx = posCnt = 0; segInx < xx->segCnt; segInx++) {
+		if (segIndexMap(segInx) > 0) {
+			if (segInx == segInx0) {
+				tempSegs(segIndexMap(segInx) - 1) = segProcDataSplit.split.newSeg[s0];
 			} else {
-				tempSegs(segIndexMap(segInx)-1) = xx->segs[segInx];
+				tempSegs(segIndexMap(segInx) - 1) = xx->segs[segInx];
 			}
 			posCnt++;
 		}
@@ -1220,20 +1156,21 @@ foundSeg:
 	/*
 	 * 5. Remap paths by removing trailing segments
 	 */
-	DYNARR_SET( char, newPath_da, xx->pathLen );
-	pp = xx->paths;
+	pp = GetPaths(trk);
+	DYNARR_SET(char, newPath_da, GetPathsLength(pp));
 	pp1 = (PATHPTR_T)&newPath(0);
-	while ( *pp ) {
-		strcpy( (char *)pp1, (char *)pp );
-		pp += strlen( (char *)pp )+1;
-		pp1 += strlen( (char *)pp1 )+1;
-		while ( *pp ) {
-			while ( *pp ) {
-				GetSegInxEP( *pp, &segInx, &segEP );
-				if ( segIndexMap(segInx) > 0 ) {
+	while (*pp) {
+		strcpy((char*)pp1, (char*)pp);
+		pp += strlen((char*)pp) + 1;
+		pp1 += strlen((char*)pp1) + 1;
+		while (*pp) {
+			while (*pp) {
+				GetSegInxEP(*pp, &segInx, &segEP);
+				if (segIndexMap(segInx) > 0) {
 					c = segIndexMap(segInx);
-					if ( *pp<0 )
+					if (*pp < 0) {
 						c = -c;
+					}
 					*pp1++ = c;
 				}
 				pp++;
@@ -1249,23 +1186,23 @@ foundSeg:
 	/*
 	 * 6. Reorigin segments
 	 */
-	GetSegBounds( zero, 0, tempSegs_da.cnt, &tempSegs(0), &orig, &size );
+	GetSegBounds(zero, 0, tempSegs_da.cnt, &tempSegs(0), &orig, &size);
 	orig.x = -orig.x;
 	orig.y = -orig.y;
-	MoveSegs( tempSegs_da.cnt, &tempSegs(0), orig );
+	MoveSegs(tempSegs_da.cnt, &tempSegs(0), orig);
 	epPos.x += orig.x;
 	epPos.y += orig.y;
-	cp = strchr( xx->title, '\t' );
-	if ( cp ) {
-		if ( strncmp( cp+1, "Split ", 6 ) != 0 ) {
-			memcpy( message, xx->title, cp-xx->title+1 );
-			strcpy( message+(cp-xx->title+1), "Split " );
-			strcat( message, cp+1 );
+	cp = strchr(xx->title, '\t');
+	if (cp) {
+		if (strncmp(cp + 1, "Split ", 6) != 0) {
+			memcpy(message, xx->title, cp - xx->title + 1);
+			strcpy(message + (cp - xx->title + 1), "Split ");
+			strcat(message, cp + 1);
 		} else {
-			strcpy( message, xx->title );
+			strcpy(message, xx->title);
 		}
 	} else {
-		sprintf( message, "Split %s", xx->title );
+		sprintf(message, "Split %s", xx->title);
 	}
 
 	/*
@@ -1273,28 +1210,29 @@ foundSeg:
 	 */
 	int trks = 0;
 	path = splitTurnoutPath;
-	if ( segProcDataSplit.split.length[s1] < minLength )
+	if (segProcDataSplit.split.length[s1] < minLength) {
 		path += splitTurnoutDir;
-	while ( path[0] ) {
-		GetSegInxEP( path[0], &segInx, &segEP );
+	}
+	while (path[0]) {
+		GetSegInxEP(path[0], &segInx, &segEP);
 		s0 = (path[0] > 0) != (splitTurnoutDir > 0);
-		if ( segInx0 != segInx ) {
+		if (segInx0 != segInx) {
 			newSeg = xx->segs[segInx];
 		} else {
 			newSeg = segProcDataSplit.split.newSeg[s1];
 		}
-		MoveSegs( 1, &newSeg, xx->orig );
-		RotateSegs( 1, &newSeg, xx->orig, xx->angle );
-		SegProc( SEGPROC_NEWTRACK, &newSeg, &segProcDataNewTrack );
-		if ( *leftover == NULL ) {
+		MoveSegs(1, &newSeg, xx->orig);
+		RotateSegs(1, &newSeg, xx->orig, xx->angle);
+		SegProc(SEGPROC_NEWTRACK, &newSeg, &segProcDataNewTrack);
+		if (*leftover == NULL) {
 			*ep0 = segProcDataNewTrack.newTrack.ep[s0];
 			*leftover = trk2 = segProcDataNewTrack.newTrack.trk;
-			ep2 = 1-*ep0;
+			ep2 = 1 - *ep0;
 		} else {
 			epN = segProcDataNewTrack.newTrack.ep[s0];
-			ConnectTracks( trk2, ep2, segProcDataNewTrack.newTrack.trk, epN );
+			ConnectTracks(trk2, ep2, segProcDataNewTrack.newTrack.trk, epN);
 			trk2 = segProcDataNewTrack.newTrack.trk;
-			ep2 = 1-epN;
+			ep2 = 1 - epN;
 		}
 		++trks;
 		path += splitTurnoutDir;
@@ -1304,40 +1242,40 @@ foundSeg:
 	 * 8. Replace segments, paths, and endPt in original turnout
 	 */
 	xx->split = TRUE;
-	Rotate( &orig, zero, xx->angle );
+	Rotate(&orig, zero, xx->angle);
 	xx->orig.x -= orig.x;
 	xx->orig.y -= orig.y;
 	xx->segCnt = tempSegs_da.cnt;
-	xx->segs = (trkSeg_p)memdup( &tempSegs(0), tempSegs_da.cnt * sizeof tempSegs(0) );
-	CloneFilledDraw( xx->segCnt, xx->segs, TRUE );
-	xx->pathLen = pp1-(PATHPTR_T)&newPath(0);
-	xx->pathCurr = xx->paths = memdup( &newPath(0), xx->pathLen );
-	epAngle = NormalizeAngle( xx->angle+epAngle );
+	xx->segs = (trkSeg_p)memdup(&tempSegs(0), tempSegs_da.cnt * sizeof tempSegs(0));
+	CloneFilledDraw(xx->segCnt, xx->segs, TRUE);
+	SetPaths(trk, (PATHPTR_T)&newPath(0));
+	epAngle = NormalizeAngle(xx->angle + epAngle);
 	epPos.x += xx->orig.x;
 	epPos.y += xx->orig.y;
-	Rotate( &epPos, xx->orig, xx->angle );
-	SetTrkEndPoint( trk, ep, epPos, epAngle );
-	ComputeCompoundBoundingBox( trk );
+	Rotate(&epPos, xx->orig, xx->angle);
+	SetTrkEndPoint(trk, ep, epPos, epAngle);
+	ComputeCompoundBoundingBox(trk);
 
 	return TRUE;
 }
 
 static BOOL_T SplitTurnout(
-		track_p trk,
-		coOrd pos,
-		EPINX_T ep,
-		track_p *leftover,
-		EPINX_T * ep0,
-		EPINX_T * ep1 )
+        track_p trk,
+        coOrd pos,
+        EPINX_T ep,
+        track_p* leftover,
+        EPINX_T* ep0,
+        EPINX_T* ep1)
 {
-	return SplitTurnoutCheck(trk,pos,ep,leftover,ep0,ep1,FALSE,NULL,NULL);
+	return SplitTurnoutCheck(trk, pos, ep, leftover, ep0, ep1, FALSE, NULL, NULL);
 }
 
 static BOOL_T CheckTraverseTurnout(
-		track_p trk,
-		coOrd pos )
+        track_p trk,
+        coOrd pos)
 {
-	struct extraData * xx = GetTrkExtraData(trk);
+	struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT,
+	                                 extraDataCompound_t);
 	coOrd pos1;
 #ifdef LATER
 	int inx, foundInx = 0;
@@ -1348,65 +1286,73 @@ static BOOL_T CheckTraverseTurnout(
 	int segInx;
 	EPINX_T segEP;
 
-LOG( log_traverseTurnout, 1, ( "CheckTraverseTurnout( T%d, [%0.3f %0.3f])\n", GetTrkIndex(trk), pos.x, pos.y ) )
-	Rotate( &pos, xx->orig, -xx->angle );
+	LOG(log_traverseTurnout, 1, ("CheckTraverseTurnout( T%d, [%0.3f %0.3f])\n",
+	                             GetTrkIndex(trk), pos.x, pos.y))
+	Rotate(&pos, xx->orig, -xx->angle);
 	pos.x -= xx->orig.x;
 	pos.y -= xx->orig.y;
-LOG( log_traverseTurnout, 1, ( "After rotation = [%0.3f %0.3f])\n", pos.x, pos.y ) )
-	
+	LOG(log_traverseTurnout, 1, ("After rotation = [%0.3f %0.3f])\n", pos.x, pos.y))
+
 #ifdef LATER
-	for ( inx=0; inx<xx->segCnt; inx++ ) {
-		switch ( xx->segs[inx].type ) {
+	for (inx = 0; inx < xx->segCnt; inx++) {
+		switch (xx->segs[inx].type) {
 		case SEG_STRTRK:
 		case SEG_CRVTRK:
-			pos1 = GetSegEndPt( &xx->segs[inx], 0, FALSE, NULL );
-			d = FindDistance( pos, pos1 );
-			if ( foundInx == 0 || d < foundD ) {
-				foundInx = inx+1;
+			pos1 = GetSegEndPt(&xx->segs[inx], 0, FALSE, NULL);
+			d = FindDistance(pos, pos1);
+			if (foundInx == 0 || d < foundD) {
+				foundInx = inx + 1;
 				foundD = d;
 			}
-			pos1 = GetSegEndPt( &xx->segs[inx], 1, FALSE, NULL );
-			d = FindDistance( pos, pos1 );
-			if ( foundInx == 0 || d < foundD ) {
-				foundInx = -(inx+1);
+			pos1 = GetSegEndPt(&xx->segs[inx], 1, FALSE, NULL);
+			d = FindDistance(pos, pos1);
+			if (foundInx == 0 || d < foundD) {
+				foundInx = -(inx + 1);
 				foundD = d;
 			}
 			break;
 		}
 	}
-	if ( foundInx == 0 )
+	if (foundInx == 0) {
 		return FALSE;
+	}
 #endif
-	for ( pathCurr = xx->pathCurr+strlen((char*)xx->pathCurr)+1; pathCurr[0] || pathCurr[1]; pathCurr++ ) {
-LOG( log_traverseTurnout, 1, ( "P[%d] = %d ", pathCurr-xx->paths, pathCurr[0] ) )
-		if ( pathCurr[-1] == 0 ) {
-			GetSegInxEP( pathCurr[0], &segInx, &segEP );
-			pos1 = GetSegEndPt( &xx->segs[segInx], segEP, FALSE, NULL );
-			d = FindDistance( pos, pos1 );
-LOG( log_traverseTurnout, 1, ( "d=%0.3f\n", d ) )
-			if ( d < connectDistance )
+	PATHPTR_T pathName = GetCurrPath(trk);
+	for (pathCurr = pathName + strlen((char*)pathName) + 1;
+	     pathCurr[0] || pathCurr[1]; pathCurr++) {
+		LOG(log_traverseTurnout, 1, ("P[%d] = %d ", pathCurr - GetPaths(trk),
+		                             pathCurr[0]))
+		if (pathCurr[-1] == 0) {
+			GetSegInxEP(pathCurr[0], &segInx, &segEP);
+			pos1 = GetSegEndPt(&xx->segs[segInx], segEP, FALSE, NULL);
+			d = FindDistance(pos, pos1);
+			LOG(log_traverseTurnout, 1, ("d=%0.3f\n", d))
+			if (d < connectDistance) {
 				return TRUE;
+			}
 		}
-		if ( pathCurr[1] == 0 ) {
-			GetSegInxEP( pathCurr[0], &segInx, &segEP );
-			pos1 = GetSegEndPt( &xx->segs[segInx], 1-segEP, FALSE, NULL );
-			d = FindDistance( pos, pos1 );
-LOG( log_traverseTurnout, 1, ( "d=%0.3f\n", d ) )
-			if ( d < connectDistance )
+		if (pathCurr[1] == 0) {
+			GetSegInxEP(pathCurr[0], &segInx, &segEP);
+			pos1 = GetSegEndPt(&xx->segs[segInx], 1 - segEP, FALSE, NULL);
+			d = FindDistance(pos, pos1);
+			LOG(log_traverseTurnout, 1, ("d=%0.3f\n", d))
+			if (d < connectDistance) {
 				return TRUE;
+			}
 		}
 	}
-LOG( log_traverseTurnout, 1, ( " not found\n" ) )
+	LOG(log_traverseTurnout, 1, (" not found\n"))
 	return FALSE;
 }
 
 
 static BOOL_T TraverseTurnout(
-		traverseTrack_p trvTrk,
-		DIST_T * distR )
+        traverseTrack_p trvTrk,
+        DIST_T* distR)
 {
 	track_p trk = trvTrk->trk;
-	struct extraData * xx = GetTrkExtraData(trk);
+	struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT,
+	                                 extraDataCompound_t);
 	coOrd pos0, pos1, pos2;
 	DIST_T d, dist;
 	PATHPTR_T path, pathCurr;
@@ -1416,37 +1362,42 @@ static BOOL_T TraverseTurnout(
 	EPINX_T segEP;
 	segProcData_t segProcData;
 
-	d = 10000;
+	d = DIST_INF;
 	pos0 = trvTrk->pos;
-	Rotate( &pos0, xx->orig, -xx->angle );
+	Rotate(&pos0, xx->orig, -xx->angle);
 	pos0.x -= xx->orig.x;
 	pos0.y -= xx->orig.y;
 	dist = *distR;
-LOG( log_traverseTurnout, 1, ( "TraverseTurnout( T%d, [%0.3f %0.3f] [%0.3f %0.3f], A%0.3f, D%0.3f\n", GetTrkIndex(trk), trvTrk->pos.x, trvTrk->pos.y, pos0.x, pos0.y, trvTrk->angle, *distR ) )
+	LOG(log_traverseTurnout, 1,
+	    ("TraverseTurnout( T%d, [%0.3f %0.3f] [%0.3f %0.3f], A%0.3f, D%0.3f\n",
+	     GetTrkIndex(trk), trvTrk->pos.x, trvTrk->pos.y, pos0.x, pos0.y, trvTrk->angle,
+	     *distR))
 	pathCurr = 0;
-	for ( path = xx->pathCurr+strlen((char*)xx->pathCurr)+1; path[0] || path[1]; path++ ) {
-		if ( path[0] == 0 )
+	path = GetCurrPath(trk);
+	for (path += strlen((char*)path) + 1; path[0] || path[1]; path++) {
+		if (path[0] == 0) {
 			continue;
-		GetSegInxEP( path[0], &segInx, &segEP );
-		segPtr = xx->segs+segInx;
+		}
+		GetSegInxEP(path[0], &segInx, &segEP);
+		segPtr = xx->segs + segInx;
 		segProcData.distance.pos1 = pos0;
-		SegProc( SEGPROC_DISTANCE, segPtr, &segProcData );
-		if ( segProcData.distance.dd < d ) {
+		SegProc(SEGPROC_DISTANCE, segPtr, &segProcData);
+		if (segProcData.distance.dd < d) {
 			d = segProcData.distance.dd;
 			pos2 = segProcData.distance.pos1;
 			pathCurr = path;
 		}
 	}
-	if ( d > 10 || pathCurr == 0 ) {
-		ErrorMessage( "traverseTurnout: Not near: %0.3f", d );
+	if (d > 10 || pathCurr == 0) {
+		ErrorMessage("traverseTurnout: Not near: %0.3f", d);
 		return FALSE;
 	}
-LOG( log_traverseTurnout, 1, ( "  PC=%d ", pathCurr[0] ) )
-	GetSegInxEP( pathCurr[0], &segInx, &segEP );
-	segPtr = xx->segs+segInx;
+	LOG(log_traverseTurnout, 1, ("  PC=%d ", pathCurr[0]))
+	GetSegInxEP(pathCurr[0], &segInx, &segEP);
+	segPtr = xx->segs + segInx;
 	segProcData.traverse1.pos = pos2;
-	segProcData.traverse1.angle = -xx->angle+trvTrk->angle;
-	SegProc( SEGPROC_TRAVERSE1, segPtr, &segProcData );
+	segProcData.traverse1.angle = -xx->angle + trvTrk->angle;
+	SegProc(SEGPROC_TRAVERSE1, segPtr, &segProcData);
 	dist += segProcData.traverse1.dist;
 	//Get ready for Traverse2 - copy all Traverse1 first
 	BOOL_T backwards = segProcData.traverse1.backwards;
@@ -1459,113 +1410,123 @@ LOG( log_traverseTurnout, 1, ( "  PC=%d ", pathCurr[0] ) )
 	// a curve that is flipped is negative (the end points are reversed) which Traverse1 handles,
 	// and a path can also be reversed (negative path number) and will have segEP = 1
 	BOOL_T turnout_backwards = backwards;
-	if (segEP) turnout_backwards = !turnout_backwards; //direction modified if path reversed
+	if (segEP) { turnout_backwards = !turnout_backwards; } //direction modified if path reversed
 
-LOG( log_traverseTurnout, 2, ( " SI%d TB%d SP%d B%d SB%d N%d BSI%d D%0.3f\n", segInx, turnout_backwards, segEP, backwards, segs_backwards, neg, BezSegInx, dist ) )
-	while ( *pathCurr ) {
+	LOG(log_traverseTurnout, 2, (" SI%d TB%d SP%d B%d SB%d N%d BSI%d D%0.3f\n",
+	                             segInx, turnout_backwards, segEP, backwards, segs_backwards, neg, BezSegInx,
+	                             dist))
+	while (*pathCurr) {
 		//Set up Traverse2
-		GetSegInxEP( pathCurr[0], &segInx, &segEP );
-		segPtr = xx->segs+segInx;
+		GetSegInxEP(pathCurr[0], &segInx, &segEP);
+		segPtr = xx->segs + segInx;
 		segProcData.traverse2.segDir = backwards;
 		segProcData.traverse2.dist = dist;
 		segProcData.traverse2.BezSegInx = BezSegInx;
 		segProcData.traverse2.segs_backwards = segs_backwards;
-		SegProc( SEGPROC_TRAVERSE2, segPtr, &segProcData );
-		if ( segProcData.traverse2.dist <= 0 ) {
+		SegProc(SEGPROC_TRAVERSE2, segPtr, &segProcData);
+		if (segProcData.traverse2.dist <= 0) {
 			*distR = 0;
-			REORIGIN( trvTrk->pos, segProcData.traverse2.pos, xx->angle, xx->orig );
-			trvTrk->angle = NormalizeAngle( xx->angle+segProcData.traverse2.angle );
-LOG( log_traverseTurnout, 2, ( "  -> [%0.3f %0.3f] A%0.3f D%0.3f\n", trvTrk->pos.x, trvTrk->pos.y, trvTrk->angle, *distR ))
+			REORIGIN(trvTrk->pos, segProcData.traverse2.pos, xx->angle, xx->orig);
+			trvTrk->angle = NormalizeAngle(xx->angle + segProcData.traverse2.angle);
+			LOG(log_traverseTurnout, 2, ("  -> [%0.3f %0.3f] A%0.3f D%0.3f\n",
+			                             trvTrk->pos.x, trvTrk->pos.y, trvTrk->angle, *distR))
 			return TRUE;
 		}
 		dist = segProcData.traverse2.dist;			//Remainder after segment
-		pathCurr += (turnout_backwards?-1:1);		//Use master direction for turnout
+		pathCurr += (turnout_backwards ? -1 : 1);		//Use master direction for turnout
 		//Redrive Traverse 1 for each segment for Bezier - to pick up backwards elements
-		if (pathCurr[0] == '\0') continue;          //
+		if (pathCurr[0] == '\0') { continue; }          //
 		//Set up Traverse1 - copy all of Traverse2 values first
-		GetSegInxEP( pathCurr[0], &segInx, &segEP );
-		segPtr = xx->segs+segInx;
+		GetSegInxEP(pathCurr[0], &segInx, &segEP);
+		segPtr = xx->segs + segInx;
 		ANGLE_T angle = segProcData.traverse2.angle;
 		coOrd pos = segProcData.traverse2.pos;
-LOG( log_traverseTurnout, 1, ( " Loop2-1 SI%d SP%d [%0.3f %0.3f] A%0.3f D%0.3f\n", segInx, segEP, pos.x, pos.y, angle, dist ) )
+		LOG(log_traverseTurnout, 1, (" Loop2-1 SI%d SP%d [%0.3f %0.3f] A%0.3f D%0.3f\n",
+		                             segInx, segEP, pos.x, pos.y, angle, dist))
 		segProcData.traverse1.pos = pos;
 		segProcData.traverse1.angle = angle;
-		SegProc( SEGPROC_TRAVERSE1, segPtr, &segProcData );
+		SegProc(SEGPROC_TRAVERSE1, segPtr, &segProcData);
 		// dist += segProcData.traverse1.dist;	               //Add distance from end to pos (could be zero or whole length if backwards)
 		backwards = segProcData.traverse1.backwards;
 		segs_backwards = segProcData.traverse1.segs_backwards;
 		neg = segProcData.traverse1.negative;
 		BezSegInx = segProcData.traverse1.BezSegInx;
-LOG( log_traverseTurnout, 1, ( " Loop1-2 B%d SB%d N%d BSI%d D%0.3f\n", backwards, segs_backwards, neg, BezSegInx, dist ) )
+		LOG(log_traverseTurnout, 1, (" Loop1-2 B%d SB%d N%d BSI%d D%0.3f\n", backwards,
+		                             segs_backwards, neg, BezSegInx, dist))
 	}
 
-	pathCurr += (turnout_backwards?1:-1);
-	pos1 = MapPathPos( xx, pathCurr[0], (turnout_backwards?0:1) );
+	pathCurr += (turnout_backwards ? 1 : -1);
+	pos1 = MapPathPos(xx, pathCurr[0], (turnout_backwards ? 0 : 1));
 	*distR = dist;
 	epCnt = GetTrkEndPtCnt(trk);
 	ep = 0;
-	dist = FindDistance( pos1, GetTrkEndPos(trk,0) );
-	for ( ep2=1; ep2<epCnt; ep2++ ) {
-		d = FindDistance( pos1, GetTrkEndPos(trk,ep2) );
-		if ( d < dist ) {
+	dist = FindDistance(pos1, GetTrkEndPos(trk, 0));
+	for (ep2 = 1; ep2 < epCnt; ep2++) {
+		d = FindDistance(pos1, GetTrkEndPos(trk, ep2));
+		if (d < dist) {
 			dist = d;
 			ep = ep2;
 		}
 	}
-	if ( dist > connectDistance ) {
+	if (dist > connectDistance) {
 		trk = NULL;
 		trvTrk->pos = pos1;
 	} else {
-		trvTrk->pos = GetTrkEndPos( trk, ep );
-		trvTrk->angle = GetTrkEndAngle( trk, ep );
-		trk = GetTrkEndTrk( trk, ep );
+		trvTrk->pos = GetTrkEndPos(trk, ep);
+		trvTrk->angle = GetTrkEndAngle(trk, ep);
+		trk = GetTrkEndTrk(trk, ep);
 	}
-	dist = FindDistance( trvTrk->pos, pos1 );
-LOG( log_traverseTurnout, 1, ( "  -> [%0.3f %0.3f] A%0.3f D%0.3f\n", trvTrk->pos.x, trvTrk->pos.y, trvTrk->angle, *distR ) )
+	dist = FindDistance(trvTrk->pos, pos1);
+	LOG(log_traverseTurnout, 1, ("  -> [%0.3f %0.3f] A%0.3f D%0.3f\n",
+	                             trvTrk->pos.x, trvTrk->pos.y, trvTrk->angle, *distR))
 	trvTrk->trk = trk;
 	return TRUE;
 }
 
 
-static STATUS_T ModifyTurnout( track_p trk, wAction_t action, coOrd pos )
+static STATUS_T ModifyTurnout(track_p trk, wAction_t action, coOrd pos)
 {
-	struct extraData *xx;
+	struct extraDataCompound_t* xx;
 	static EPINX_T ep;
-	static wBool_t curved;
+//	static wBool_t curved;
 	DIST_T d;
 
-	xx = GetTrkExtraData(trk);
-	if ( xx->special == TOadjustable ) {
-		switch ( action ) {
+	xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t);
+	if (xx->special == TOadjustable) {
+		switch (action) {
 		case C_START:
 			ep = -1;
-			curved = FALSE;
+//			curved = FALSE;
 			return C_CONTINUE;
 		case C_DOWN:
-			ep = PickUnconnectedEndPoint( pos, trk );
-			if (ep == -1)
+			ep = PickUnconnectedEndPoint(pos, trk);
+			if (ep == -1) {
 				return C_ERROR;
-			UndrawNewTrack( trk );
+			}
+			UndrawNewTrack(trk);
+			DYNARR_SET( trkSeg_t, tempSegs_da, 1 );
 			tempSegs(0).type = SEG_STRTRK;
-			tempSegs(0).width = 0;
-			tempSegs(0).u.l.pos[0] = GetTrkEndPos( trk, 1-ep );
-			tempSegs_da.cnt = 1;
-			InfoMessage( _("Drag to change track length") );
+			tempSegs(0).lineWidth = 0;
+			tempSegs(0).u.l.pos[0] = GetTrkEndPos(trk, 1 - ep);
+			InfoMessage(_("Drag to change track length"));
 			return C_CONTINUE;
 		case C_MOVE:
-			d = FindDistance( tempSegs(0).u.l.pos[0], pos );
-			if ( d < xx->u.adjustable.minD )
+			d = FindDistance(tempSegs(0).u.l.pos[0], pos);
+			if (d < xx->u.adjustable.minD) {
 				d = xx->u.adjustable.minD;
-			else if ( d > xx->u.adjustable.maxD )
+			} else if (d > xx->u.adjustable.maxD) {
 				d = xx->u.adjustable.maxD;
-			Translate( &tempSegs(0).u.l.pos[1], tempSegs(0).u.l.pos[0], GetTrkEndAngle( trk, ep ), d );
-			tempSegs_da.cnt = 1;
-			if (action == C_MOVE)
-				InfoMessage( _("Length=%s"), FormatDistance( d ) );
+			}
+			DYNARR_SET( trkSeg_t, tempSegs_da, 1 );
+			Translate(&tempSegs(0).u.l.pos[1], tempSegs(0).u.l.pos[0], GetTrkEndAngle(trk,
+			                ep), d);
+			if (action == C_MOVE) {
+				InfoMessage(_("Length=%s"), FormatDistance(d));
+			}
 			return C_CONTINUE;
 		case C_UP:
-			d = FindDistance( tempSegs(0).u.l.pos[0],tempSegs(0).u.l.pos[1] );
-			ChangeAdjustableEndPt( trk, ep, d );
+			d = FindDistance(tempSegs(0).u.l.pos[0], tempSegs(0).u.l.pos[1]);
+			ChangeAdjustableEndPt(trk, ep, d);
 			return C_TERMINATE;
 		default:
 			return C_CONTINUE;
@@ -1576,191 +1537,185 @@ static STATUS_T ModifyTurnout( track_p trk, wAction_t action, coOrd pos )
 }
 
 
-static BOOL_T GetParamsTurnout( int inx, track_p trk, coOrd pos, trackParams_t * params )
+static BOOL_T GetParamsTurnout(int inx, track_p trk, coOrd pos,
+                               trackParams_t* params)
 {
-	struct extraData *xx;
-	xx = GetTrkExtraData(trk);
+	struct extraDataCompound_t* xx;
+	xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t);
 	params->type = curveTypeStraight;
-    if (inx == PARAMS_TURNOUT) {
-        params->len = 0.0;
-        int epCnt = GetTrkEndPtCnt(trk);
-        if (epCnt < 3) {
-            double d = 10000.0;
-            params->centroid = zero;
-            //calculate path length from endPt (either to end or to other end)
-            segProcData_t segProcData;
-            trkSeg_p seg;
-            int segInx;
-            int segEP;
-            trkSeg_p segPtr;
-            PATHPTR_T path,pathCurr;
-            //Find starting seg on path (nearest to end Pt)
-            for ( path = xx->pathCurr+strlen((char*)xx->pathCurr)+1; path[0] || path[1]; path++ ) {
-                if ( path[0] == 0 )
-                    continue;
-                GetSegInxEP( path[0], &segInx, &segEP );
-                segPtr = xx->segs+segInx;
-                segProcData.distance.pos1 = pos;
-                SegProc( SEGPROC_DISTANCE, segPtr, &segProcData );
-                if ( segProcData.distance.dd < d ) {
-                    d = segProcData.distance.dd;
-                    pathCurr = path;
-                }
-            }
-            GetSegInxEP( pathCurr[0], &segInx, &segEP );
-            seg = xx->segs+segInx;
-            d = 0.0;
-            //Loop through segs on path from endPt adding
-            while (pathCurr[0]) {
-                GetSegInxEP( pathCurr[0], &segInx, &segEP );
-                seg = xx->segs+segInx;
-                SegProc(SEGPROC_LENGTH, seg, &segProcData );
-                d += segProcData.length.length;
-                pathCurr += segEP?1:-1;
-            }
-            params->len = d;
-        } else {
-            double x, y;
-            x = 0; y = 0;
-            for (int i=0;i<epCnt; i++) {
-                coOrd cpos = GetTrkEndPos(trk,i);
-                x += cpos.x;
-                y += cpos.y;
-            }
-            params->centroid.x = x/epCnt;
-            params->centroid.y = y/epCnt;
-            params->len = FindDistance(params->centroid,pos)*2;  //Times two because it will be halved by track.c
-        }
-        return TRUE;
-    }
-	if ((inx == PARAMS_CORNU)  || (inx == PARAMS_EXTEND)) {
+	if (inx == PARAMS_TURNOUT) {
+		params->len = 0.0;
+		int epCnt = GetTrkEndPtCnt(trk);
+		if (epCnt < 3) {
+			double d = DIST_INF;
+			params->centroid = zero;
+			//calculate path length from endPt (either to end or to other end)
+			segProcData_t segProcData;
+			trkSeg_p seg;
+			int segInx;
+			int segEP;
+			trkSeg_p segPtr;
+			PATHPTR_T path, pathCurr;
+			//Find starting seg on path (nearest to end Pt)
+			path = GetCurrPath(trk);
+			pathCurr = path;
+			for (path += strlen((char*)path) + 1; path[0] || path[1]; path++) {
+				if (path[0] == 0) {
+					continue;
+				}
+				GetSegInxEP(path[0], &segInx, &segEP);
+				segPtr = xx->segs + segInx;
+				segProcData.distance.pos1 = pos;
+				SegProc(SEGPROC_DISTANCE, segPtr, &segProcData);
+				if (segProcData.distance.dd < d) {
+					d = segProcData.distance.dd;
+					pathCurr = path;
+				}
+			}
+			GetSegInxEP(pathCurr[0], &segInx, &segEP);
+			seg = xx->segs + segInx;
+			d = 0.0;
+			//Loop through segs on path from endPt adding
+			while (pathCurr[0]) {
+				GetSegInxEP(pathCurr[0], &segInx, &segEP);
+				seg = xx->segs + segInx;
+				SegProc(SEGPROC_LENGTH, seg, &segProcData);
+				d += segProcData.length.length;
+				pathCurr += segEP ? 1 : -1;
+			}
+			params->len = d;
+		} else {
+			// Centroid is middle of bounding box
+			coOrd lo, hi;
+			GetBoundingBox( trk, &hi, &lo );
+			params->centroid.x = (lo.x + hi.x) / 2.0;
+			params->centroid.y = (lo.y + hi.y) / 2.0;
+			params->len = FindDistance(params->centroid,
+			                           pos) * 2;  //Times two because it will be halved by track.c
+		}
+		return TRUE;
+	}
+	if ((inx == PARAMS_CORNU) || (inx == PARAMS_EXTEND)) {
 		params->type = curveTypeStraight;
 		params->arcR = 0.0;
 		params->arcP = zero;
-	    params->ep = PickEndPoint(pos, trk);
+		params->ep = PickEndPoint(pos, trk);
 		params->circleOrHelix = FALSE;
-		if (params->ep>=0) {
-			params->angle = GetTrkEndAngle(trk,params->ep);
-			params->track_angle = params->angle + params->ep?0:180;
+		if (params->ep >= 0) {
+			params->angle = GetTrkEndAngle(trk, params->ep);
+			params->track_angle = params->angle + params->ep ? 0 : 180;
 		} else {
-			params->angle = params-> track_angle = 0;
+			params->angle = params->track_angle = 0;
 			return FALSE;
 		}
-		/* Use end radii if we have them */
-		//if (xx->special == TOcurved) {
-		//	params->type = curveTypeCurve;
-		//	params->arcR = fabs(DYNARR_N(DIST_T,xx->u.curved.radii,params->ep));
-		//	if (params->arcR != 0.0)
-		//		Translate(&params->arcP,pos,params->track_angle-90.0,params->arcR);
-		//	else
-		//		params->type = curveTypeStraight;
-		//	return TRUE;
-		//}
 		/* Find the path we are closest to */
-		PATHPTR_T pathCurr = 0;
+//		PATHPTR_T pathCurr = 0;
 		int segInx, subSegInx;
 		trkSeg_p segPtr;
-		double d = 10000;
-		struct extraData * xx = GetTrkExtraData(trk);
+		DIST_T d = DIST_INF;
+		struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT,
+		                                 extraDataCompound_t);
 		/* Get parms from that seg */
-		wBool_t back,negative;
+		wBool_t back, negative;
 		coOrd segPos = pos;
-		Rotate(&segPos,xx->orig,-xx->angle);
+		Rotate(&segPos, xx->orig, -xx->angle);
 		segPos.x -= xx->orig.x;
 		segPos.y -= xx->orig.y;
 
 		params->track_angle = GetAngleSegs(		  		//Find correct subSegment
-							xx->segCnt,xx->segs,
-							&segPos, &segInx, &d , &back, &subSegInx, &negative );
-		if (segInx ==- 1) return FALSE;
-		segPtr = xx->segs+segInx;
+		                              xx->segCnt, xx->segs,
+		                              &segPos, &segInx, &d, &back, &subSegInx, &negative);
+		if (segInx == -1) { return FALSE; }
+		segPtr = xx->segs + segInx;
 		switch (segPtr->type) {
-			case SEG_BEZTRK:
-				if ( negative != back ) params->track_angle = NormalizeAngle(params->track_angle+180);  //Bezier is in reverse
-				segPtr = xx->segs + segInx;
-				trkSeg_p subSegPtr = (trkSeg_p)segPtr->bezSegs.ptr+subSegInx;
-				if (subSegPtr->type == SEG_CRVTRK) {
-					params->type = curveTypeCurve;
-					params->arcR = fabs(subSegPtr->u.c.radius);
-					params->arcP = subSegPtr->u.c.center;
-					params->arcP.x += xx->orig.x;
-					params->arcP.y += xx->orig.y;
-					Rotate(&params->arcP,xx->orig,xx->angle);
-					params->arcA0 = subSegPtr->u.c.a0;
-					params->arcA1 = subSegPtr->u.c.a1;
-				}
-				return TRUE;
-				break;
-			case SEG_CRVTRK:
+		case SEG_BEZTRK:
+			if (negative != back) { params->track_angle = NormalizeAngle(params->track_angle + 180); }  //Bezier is in reverse
+			segPtr = xx->segs + segInx;
+			trkSeg_p subSegPtr = &DYNARR_N(trkSeg_t,segPtr->bezSegs,subSegInx);
+			if (subSegPtr->type == SEG_CRVTRK) {
 				params->type = curveTypeCurve;
-				params->arcR = fabs(segPtr->u.c.radius);
-				params->arcP = segPtr->u.c.center;
+				params->arcR = fabs(subSegPtr->u.c.radius);
+				params->arcP = subSegPtr->u.c.center;
 				params->arcP.x += xx->orig.x;
 				params->arcP.y += xx->orig.y;
-				Rotate(&params->arcP,xx->orig,xx->angle);
-				params->arcA0 = segPtr->u.c.a0;
-				params->arcA1 = segPtr->u.c.a1;
-				return TRUE;
-				break;
-        }
-        params->arcR = 0.0;
+				Rotate(&params->arcP, xx->orig, xx->angle);
+				params->arcA0 = subSegPtr->u.c.a0;
+				params->arcA1 = subSegPtr->u.c.a1;
+			}
+			return TRUE;
+			break;
+		case SEG_CRVTRK:
+			params->type = curveTypeCurve;
+			params->arcR = fabs(segPtr->u.c.radius);
+			params->arcP = segPtr->u.c.center;
+			params->arcP.x += xx->orig.x;
+			params->arcP.y += xx->orig.y;
+			Rotate(&params->arcP, xx->orig, xx->angle);
+			params->arcA0 = segPtr->u.c.a0;
+			params->arcA1 = segPtr->u.c.a1;
+			return TRUE;
+			break;
+		}
+		params->arcR = 0.0;
 		params->arcP = zero;
-		params->ep = PickEndPoint(pos,trk);   //Nearest
-		if (params->ep>=0) {
-			params->angle = GetTrkEndAngle(trk,params->ep);
-		    params->track_angle = params->angle + params->ep?0:180;
+		params->ep = PickEndPoint(pos, trk);   //Nearest
+		if (params->ep >= 0) {
+			params->angle = GetTrkEndAngle(trk, params->ep);
+			params->track_angle = params->angle + params->ep ? 0 : 180;
 		} else {
-			params->angle = params-> track_angle = 0;
+			params->angle = params->track_angle = 0;
 			return FALSE;
 		}
 		return TRUE;
 	}
-	if ((inx == PARAMS_1ST_JOIN) || (inx == PARAMS_2ND_JOIN))
+	if ((inx == PARAMS_1ST_JOIN) || (inx == PARAMS_2ND_JOIN)) {
 		params->ep = PickEndPoint(pos, trk);
-	else
-		params->ep = PickUnconnectedEndPointSilent( pos, trk );
-	if (params->ep == -1)
-				 return FALSE;
-	params->lineOrig = GetTrkEndPos(trk,params->ep);
+	} else {
+		params->ep = PickUnconnectedEndPointSilent(pos, trk);
+	}
+	if (params->ep == -1) {
+		return FALSE;
+	}
+	params->lineOrig = GetTrkEndPos(trk, params->ep);
 	params->lineEnd = params->lineOrig;
 	params->len = 0.0;
-	params->angle = GetTrkEndAngle(trk,params->ep);
+	params->angle = GetTrkEndAngle(trk, params->ep);
 	params->arcR = 0.0;
 	return TRUE;
 }
 
 
-static BOOL_T MoveEndPtTurnout( track_p *trk, EPINX_T *ep, coOrd pos, DIST_T d0 )
+static BOOL_T MoveEndPtTurnout(track_p* trk, EPINX_T* ep, coOrd pos, DIST_T d0)
 {
 	ANGLE_T angle0;
 	DIST_T d;
 	track_p trk1;
 
-	angle0 = GetTrkEndAngle(*trk,*ep);
-	d = FindDistance( GetTrkEndPos(*trk,*ep), pos);
+	angle0 = GetTrkEndAngle(*trk, *ep);
+	d = FindDistance(GetTrkEndPos(*trk, *ep), pos);
 	if (d0 > 0.0) {
 		d -= d0;
 		if (d < 0.0) {
-			ErrorMessage( MSG_MOVED_BEFORE_END_TURNOUT );
+			ErrorMessage(MSG_MOVED_BEFORE_END_TURNOUT);
 			return FALSE;
 		}
-		Translate( &pos, pos, angle0+180, d0 );
+		Translate(&pos, pos, angle0 + 180, d0);
 	}
 	if (d > minLength) {
-		trk1 = NewStraightTrack( GetTrkEndPos(*trk,*ep), pos );
-		CopyAttributes( *trk, trk1 );
-		ConnectTracks( *trk, *ep, trk1, 0 );
+		trk1 = NewStraightTrack(GetTrkEndPos(*trk, *ep), pos);
+		CopyAttributes(*trk, trk1);
+		ConnectTracks(*trk, *ep, trk1, 0);
 		*trk = trk1;
 		*ep = 1;
-		DrawNewTrack( *trk );
+		DrawNewTrack(*trk);
 	}
 	return TRUE;
 }
 
 
-static BOOL_T QueryTurnout( track_p trk, int query )
+static BOOL_T QueryTurnout(track_p trk, int query)
 {
-	switch ( query ) {
+	switch (query) {
 	case Q_IGNORE_EASEMENT_ON_EXTEND:
 	case Q_DRAWENDPTV_1:
 	case Q_CAN_GROUP:
@@ -1774,12 +1729,17 @@ static BOOL_T QueryTurnout( track_p trk, int query )
 	case Q_IS_TURNOUT:
 		return TRUE;
 	case Q_CAN_PARALLEL:
-		if( GetTrkEndPtCnt( trk ) == 2 && fabs( GetTrkEndAngle( trk, 0 ) - GetTrkEndAngle( trk, 1 )) == 180.0 )
+		if (GetTrkEndPtCnt(trk) == 2
+		    && fabs(GetTrkEndAngle(trk, 0) - GetTrkEndAngle(trk, 1)) == 180.0) {
 			return TRUE;
-		else
+		} else {
 			return FALSE;
-	case Q_CAN_NEXT_POSITION:
-		return ( GetTrkEndPtCnt(trk) > 2 );
+		}
+	case Q_CAN_NEXT_POSITION: {
+		PATHPTR_T path = GetPaths( trk ); // QueryTurnout
+		for ( path += strlen((char*)path) + 1; path[0] || path[1]; path++ );
+		return ( path[2] != 0 );
+	}
 	case Q_CORNU_CAN_MODIFY:
 		return FALSE;
 	default:
@@ -1788,73 +1748,93 @@ static BOOL_T QueryTurnout( track_p trk, int query )
 }
 
 
-EXPORT int doDrawTurnoutPosition = 1;
-static wIndex_t drawTurnoutPositionWidth=3;
+static wIndex_t drawTurnoutPositionWidth = 3;
 static void DrawTurnoutPositionIndicator(
-		track_p trk,
-		wDrawColor color )
+        track_p trk,
+        wDrawColor color)
 {
-	struct extraData * xx = GetTrkExtraData(trk);
-	PATHPTR_T path = xx->pathCurr;
-	coOrd pos0, pos1;
+	struct extraDataCompound_t* xx = GET_EXTRA_DATA(trk, T_TURNOUT,
+	                                 extraDataCompound_t);
+	PATHPTR_T path, path1;
+	coOrd pos0 = zero, pos1;
+	trkSeg_p seg;
+	BOOL_T multiPart = FALSE;
 
-	if ( xx->pathCurr == xx->paths ) {
-		for ( path=xx->pathCurr+strlen((char *)xx->pathCurr); path[0] || path[1]; path++ );
-		if ( path[2] == 0 )
-			return;
+	// Only 1 path?  Don't draw
+	if ( ! QueryTurnout( trk, Q_CAN_NEXT_POSITION ) ) {
+		return;
 	}
-	for ( path=xx->pathCurr+strlen((char *)xx->pathCurr); path[0] || path[1]; path++ ) {
-		if ( path[0] == 0 ) {
-			pos0 = MapPathPos( xx, path[1], 0 );
-		} else if ( path[1] == 0 ) {
-			pos1 = MapPathPos( xx, path[0], 1 );
-			DrawLine( &tempD, pos0, pos1, drawTurnoutPositionWidth, color );
+
+	path = GetCurrPath(trk);
+
+	//Is this a multi-part path?
+	path1 = path;
+	for (path1 += strlen((char*)path1) + 1; path1[0]; path1++);
+	if (path1[1] != 0) { multiPart = TRUE; }
+
+
+	for (path += strlen((char*)path); path[0] || path[1]; path++) {
+
+		if (path[0] == 0) {
+			pos0 = MapPathPos(xx, path[1], 0);
+			if ((tempD.scale <= 10) || !multiPart) {
+				seg = MapPathSeg(xx, path[1]);
+				DrawSegsO(&tempD, trk, xx->orig, xx->angle, seg, 1, GetTrkGauge(trk), color,
+				          DTS_CENTERONLY);
+			}
+		} else if (path[1] == 0) {
+			pos1 = MapPathPos(xx, path[0], 1);
+			if ((tempD.scale > 10) && multiPart) {
+				DrawLine(&tempD, pos0, pos1, drawTurnoutPositionWidth, color);
+			} else {
+				seg = MapPathSeg(xx, path[0]);
+				DrawSegsO(&tempD, trk, xx->orig, xx->angle, seg, 1, GetTrkGauge(trk), color,
+				          DTS_CENTERONLY);
+			}
+		} else if ((tempD.scale <= 10) || !multiPart) {
+			seg = MapPathSeg(xx, path[0]);
+			DrawSegsO(&tempD, trk, xx->orig, xx->angle, seg, 1, GetTrkGauge(trk), color,
+			          DTS_CENTERONLY);
 		}
 	}
 }
 
 
 EXPORT void AdvanceTurnoutPositionIndicator(
-		track_p trk,
-		coOrd pos,
-		coOrd *posR,
-		ANGLE_T *angleR )
+        track_p trk,
+        coOrd pos,
+        coOrd* posR,
+        ANGLE_T* angleR)
 {
-	struct extraData * xx = GetTrkExtraData(trk);
-	PATHPTR_T path;
 	traverseTrack_t trvtrk;
 	DIST_T dist;
 
-	if ( GetTrkType(trk) != T_TURNOUT )
-		AbortProg( "nextTurnoutPosition" );
-
-	path = xx->pathCurr;
-	path += strlen((char *)path)+1;
-	while ( path[0] || path[1] )
-		path++;
-	path += 2;
-	if ( *path == 0 )
-		path = xx->paths;
-	xx->pathCurr = path;
-	if ( angleR == NULL || posR == NULL )
+	CHECK( GetTrkType(trk) == T_TURNOUT );
+
+	SetCurrPathIndex(trk, GetCurrPathIndex(trk) + 1);
+	InfoMessage(_("Turnout %d Path: %s"), GetTrkIndex(trk), GetCurrPath(trk));
+	if (angleR == NULL || posR == NULL) {
 		return;
+	}
 	trvtrk.trk = trk;
 	trvtrk.length = 0;
 	trvtrk.dist = 0;
 	trvtrk.pos = *posR;
 	trvtrk.angle = *angleR;
 	dist = 0;
-	if ( !TraverseTurnout( &trvtrk, &dist ) )
+	if (!TraverseTurnout(&trvtrk, &dist)) {
 		return;
-	if ( NormalizeAngle( trvtrk.angle-*angleR+90.0 ) > 180 )
-		trvtrk.angle = NormalizeAngle( trvtrk.angle+180.0 );
+	}
+	if (NormalizeAngle(trvtrk.angle - *angleR + 90.0) > 180) {
+		trvtrk.angle = NormalizeAngle(trvtrk.angle + 180.0);
+	}
 	*posR = trvtrk.pos;
 	*angleR = trvtrk.angle;
 }
 
 /**
  * Create a parallel track for a turnout.
- * 
+ *
  *
  * \param trk IN existing track
  * \param pos IN ??
@@ -1866,60 +1846,56 @@ EXPORT void AdvanceTurnoutPositionIndicator(
  */
 
 static BOOL_T MakeParallelTurnout(
-		track_p trk,
-		coOrd pos,
-		DIST_T sep,
-		DIST_T factor,
-		track_p * newTrk,
-		coOrd * p0R,
-		coOrd * p1R,
-		BOOL_T track)
+        track_p trk,
+        coOrd pos,
+        DIST_T sep,
+        DIST_T factor,
+        track_p* newTrk,
+        coOrd* p0R,
+        coOrd* p1R,
+        BOOL_T track)
 {
-	ANGLE_T angle = GetTrkEndAngle(trk,1);
-	struct extraData *xx, *yy;
-	coOrd *endPts;
-	trkEndPt_p endPt;
+	ANGLE_T angle = GetTrkEndAngle(trk, 1);
+	struct extraDataCompound_t* xx, * yy;
+	coOrd* endPts;
 	int i;
 	int option;
 	DIST_T d;
 
-	if ( NormalizeAngle( FindAngle( GetTrkEndPos(trk,0), pos ) - GetTrkEndAngle(trk,1) ) < 180.0 )
+	if (NormalizeAngle(FindAngle(GetTrkEndPos(trk, 0), pos) - GetTrkEndAngle(trk,
+	                   1)) < 180.0) {
 		angle += 90;
-	else
-		angle -= 90; 
+	} else {
+		angle -= 90;
+	}
 
 	/*
 	 * get all endpoints of current piece and translate them for the new piece
 	 */
-	endPts = MyMalloc( GetTrkEndPtCnt( trk ) * sizeof( coOrd ));
-	for( i = 0; i < GetTrkEndPtCnt( trk ); i++) {
-		Translate( &(endPts[ i ]), GetTrkEndPos( trk, i ), angle, sep );
+	endPts = MyMalloc(GetTrkEndPtCnt(trk) * sizeof(coOrd));
+	for (i = 0; i < GetTrkEndPtCnt(trk); i++) {
+		Translate(&(endPts[i]), GetTrkEndPos(trk, i), angle, sep);
 	}
 
 	/*
-	 * get information about the current piece and copy data 
+	 * get information about the current piece and copy data
 	 */
 
-	if( newTrk ) {
+	if (newTrk) {
 		if (track) {
-			endPt = MyMalloc( GetTrkEndPtCnt( trk ) * sizeof( trkEndPt_t ));
-			endPt[ 0 ].pos = endPts[ 0 ];
-			endPt[ 0 ].angle = GetTrkEndAngle( trk, 0 );
-			endPt[ 1 ].pos = endPts[ 1 ];
-			endPt[ 1 ].angle = GetTrkEndAngle( trk, 1 );
-
-			yy = GetTrkExtraData(trk);
-
-			DIST_T * radii = NULL;
-			if (yy->special == TOcurved) {
-				radii = MyMalloc(GetTrkEndPtCnt(trk) * sizeof(DIST_T));
-				for (int i=0;i<GetTrkEndPtCnt( trk );i++) {
-					radii[i] = DYNARR_N(DIST_T,yy->u.curved.radii,i);
-				}
-			}
+			TempEndPtsSet(2);
+			SetEndPt( TempEndPt(0), endPts[0], GetTrkEndAngle(trk,0));
+			SetEndPt( TempEndPt(1), endPts[1], GetTrkEndAngle(trk,1));
+
+			yy = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t);
+
 
-			*newTrk = NewCompound( T_TURNOUT, 0, endPt[ 0 ].pos, endPt[ 0 ].angle + 90.0, yy->title, 2, endPt, radii, yy->pathLen, (char *)yy->paths, yy->segCnt, yy->segs );
-			xx = GetTrkExtraData(*newTrk);
+			PATHPTR_T paths = GetPaths(trk); // MakeParallelTurnout
+			*newTrk = NewCompound(T_TURNOUT, 0,
+			                      GetEndPtPos(TempEndPt(0)), GetEndPtAngle(TempEndPt(0)) + 90.0,
+			                      yy->title, 2, TempEndPt(0), paths,
+			                      yy->segCnt, yy->segs);
+			xx = GET_EXTRA_DATA(*newTrk, T_TURNOUT, extraDataCompound_t);
 			xx->customInfo = yy->customInfo;
 
 			/*	if (connection((int)curTurnoutEp).trk) {
@@ -1927,102 +1903,105 @@ static BOOL_T MakeParallelTurnout(
 				SetTrkScale( newTrk, curScaleInx );
 			} */
 			xx->special = yy->special;
+			xx->pathOverRide = yy->pathOverRide;
+			xx->pathNoCombine = yy->pathNoCombine;
 
 			xx->u = yy->u;
 
-			SetDescriptionOrig( *newTrk );
+			SetDescriptionOrig(*newTrk);
 			xx->descriptionOff = zero;
 			xx->descriptionSize = zero;
 
 			SetTrkElev(*newTrk, GetTrkElevMode(trk), GetTrkElev(trk));
-			GetTrkEndElev( trk, 0, &option, &d );
-			SetTrkEndElev( *newTrk, 0, option, d, NULL );
-			GetTrkEndElev( trk, 1, &option, &d );
-			SetTrkEndElev( *newTrk, 1, option, d, NULL );
-
-			MyFree( endPt );
+			GetTrkEndElev(trk, 0, &option, &d);
+			SetTrkEndElev(*newTrk, 0, option, d, NULL);
+			GetTrkEndElev(trk, 1, &option, &d);
+			SetTrkEndElev(*newTrk, 1, option, d, NULL);
 		} else {
+			DYNARR_SET( trkSeg_t, tempSegs_da, 1 );
 			tempSegs(0).color = wDrawColorBlack;
-			tempSegs(0).width = 0;
-			tempSegs_da.cnt = 1;
-			tempSegs(0).type = track?SEG_STRTRK:SEG_STRLIN;
-			tempSegs(0).u.l.pos[0] = endPts[ 0 ];
-			tempSegs(0).u.l.pos[1] = endPts[ 1 ];
-			*newTrk = MakeDrawFromSeg( zero, 0.0, &tempSegs(0) );
-		}
-	} else { 
+			tempSegs(0).lineWidth = 0;
+			tempSegs(0).type = track ? SEG_STRTRK : SEG_STRLIN;
+			tempSegs(0).u.l.pos[0] = endPts[0];
+			tempSegs(0).u.l.pos[1] = endPts[1];
+			*newTrk = MakeDrawFromSeg(zero, 0.0, &tempSegs(0));
+		}
+	} else {
 		/* draw some temporary track while command is in process */
+		DYNARR_SET( trkSeg_t, tempSegs_da, 1 );
 		tempSegs(0).color = wDrawColorBlack;
-		tempSegs(0).width = 0;
-		tempSegs_da.cnt = 1;
-		tempSegs(0).type = track?SEG_STRTRK:SEG_STRLIN;
-		tempSegs(0).u.l.pos[0] = endPts[ 0 ];
-		tempSegs(0).u.l.pos[1] = endPts[ 1 ];
+		tempSegs(0).lineWidth = 0;
+		tempSegs(0).type = track ? SEG_STRTRK : SEG_STRLIN;
+		tempSegs(0).u.l.pos[0] = endPts[0];
+		tempSegs(0).u.l.pos[1] = endPts[1];
 	}
 
-	if ( p0R ) *p0R = endPts[ 0 ];
-	if ( p1R ) *p1R = endPts[ 1 ];
+	if (p0R) { *p0R = endPts[0]; }
+	if (p1R) { *p1R = endPts[1]; }
 
-	MyFree( endPts );
+	MyFree(endPts);
 	return TRUE;
 }
 
-static wBool_t CompareTurnout( track_cp trk1, track_cp trk2 )
+static wBool_t CompareTurnout(track_cp trk1, track_cp trk2)
 {
-	struct extraData *xx1 = GetTrkExtraData( trk1 );
-	struct extraData *xx2 = GetTrkExtraData( trk2 );
-	char * cp = message + strlen(message);
-	REGRESS_CHECK_POS( "Orig", xx1, xx2, orig )
-	REGRESS_CHECK_ANGLE( "Angle", xx1, xx2, angle )
-	REGRESS_CHECK_INT( "Handlaid", xx1, xx2, handlaid )
-	REGRESS_CHECK_INT( "Flipped", xx1, xx2, flipped )
-	REGRESS_CHECK_INT( "Ungrouped", xx1, xx2, ungrouped )
-	REGRESS_CHECK_INT( "Split", xx1, xx2, split )
+	struct extraDataCompound_t* xx1 = GET_EXTRA_DATA(trk1, T_TURNOUT,
+	                                  extraDataCompound_t);
+	struct extraDataCompound_t* xx2 = GET_EXTRA_DATA(trk2, T_TURNOUT,
+	                                  extraDataCompound_t);
+	char* cp = message + strlen(message);
+	REGRESS_CHECK_POS("Orig", xx1, xx2, orig)
+	REGRESS_CHECK_ANGLE("Angle", xx1, xx2, angle)
+	REGRESS_CHECK_INT("Handlaid", xx1, xx2, handlaid)
+	REGRESS_CHECK_INT("Flipped", xx1, xx2, flipped)
+	REGRESS_CHECK_INT("Ungrouped", xx1, xx2, ungrouped)
+	REGRESS_CHECK_INT("Split", xx1, xx2, split)
 	/* desc orig is not stable
 	REGRESS_CHECK_POS( "DescOrig", xx1, xx2, descriptionOrig ) */
-	REGRESS_CHECK_POS( "DescOff", xx1, xx2, descriptionOff )
-	REGRESS_CHECK_POS( "DescSize", xx1, xx2, descriptionSize )
-	return CompareSegs( xx1->segs, xx1->segCnt, xx1->segs, xx1->segCnt );
+	REGRESS_CHECK_POS("DescOff", xx1, xx2, descriptionOff)
+	REGRESS_CHECK_POS("DescSize", xx1, xx2, descriptionSize)
+	return CompareSegs(xx1->segs, xx1->segCnt, xx1->segs, xx1->segCnt);
 }
 
 static trackCmd_t turnoutCmds = {
-		"TURNOUT ",
-		DrawTurnout,
-		DistanceCompound,
-		DescribeCompound,
-		DeleteCompound,
-		WriteCompound,
-		ReadTurnout,
-		MoveCompound,
-		RotateCompound,
-		RescaleCompound,
-		NULL,
-		GetAngleTurnout,
-		SplitTurnout,
-		TraverseTurnout,
-		EnumerateCompound,
-		NULL, /*redraw*/
-		NULL, /*trim*/
-		NULL, /*merge*/
-		ModifyTurnout,
-		NULL, /* getLength */
-		GetParamsTurnout,
-		MoveEndPtTurnout,
-		QueryTurnout,
-		UngroupCompound,
-		FlipCompound,
-		DrawTurnoutPositionIndicator,
-		AdvanceTurnoutPositionIndicator,
-		CheckTraverseTurnout,
-		MakeParallelTurnout,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		CompareTurnout };
-
-
+	"TURNOUT ",
+	DrawTurnout,
+	DistanceCompound,
+	DescribeCompound,
+	DeleteCompound,
+	WriteCompound,
+	ReadTurnout,
+	MoveCompound,
+	RotateCompound,
+	RescaleCompound,
+	NULL,
+	GetAngleTurnout,
+	SplitTurnout,
+	TraverseTurnout,
+	EnumerateCompound,
+	NULL, /*redraw*/
+	NULL, /*trim*/
+	NULL, /*merge*/
+	ModifyTurnout,
+	NULL, /* getLength */
+	GetParamsTurnout,
+	MoveEndPtTurnout,
+	QueryTurnout,
+	UngroupCompound,
+	FlipCompound,
+	DrawTurnoutPositionIndicator,
+	AdvanceTurnoutPositionIndicator,
+	CheckTraverseTurnout,
+	MakeParallelTurnout,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	CompareTurnout
+};
+
+
 #ifdef TURNOUTCMD
 /*****************************************
  *
@@ -2032,84 +2011,94 @@ static trackCmd_t turnoutCmds = {
 
 static coOrd maxTurnoutDim;
 
-static void AddTurnout( void );
+static void AddTurnout(void);
 
 
 static wWin_p turnoutW;
 
 
-static void RescaleTurnout( void )
+static void RescaleTurnout(void)
 {
 	DIST_T xscale, yscale;
-	wPos_t ww, hh;
+	wWinPix_t ww, hh;
 	DIST_T w, h;
-	wDrawGetSize( turnoutD.d, &ww, &hh );
-	w = ww/turnoutD.dpi;
-	h = hh/turnoutD.dpi;
-	xscale = maxTurnoutDim.x/w;
-	yscale = maxTurnoutDim.y/h;
-	turnoutD.scale = max(xscale,yscale);
-	if (turnoutD.scale == 0.0)
+	if ( curTurnout == NULL ) {
+		return;
+	}
+	wDrawGetSize(turnoutD.d, &ww, &hh);
+	w = ww / turnoutD.dpi;
+	h = hh / turnoutD.dpi;
+	xscale = (curTurnout->size.x + trackGauge*2) / w;
+	yscale = (curTurnout->size.y + trackGauge*2) / h;
+	turnoutD.scale = max(xscale, yscale);
+	if (turnoutD.scale == 0.0) {
 		turnoutD.scale = 1.0;
-	turnoutD.size.x = w*turnoutD.scale;
-	turnoutD.size.y = h*turnoutD.scale;
+	}
+	turnoutD.size.x = w * turnoutD.scale;
+	turnoutD.size.y = h * turnoutD.scale;
 	return;
 }
 
 
-static void TurnoutChange( long changes )
+static void TurnoutChange(long changes)
 {
-	static char * lastScaleName = NULL;
-	if (turnoutW == NULL)
+	static char* lastScaleName = NULL;
+	if (turnoutW == NULL) {
 		return;
-	wListSetIndex( turnoutListL, 0 );
-	if ( (!wWinIsVisible(turnoutW)) ||
-	   ( ((changes&CHANGE_SCALE) == 0 || lastScaleName == curScaleName) &&
-		  (changes&CHANGE_PARAMS) == 0 ) )
+	}
+	wListSetIndex(turnoutListL, 0);
+	if ((!wWinIsVisible(turnoutW)) ||
+	    (((changes & CHANGE_SCALE) == 0 || lastScaleName == curScaleName) &&
+	     (changes & CHANGE_PARAMS) == 0)) {
 		return;
+	}
 	lastScaleName = curScaleName;
 	//curTurnout = NULL;
 	curTurnoutEp = 0;
-	wControlShow( (wControl_p)turnoutListL, FALSE );
-	wListClear( turnoutListL );
+	wControlShow((wControl_p)turnoutListL, FALSE);
+	wListClear(turnoutListL);
 	maxTurnoutDim.x = maxTurnoutDim.y = 0.0;
-	if (turnoutInfo_da.cnt <= 0)
+	if (turnoutInfo_da.cnt <= 0) {
 		return;
-	curTurnout = TurnoutAdd( LABEL_TABBED|LABEL_MANUF|LABEL_PARTNO|LABEL_DESCR, GetLayoutCurScale(), turnoutListL, &maxTurnoutDim, -1 );
-	wListSetIndex( turnoutListL, turnoutInx );
-	wControlShow( (wControl_p)turnoutListL, TRUE );
+	}
+	curTurnout = TurnoutAdd(LABEL_TABBED | LABEL_MANUF | LABEL_PARTNO | LABEL_DESCR,
+	                        GetLayoutCurScale(), turnoutListL, &maxTurnoutDim, -1);
+	wListSetIndex(turnoutListL, turnoutInx);
+	wControlShow((wControl_p)turnoutListL, TRUE);
 	if (curTurnout == NULL) {
-		wDrawClear( turnoutD.d );
+		wDrawClear(turnoutD.d);
 		return;
 	}
 	turnoutD.orig.x = -trackGauge;
 	turnoutD.orig.y = -trackGauge;
-	maxTurnoutDim.x += 2*trackGauge;
-	maxTurnoutDim.y += 2*trackGauge;
+	maxTurnoutDim.x += 2 * trackGauge;
+	maxTurnoutDim.y += 2 * trackGauge;
 	/*RescaleTurnout();*/
-	RedrawTurnout();
+	RedrawTurnout( turnoutD.d, NULL, 0, 0 );
 	return;
 }
 
-static void RedrawTurnout()
+static void RedrawTurnout( wDraw_p d, void * context, wWinPix_t x, wWinPix_t y )
 {
 	RescaleTurnout();
-LOG( log_turnout, 2, ( "SelTurnout(%s)\n", (curTurnout?curTurnout->title:"<NULL>") ) )
+	LOG(log_turnout, 2, ("SelTurnout(%s)\n",
+	                     (curTurnout ? curTurnout->title : "<NULL>")))
 
-	wDrawClear( turnoutD.d );
+	wDrawClear(turnoutD.d);
 	if (curTurnout == NULL) {
 		return;
 	}
 	turnoutD.orig.x = curTurnout->orig.x - trackGauge;
-	turnoutD.orig.y = (curTurnout->size.y + curTurnout->orig.y) - turnoutD.size.y + trackGauge;
-	DrawSegs( &turnoutD, zero, 0.0, curTurnout->segs, curTurnout->segCnt,
-					 trackGauge, wDrawColorBlack );
+	turnoutD.orig.y = (curTurnout->size.y + curTurnout->orig.y) - turnoutD.size.y +
+	                  trackGauge;
+	DrawSegs(&turnoutD, zero, 0.0, curTurnout->segs, curTurnout->segCnt,
+	         trackGauge, wDrawColorBlack);
 	curTurnoutEp = 0;
 	HilightEndPt();
 }
 
 
-static void TurnoutOk( void )
+static void TurnoutOk(void)
 {
 	AddTurnout();
 	Reset();
@@ -2117,33 +2106,35 @@ static void TurnoutOk( void )
 
 
 static void TurnoutDlgUpdate(
-		paramGroup_p pg,
-		int inx,
-		void * valueP )
+        paramGroup_p pg,
+        int inx,
+        void* valueP)
 {
-	turnoutInfo_t * to;
-	if ( inx != I_LIST ) return;
-	to = (turnoutInfo_t*)wListGetItemContext( (wList_p)pg->paramPtr[inx].control, (wIndex_t)*(long*)valueP );
+	turnoutInfo_t* to;
+	if (inx != I_LIST) { return; }
+	to = (turnoutInfo_t*)wListGetItemContext((wList_p)pg->paramPtr[inx].control,
+	                (wIndex_t) * (long*)valueP);
 	AddTurnout();
 	curTurnout = to;
-	RedrawTurnout();
-/*	ParamDialogOkActive( &turnoutPG, FALSE ); */
+	RedrawTurnout( turnoutD.d, NULL, 0, 0 );
+	/*	ParamDialogOkActive( &turnoutPG, FALSE ); */
 }
 
 
 static wIndex_t TOpickEndPoint(
-		coOrd p,
-		turnoutInfo_t *to )
+        coOrd p,
+        turnoutInfo_t* to)
 {
 	wIndex_t inx, i;
 	DIST_T d, dd;
 	coOrd posI;
 
-	d = FindDistance( p, to->endPt[0].pos );
+	d = FindDistance(p, GetEndPtPos(to->endPt));
+
 	inx = 0;
-	for ( i=1; i<to->endCnt; i++ ) {
-		posI = to->endPt[i].pos;
-		if ((dd=FindDistance(p, posI)) < d) {
+	for (i = 1; i < to->endCnt; i++) {
+		posI = GetEndPtPos(EndPtIndex(to->endPt, i));
+		if ((dd = FindDistance(p, posI)) < d) {
 			d = dd;
 			inx = i;
 		}
@@ -2152,30 +2143,30 @@ static wIndex_t TOpickEndPoint(
 }
 
 
-static void HilightEndPt( void )
+static void HilightEndPt(void)
 {
 	coOrd p, s;
-	p.x = curTurnout->endPt[(int)curTurnoutEp].pos.x - trackGauge;
-	p.y = curTurnout->endPt[(int)curTurnoutEp].pos.y - trackGauge;
-	s.x = s.y = trackGauge*2.0 /*+ turnoutD.minSize*/;
-	wDrawSetTempMode( turnoutD.d, TRUE );
-	DrawHilight( &turnoutD, p, s, FALSE );
-	wDrawSetTempMode( turnoutD.d, FALSE );
+	trkEndPt_p epp = EndPtIndex( curTurnout->endPt, (EPINX_T)curTurnoutEp );
+	p.x = GetEndPtPos(epp).x - trackGauge;
+	p.y = GetEndPtPos(epp).y - trackGauge;
+	s.x = s.y = trackGauge * 2.0 /*+ turnoutD.minSize*/;
+	DrawHilight(&turnoutD, p, s, FALSE);
 }
 
 
 static void SelTurnoutEndPt(
-		wIndex_t action,
-		coOrd pos )
+        wIndex_t action,
+        coOrd pos)
 {
-	if (action != C_DOWN) return;
+	if (action != C_DOWN) { return; }
+	if ( curTurnout == NULL ) { return; }
 
-	curTurnoutEp = TOpickEndPoint( pos, curTurnout );
+	curTurnoutEp = TOpickEndPoint(pos, curTurnout);
 	HilightEndPt();
-LOG( log_turnout, 3, (" selected (action=%d) %ld\n", action, curTurnoutEp ) )
+	LOG(log_turnout, 3, (" selected (action=%d) %ld\n", action, curTurnoutEp))
 }
 #endif
-
+
 /****************************************
  *
  * GRAPHICS COMMANDS
@@ -2186,23 +2177,23 @@ LOG( log_turnout, 3, (" selected (action=%d) %ld\n", action, curTurnoutEp ) )
  * STATE INFO
  */
 static struct {
-		int state;
-		coOrd pos;
-		coOrd place;
-		track_p trk;
-		ANGLE_T angle;
-		coOrd rot0, rot1;
-		} Dto;
+	int state;
+	coOrd pos;
+	coOrd place;
+	track_p trk;
+	ANGLE_T angle;
+	coOrd rot0, rot1;
+} Dto;
 
 static dynArr_t vector_da;
 #define vector(N) DYNARR_N( vector_t, vector_da, N )
 
 typedef struct {
-		DIST_T off;
-		ANGLE_T angle;
-		EPINX_T ep;
-		track_p trk;
-		} vector_t;
+	DIST_T off;
+	ANGLE_T angle;
+	EPINX_T ep;
+	track_p trk;
+} vector_t;
 
 /*
  * PlaceTurnoutTrial
@@ -2216,13 +2207,13 @@ typedef struct {
  * OUT Vector   - An array of end points positions and offsets
  */
 static void PlaceTurnoutTrial(
-		track_p *trkR,
-		coOrd *posR,
-		ANGLE_T *angle1R,
-		ANGLE_T *angle2R,
-		int *connCntR,
-		DIST_T *maxDR,
-		vector_t *v )
+        track_p* trkR,
+        coOrd* posR,
+        ANGLE_T* angle1R,
+        ANGLE_T* angle2R,
+        int* connCntR,
+        DIST_T* maxDR,
+        vector_t* v)
 {
 	coOrd pos = *posR;
 	ANGLE_T aa;
@@ -2235,84 +2226,92 @@ static void PlaceTurnoutTrial(
 	DIST_T d, maxD = 0;
 	coOrd testP = pos;
 
-	if (*trkR && (GetTrkDistance(*trkR,&testP)<trackGauge)) {   //Have Track, stick with it unless outside bounds
+	if (*trkR && (GetTrkDistance(*trkR,
+	                             &testP) < trackGauge)) {   //Have Track, stick with it unless outside bounds
 		trk = *trkR;
 		pos = testP;
-	} else *trkR = trk = OnTrack( &pos, FALSE, TRUE );
-    if ( (trk) != NULL &&
-		 !QueryTrack(trk,Q_CANNOT_PLACE_TURNOUT) &&
-		 (ep0 = PickEndPoint( pos, trk )) >= 0 &&
-		 ! ( GetTrkType(trk) == T_TURNOUT &&
-			 (trk1=GetTrkEndTrk(trk,ep0)) &&
-			 GetTrkType(trk1) == T_TURNOUT) &&
-		 ! GetLayerFrozen(GetTrkLayer(trk)) &&
-		 ! GetLayerModule(GetTrkLayer(trk))) {
-		epPos = GetTrkEndPos( trk, ep0 );
-		d = FindDistance( pos, epPos );
-		if (d <= minLength)
+	} else { *trkR = trk = OnTrack(&pos, FALSE, TRUE); }
+	if ((trk) != NULL &&
+	    !QueryTrack(trk, Q_CANNOT_PLACE_TURNOUT) &&
+	    (ep0 = PickEndPoint(pos, trk)) >= 0 &&
+	    !(GetTrkType(trk) == T_TURNOUT &&
+	      (trk1 = GetTrkEndTrk(trk, ep0)) &&
+	      GetTrkType(trk1) == T_TURNOUT) &&
+	    !GetLayerFrozen(GetTrkLayer(trk)) &&
+	    !GetLayerModule(GetTrkLayer(trk))) {
+		epPos = GetTrkEndPos(trk, ep0);
+		d = FindDistance(pos, epPos);
+		if (d <= minLength) {
 			pos = epPos;
-		if ( GetTrkType(trk) == T_TURNOUT ) {				//Only on the end
-			ep0 = ep1 = PickEndPoint( pos, trk );
-			angle = GetTrkEndAngle( trk, ep0 );
+		}
+		if (GetTrkType(trk) == T_TURNOUT) {				//Only on the end
+			ep0 = ep1 = PickEndPoint(pos, trk);
+			angle = GetTrkEndAngle(trk, ep0);
 		} else {
-			angle = GetAngleAtPoint( trk, pos, &ep0, &ep1 );
-			if (ep0==1) angle = NormalizeAngle(angle+180);      //Reverse if curve backwards
+			angle = GetAngleAtPoint(trk, pos, &ep0, &ep1);
+			if (ep0 == 1) { angle = NormalizeAngle(angle + 180); }      //Reverse if curve backwards
+		}
+		angle = NormalizeAngle(angle + 180.0);
+		if (NormalizeAngle(FindAngle(pos, *posR) - angle) < 180.0 && ep0 != ep1) {
+			angle = NormalizeAngle(angle + 180);
 		}
-		angle = NormalizeAngle( angle + 180.0 );
-		if ( NormalizeAngle( FindAngle( pos, *posR ) - angle ) < 180.0 && ep0 != ep1 )
-			angle = NormalizeAngle( angle + 180 );
 		*angle2R = angle;
-		epPos = curTurnout->endPt[(int)curTurnoutEp].pos;
-		*angle1R = angle = NormalizeAngle( angle - curTurnout->endPt[(int)curTurnoutEp].angle );
-		Rotate( &epPos, zero, angle );
+		trkEndPt_p epp = EndPtIndex( curTurnout->endPt, (EPINX_T)curTurnoutEp );
+		epPos = GetEndPtPos(epp);
+		*angle1R = angle = NormalizeAngle(angle - GetEndPtAngle(epp) );
+		Rotate(&epPos, zero, angle);
 		pos.x -= epPos.x;
 		pos.y -= epPos.y;
 		*posR = pos;			//The place the Turnout end sits
-LOG( log_turnout, 3, ( "placeTurnout T%d (%0.3f %0.3f) A%0.3f\n",
-				GetTrkIndex(trk), pos.x, pos.y, angle ) )
+		LOG(log_turnout, 3, ("placeTurnout T%d (%0.3f %0.3f) A%0.3f\n",
+		                     GetTrkIndex(trk), pos.x, pos.y, angle))
 		/*InfoMessage( "Turnout(%d): Angle=%0.3f", GetTrkIndex(trk), angle );*/
-		track_p ctrk = NULL;
-		int ccnt = 0;
-		DIST_T clarge = 100000;
-		for (i=0;i<curTurnout->endCnt;i++) {
-			posI = curTurnout->endPt[i].pos;
-			epPos = AddCoOrd( pos, posI, angle );
-			epAngle = NormalizeAngle( curTurnout->endPt[i].angle + angle );
+//			track_p ctrk = NULL;
+//		int ccnt = 0;
+//		DIST_T clarge = DIST_INF;
+		for (i = 0; i < curTurnout->endCnt; i++) {
+			posI = GetEndPtPos(EndPtIndex(curTurnout->endPt,(EPINX_T)i));
+			epPos = AddCoOrd(pos, posI, angle);
+			epAngle = NormalizeAngle(GetEndPtAngle(EndPtIndex(curTurnout->endPt,
+			                                       (EPINX_T)i)) + angle);
 			conPos = epPos;
 			if ((trk = OnTrack(&conPos, FALSE, TRUE)) != NULL &&
-				!GetLayerFrozen(GetTrkLayer(trk)) &&
-				!GetLayerModule(GetTrkLayer(trk))) {
-				v->off = FindDistance( epPos, conPos );
-				v->angle = FindAngle( epPos, conPos );
-				if ( GetTrkType(trk) == T_TURNOUT ) {
-					ep0 = ep1 = PickEndPoint( conPos, trk );
-					aa = GetTrkEndAngle( trk, ep0 );
+			    !GetLayerFrozen(GetTrkLayer(trk)) &&
+			    !GetLayerModule(GetTrkLayer(trk))) {
+				v->off = FindDistance(epPos, conPos);
+				v->angle = FindAngle(epPos, conPos);
+				if (GetTrkType(trk) == T_TURNOUT) {
+					ep0 = ep1 = PickEndPoint(conPos, trk);
+					aa = GetTrkEndAngle(trk, ep0);
 				} else {
-					aa = GetAngleAtPoint( trk, conPos, &ep0, &ep1 );
-					if (ep0) 					//Backwards - so reverse
-						aa = NormalizeAngle(aa+180);
+					aa = GetAngleAtPoint(trk, conPos, &ep0, &ep1);
+					if (ep0) {				//Backwards - so reverse
+						aa = NormalizeAngle(aa + 180);
+					}
 				}
 				v->ep = i;
-				aa = fabs(DifferenceBetweenAngles( aa, epAngle ));
-				if (QueryTrack(trk,Q_IS_CORNU) ) {			//Make sure only two conns to each Cornu
-					int k=0;
+				aa = fabs(DifferenceBetweenAngles(aa, epAngle));
+				if (QueryTrack(trk, Q_IS_CORNU)) {			//Make sure only two conns to each Cornu
+					int k = 0;
 					v->trk = trk;
-					for (int j=0; j<i;j++) {
-						if (vector(j).trk == trk) k++;
+					for (int j = 0; j < i; j++) {
+						if (vector(j).trk == trk) { k++; }
 					}
-					if (k<2) {						//Already two conns to this track
+					if (k < 2) {						//Already two conns to this track
 						connCnt++;
-						if (v->off > maxD)
+						if (v->off > maxD) {
 							maxD = v->off;
+						}
 						v++;
 
 					}
-				} else if (( IsClose(v->off) && (aa<connectAngle || aa>180-connectAngle) &&
-				  !( GetTrkType(trk) == T_TURNOUT &&
-						 (trk1=GetTrkEndTrk(trk,ep0)) &&
-						 GetTrkType(trk1) == T_TURNOUT )) ) {
-					if (v->off > maxD)
+				} else if ((IsClose(v->off) && (aa < connectAngle || aa>180 - connectAngle) &&
+				            !(GetTrkType(trk) == T_TURNOUT &&
+				              (trk1 = GetTrkEndTrk(trk, ep0)) &&
+				              GetTrkType(trk1) == T_TURNOUT))) {
+					if (v->off > maxD) {
 						maxD = v->off;
+					}
 					connCnt++;
 					v++;
 				}
@@ -2328,51 +2327,55 @@ LOG( log_turnout, 3, ( "placeTurnout T%d (%0.3f %0.3f) A%0.3f\n",
 
 
 static void PlaceTurnout(
-		coOrd pos, track_p trk )
+        coOrd pos, track_p trk)
 {
 	coOrd p, pos1, pos2;
 	track_p trk1, trk2;
 	ANGLE_T a, a1, a2, a3;
 	int i, connCnt1, connCnt2;
 	DIST_T d, maxD1, maxD2, sina;
-	vector_t *V, * maxV;
+	vector_t* V, * maxV;
+
 
-	
 
 	pos1 = Dto.place = Dto.pos = pos;
-LOG( log_turnout, 1, ( "Place Turnout @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y ) );
-	if (curTurnoutEp >= (long)curTurnout->endCnt)
+	LOG(log_turnout, 1, ("Place Turnout @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y));
+	if (curTurnoutEp >= (long)curTurnout->endCnt) {
 		curTurnoutEp = 0;
-	DYNARR_SET( vector_t, vector_da, curTurnout->endCnt );
-	if (trk) trk1 = trk;
-	else trk1 = NULL;
-	PlaceTurnoutTrial( &trk1, &pos1, &a1, &a2, &connCnt1, &maxD1, &vector(0) );
+	}
+	DYNARR_SET(vector_t, vector_da, curTurnout->endCnt);
+	if (trk) { trk1 = trk; }
+	else { trk1 = NULL; }
+	PlaceTurnoutTrial(&trk1, &pos1, &a1, &a2, &connCnt1, &maxD1, &vector(0));
 	if (connCnt1 > 0) {
 		Dto.pos = pos1;		//First track pos
-LOG( log_turnout, 1, ( " trial 1 @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y ) );
+		LOG(log_turnout, 1, (" trial 1 @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y));
 		Dto.trk = trk1;		//Track
 		Dto.angle = a1;		//Angle of track to put down
-		if ( ((MyGetKeyState()&WKEY_SHIFT)==0) && (connCnt1 > 1) && (maxD1 >= 0.001) ) {  //Adjust if not Shift
+		if (((MyGetKeyState() & WKEY_SHIFT) == 0) && (connCnt1 > 1)
+		    && (maxD1 >= 0.001)) {  //Adjust if not Shift
 			maxV = &vector(0);
-			for ( i=1; i<connCnt1; i++ ) {		//Ignore first point
+			for (i = 1; i < connCnt1; i++) {		//Ignore first point
 				V = &vector(i);
-				if ( V->off > maxV->off ) {
+				if (V->off > maxV->off) {
 					maxV = V;
 				}
 			}
-			a3 = NormalizeAngle( Dto.angle + curTurnout->endPt[maxV->ep].angle );
-			a = NormalizeAngle( a2 - a3 );
+			a3 = NormalizeAngle(Dto.angle + GetEndPtAngle(EndPtIndex(curTurnout->endPt,
+			                    maxV->ep)));
+			a = NormalizeAngle(a2 - a3);
 			sina = sin(D2R(a));
 			if (fabs(sina) > 0.01) {
-				d = maxV->off/sina;
-				if (NormalizeAngle( maxV->angle - a3) > 180)
+				d = maxV->off / sina;
+				if (NormalizeAngle(maxV->angle - a3) > 180) {
 					d = -d;
-				Translate( &pos2, pos, a2, d );
+				}
+				Translate(&pos2, pos, a2, d);
 				trk2 = trk1;
-				PlaceTurnoutTrial( &trk2, &pos2, &a2, &a, &connCnt2, &maxD2, &vector(0) );
-				if ( connCnt2 >= connCnt1 && maxD2 < maxD1 ) {
+				PlaceTurnoutTrial(&trk2, &pos2, &a2, &a, &connCnt2, &maxD2, &vector(0));
+				if (connCnt2 >= connCnt1 && maxD2 < maxD1) {
 					Dto.pos = pos2;
-LOG( log_turnout, 1, ( " trial 2 @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y ) );
+					LOG(log_turnout, 1, (" trial 2 @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y));
 					Dto.trk = trk2;
 					Dto.angle = a2;
 					maxD1 = maxD2;
@@ -2381,37 +2384,36 @@ LOG( log_turnout, 1, ( " trial 2 @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y ) );
 			}
 		}
 	}
-	if ( connCnt1 > 0 ) {
-		FormatCompoundTitle( listLabels, curTurnout->title );
-		InfoMessage( _("%d connections, max distance %0.3f (%s)"),
-				connCnt1, PutDim(maxD1), message );
+	if (connCnt1 > 0) {
+		FormatCompoundTitle(listLabels, curTurnout->title);
+		InfoMessage(_("%d connections, max distance %0.3f (%s)"),
+		            connCnt1, PutDim(maxD1), message);
 	} else {
 		Dto.trk = NULL;
-		FormatCompoundTitle( listLabels, curTurnout->title );
-		InfoMessage( _("0 connections (%s)"), message );
-		p = curTurnout->endPt[(int)curTurnoutEp].pos;
-		Rotate( &p, zero, Dto.angle );
+		FormatCompoundTitle(listLabels, curTurnout->title);
+		InfoMessage(_("0 connections (%s)"), message);
+		p = GetEndPtPos(EndPtIndex(curTurnout->endPt,(EPINX_T)curTurnoutEp));
+		Rotate(&p, zero, Dto.angle);
 		Dto.pos.x = pos.x - p.x;
 		Dto.pos.y = pos.y - p.y;
-LOG( log_turnout, 1, ( " final @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y ) );
+		LOG(log_turnout, 1, (" final @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y));
 	}
 }
 
-static void AddTurnout( void )
+static void AddTurnout(void)
 {
 	track_p newTrk;
 	track_p trk, trk1;
-	struct extraData *xx;
+	struct extraDataCompound_t* xx;
 	coOrd epPos;
 	DIST_T d;
 	ANGLE_T a, aa;
 	EPINX_T ep0, ep1, epx, epy;
-	wIndex_t i,j;
-	wIndex_t titleLen;
+	wIndex_t i, j;
 	typedef struct {
 		track_p trk;
 		EPINX_T ep;
-		} junk_t;
+	} junk_t;
 	static dynArr_t connection_da;
 	static dynArr_t leftover_da;
 #define connection(N) DYNARR_N( junk_t, connection_da, N )
@@ -2421,102 +2423,101 @@ static void AddTurnout( void )
 	BOOL_T noConnections;
 	coOrd p0, p1;
 
-	if (Dto.state == 0)
+	if (Dto.state == 0) {
 		return;
-
-	if (curTurnout->segCnt < 1 || curTurnout->endCnt < 1) {
-		AbortProg( "addTurnout: bad cnt" );
 	}
 
-	UndoStart( _("Place New Turnout"), "addTurnout" );
-	titleLen = strlen( curTurnout->title );
+	CHECK( curTurnout->segCnt >= 1 );
+	CHECK(	curTurnout->endCnt >= 1 );
+
+	UndoStart(_("Place New Turnout"), "addTurnout");
 
-	DYNARR_SET( trkEndPt_t, tempEndPts_da, curTurnout->endCnt );
-	DYNARR_SET( junk_t, connection_da, curTurnout->endCnt );
-	DYNARR_SET( junk_t, leftover_da, curTurnout->endCnt );
+	TempEndPtsSet( curTurnout->endCnt);
+	DYNARR_SET(junk_t, connection_da, curTurnout->endCnt);
+	DYNARR_SET(junk_t, leftover_da, curTurnout->endCnt);
 
-	for (i=0; i<curTurnout->endCnt; i++ ) {
+	for (i = 0; i < curTurnout->endCnt; i++) {
 		coOrd posI;
-		posI = curTurnout->endPt[i].pos;
-		tempEndPts(i).pos = AddCoOrd( Dto.pos, posI, Dto.angle );
-		tempEndPts(i).angle = NormalizeAngle( curTurnout->endPt[i].angle + Dto.angle );
+		trkEndPt_p epp = EndPtIndex( curTurnout->endPt, i);
+		posI = GetEndPtPos( epp );
+		SetEndPt( TempEndPt(i), AddCoOrd(Dto.pos, posI, Dto.angle),
+		          NormalizeAngle(GetEndPtAngle(epp) + Dto.angle) );
 	}
 
-	AuditTracks( "addTurnout begin" );
+	AuditTracks("addTurnout begin");
 
-	for (i=0;i<curTurnout->endCnt;i++) {
-		AuditTracks( "addTurnout [%d]", i );
+	for (i = 0; i < curTurnout->endCnt; i++) {
+		AuditTracks("addTurnout [%d]", i);
 		connection(i).trk = leftover(i).trk = NULL;
 		connection(i).ep = -1;
 		leftover(i).ep = -1;
 		/* connect each endPt ... */
-		epPos = tempEndPts(i).pos;
-		if ((trk = OnTrack(&epPos, FALSE, TRUE)) != NULL &&    //Adjust epPos onto existing track
-			(!GetLayerFrozen(GetTrkLayer(trk))) &&
-			(!GetLayerModule(GetTrkLayer(trk)))  &&
-			(!QueryTrack(trk,Q_CANNOT_PLACE_TURNOUT)) ) {
-LOG( log_turnout, 1, ( "ep[%d] on T%d @(%0.3f %0.3f)\n",
-					i, GetTrkIndex(trk), epPos.x, epPos.y ) )
-			DIST_T dd = 10000.0;
+		epPos = GetEndPtPos( TempEndPt(i) );
+		if ((trk = OnTrack(&epPos, FALSE, TRUE)) != NULL
+		    &&    //Adjust epPos onto existing track
+		    (!GetLayerFrozen(GetTrkLayer(trk))) &&
+		    (!GetLayerModule(GetTrkLayer(trk))) &&
+		    (!QueryTrack(trk, Q_CANNOT_PLACE_TURNOUT))) {
+			LOG(log_turnout, 1, ("ep[%d] on T%d @(%0.3f %0.3f)\n",
+			                     i, GetTrkIndex(trk), epPos.x, epPos.y))
+			DIST_T dd = DIST_INF;
 			int nearest = -1;
-			for (int j=0;j<curTurnout->endCnt;j++) {
-				if (j<i && (connection(j).trk == trk)) {
-					nearest = -1;
-					goto nextEnd;  //Track already chosen in use
-				}
-				if (dd>FindDistance(epPos,tempEndPts(j).pos)) {
-					dd = FindDistance(epPos,tempEndPts(j).pos);
+			for (int j = 0; j < curTurnout->endCnt; j++) {
+				DIST_T dd1 = FindDistance( epPos, GetEndPtPos(TempEndPt(j)));
+				if (dd > dd1) {
+					dd = dd1;
 					nearest = j;
 				}
 			}
-			if (nearest != i) continue;    //Not this one
-			d = FindDistance( tempEndPts(i).pos, epPos );
-			if ( GetTrkType(trk) == T_TURNOUT ) {
-				ep0 = ep1 = PickEndPoint( epPos, trk );
-				a = GetTrkEndAngle( trk, ep0 );
+			if (nearest != i) { continue; }    //Not this one
+			d = FindDistance(GetEndPtPos(TempEndPt(i)), epPos);
+			if (GetTrkType(trk) == T_TURNOUT) {
+				ep0 = ep1 = PickEndPoint(epPos, trk);
+				a = GetTrkEndAngle(trk, ep0);
 			} else {
-				a = GetAngleAtPoint( trk, epPos, &ep0, &ep1 );
+				a = GetAngleAtPoint(trk, epPos, &ep0, &ep1);
 			}
-			aa = fabs(DifferenceBetweenAngles( a , tempEndPts(i).angle));
-			if ((QueryTrack(trk,Q_IS_CORNU) && (d<trackGauge*2)) ||
-				(( IsClose(d) &&  ( ((ep0!=ep1) && (aa<=connectAngle)) || ((aa<=connectAngle) || (aa>180-connectAngle)) ) &&
-				 ! ( GetTrkType(trk) == T_TURNOUT &&
-				   (trk1=GetTrkEndTrk(trk,ep0)) &&
-				   GetTrkType(trk1) == T_TURNOUT )) ) ) {
+			aa = fabs(DifferenceBetweenAngles(a, GetEndPtAngle(TempEndPt(i))));
+			if ((QueryTrack(trk, Q_IS_CORNU) && (d < trackGauge * 2)) ||
+			    ((IsClose(d) && (((ep0 != ep1) && (aa <= connectAngle))
+			                     || ((aa <= connectAngle) || (aa > 180 - connectAngle))) &&
+			      !(GetTrkType(trk) == T_TURNOUT &&
+			        (trk1 = GetTrkEndTrk(trk, ep0)) &&
+			        GetTrkType(trk1) == T_TURNOUT)))) {
 				/* ... if they are close enough to a track and line up */
-				if (aa<90) {
-				   epx = ep1;
-				   epy = ep0;
+				if (aa < 90) {
+					epx = ep1;
+					epy = ep0;
 				} else {
-				   epx = ep0;
-				   epy = ep1;
+					epx = ep0;
+					epy = ep1;
 				}
-LOG( log_turnout, 1, ( "   Attach! epx=%d\n", epx ) )
-				if ( (epx != epy) &&
-					((d=FindDistance(GetTrkEndPos(trk,epy), epPos)) < minLength) &&
-					((trk1=GetTrkEndTrk(trk,epy)) != NULL) ) {
-					epx = GetEndPtConnectedToMe( trk1, trk );
+				LOG(log_turnout, 1, ("   Attach! epx=%d\n", epx))
+				if ((epx != epy) &&
+				    ((d = FindDistance(GetTrkEndPos(trk, epy), epPos)) < minLength) &&
+				    ((trk1 = GetTrkEndTrk(trk, epy)) != NULL)) {
+					epx = GetEndPtConnectedToMe(trk1, trk);
 					trk = trk1;
 				}
 				/* split the track at the intersection point */
-		AuditTracks( "addTurnout [%d] before splitTrack", i );
-				if (SplitTrack( trk, epPos, epx, &leftover(i).trk, TRUE )) {
-		AuditTracks( "addTurnout [%d], after splitTrack", i );
+				AuditTracks("addTurnout [%d] before splitTrack", i);
+				if (SplitTrack(trk, epPos, epx, &leftover(i).trk, TRUE)) {
+					AuditTracks("addTurnout [%d], after splitTrack", i);
 					/* remember so we can fix up connection later */
 					connection(i).trk = trk;
 					connection(i).ep = epx;
 					if (leftover(i).trk != NULL) {
-						leftover(i).ep = 1-epx;
+						leftover(i).ep = 1 - epx;
 						/* did we already split this track? */
-						for (j=0;j<i;j++) {
-							if ( connection(i).trk == leftover(j).trk ) {
+						for (j = 0; j < i; j++) {
+							if (connection(i).trk == leftover(j).trk) {
 								/* yes.  Remove the latest leftover piece */
-LOG( log_turnout, 1, ( "   deleting leftover T%d\n",
-										GetTrkIndex(leftover(i).trk) ) )
-		AuditTracks( "addTurnout [%d] before delete", i );
-								UndrawNewTrack( leftover(i).trk );
-								DeleteTrack( leftover(i).trk, FALSE );
-		AuditTracks( "addTurnout [%d] before delete", i );
+								LOG(log_turnout, 1, ("   deleting leftover T%d\n",
+								                     GetTrkIndex(leftover(i).trk)))
+								AuditTracks("addTurnout [%d] before delete", i);
+								UndrawNewTrack(leftover(i).trk);
+								DeleteTrack(leftover(i).trk, FALSE);
+								AuditTracks("addTurnout [%d] before delete", i);
 								leftover(i).trk = NULL;
 								leftover(i).ep = -1;
 								leftover(j).trk = NULL; //Forget this leftover
@@ -2528,112 +2529,115 @@ LOG( log_turnout, 1, ( "   deleting leftover T%d\n",
 				}
 			}
 		}
-nextEnd:;
 	}
 
-	AuditTracks( "addTurnout after loop" );
+	AuditTracks("addTurnout after loop");
 
 	/*
 	 * copy data */
 
-	newTrk = NewCompound( T_TURNOUT, 0, Dto.pos, Dto.angle, curTurnout->title, tempEndPts_da.cnt, &tempEndPts(0), NULL, curTurnout->pathLen, (char *)curTurnout->paths, curTurnout->segCnt, curTurnout->segs );
-	xx = GetTrkExtraData(newTrk);
+	newTrk = NewCompound(T_TURNOUT, 0, Dto.pos, Dto.angle, curTurnout->title,
+	                     TempEndPtsCount(), TempEndPt(0), GetParamPaths(curTurnout), curTurnout->segCnt,
+	                     curTurnout->segs);
+	xx = GET_EXTRA_DATA(newTrk, T_TURNOUT, extraDataCompound_t);
 	xx->customInfo = curTurnout->customInfo;
 	if (connection((int)curTurnoutEp).trk) {
-		CopyAttributes( connection((int)curTurnoutEp).trk, newTrk );
-		SetTrkScale( newTrk, GetLayoutCurScale());
+		CopyAttributes(connection((int)curTurnoutEp).trk, newTrk);
+		SetTrkScale(newTrk, GetLayoutCurScale());
 	}
 	xx->special = curTurnout->special;
-	if (xx->special == TOcurved) {
-		DYNARR_SET(DIST_T,xx->u.curved.radii,curTurnout->endCnt);
-		for (int i=0;i<curTurnout->endCnt;i++) {
-			DYNARR_N(DIST_T,xx->u.curved.radii,i) = DYNARR_N(DIST_T,curTurnout->u.curved.radii,i);
-		}
-	}
 	xx->u = curTurnout->u;
+	xx->pathOverRide = curTurnout->pathOverRide;
+	xx->pathNoCombine = curTurnout->pathNoCombine;
 
 	/* Make the connections */
 
 	visible = FALSE;
 	no_ties = FALSE;
 	noConnections = TRUE;
-	AuditTracks( "addTurnout T%d before connection", GetTrkIndex(newTrk) );
-	for (i=0;i<curTurnout->endCnt;i++) {
-		if ( connection(i).trk != NULL ) {
-			if (GetTrkEndTrk(connection(i).trk,connection(i).ep)) continue;
-			p0 = GetTrkEndPos( newTrk, i );
-			p1 = GetTrkEndPos( connection(i).trk, connection(i).ep );
-			ANGLE_T a0 = GetTrkEndAngle( newTrk, i);
-			ANGLE_T a1 = GetTrkEndAngle( connection(i).trk, connection(i).ep );
-			ANGLE_T a = fabs(DifferenceBetweenAngles(a0+180,a1));
-			d = FindDistance( p0, p1 );
-			if (QueryTrack(connection(i).trk,Q_IS_CORNU)) {
-				ANGLE_T a = DifferenceBetweenAngles(FindAngle(p0,p1),a0);
-				if (IsClose(d) || fabs(a)<=90.0) {
+	AuditTracks("addTurnout T%d before connection", GetTrkIndex(newTrk));
+	for (i = 0; i < curTurnout->endCnt; i++) {
+		if (connection(i).trk != NULL) {
+			if (GetTrkEndTrk(connection(i).trk, connection(i).ep)) { continue; }
+			p0 = GetTrkEndPos(newTrk, i);
+			p1 = GetTrkEndPos(connection(i).trk, connection(i).ep);
+			ANGLE_T a0 = GetTrkEndAngle(newTrk, i);
+			ANGLE_T a1 = GetTrkEndAngle(connection(i).trk, connection(i).ep);
+			ANGLE_T a = fabs(DifferenceBetweenAngles(a0 + 180, a1));
+			d = FindDistance(p0, p1);
+			if (QueryTrack(connection(i).trk, Q_IS_CORNU)) {
+				ANGLE_T a = DifferenceBetweenAngles(FindAngle(p0, p1), a0);
+				if (IsClose(d) || fabs(a) <= 90.0) {
 					trk1 = connection(i).trk;
 					ep0 = connection(i).ep;
-					if (GetTrkEndTrk(trk1,ep0)) continue;
-					DrawEndPt( &mainD, trk1, ep0, wDrawColorWhite );
+					if (GetTrkEndTrk(trk1, ep0)) { continue; }
+					DrawEndPt(&mainD, trk1, ep0, wDrawColorWhite);
 					trackParams_t params;
-					GetTrackParams( PARAMS_EXTEND, newTrk, GetTrkEndPos(newTrk,i), &params);
-					SetCornuEndPt(trk1, ep0, GetTrkEndPos(newTrk,i), params.arcP, NormalizeAngle(params.angle+180.0), params.arcR);
-					ConnectTracks(newTrk,i,trk1,ep0);
-					DrawEndPt( &mainD, trk1, ep0, wDrawColorBlack );
+					GetTrackParams(PARAMS_EXTEND, newTrk, GetTrkEndPos(newTrk, i), &params);
+					SetCornuEndPt(trk1, ep0, GetTrkEndPos(newTrk, i), params.arcP,
+					              NormalizeAngle(params.angle + 180.0), params.arcR);
+					ConnectTracks(newTrk, i, trk1, ep0);
+					DrawEndPt(&mainD, trk1, ep0, wDrawColorBlack);
 				}
-			} else if ( d < connectDistance && (a<=connectAngle)) {
+			} else if (d < connectDistance && (a <= connectAngle)) {
 				noConnections = FALSE;
 				trk1 = connection(i).trk;
 				ep0 = connection(i).ep;
-				DrawEndPt( &mainD, trk1, ep0, wDrawColorWhite );
-				ConnectTracks( newTrk, i, trk1, ep0 );
+				DrawEndPt(&mainD, trk1, ep0, wDrawColorWhite);
+				ConnectTracks(newTrk, i, trk1, ep0);
 				visible |= GetTrkVisible(trk1);
 				no_ties |= GetTrkNoTies(trk1);
-				DrawEndPt( &mainD, trk1, ep0, wDrawColorBlack );
+				DrawEndPt(&mainD, trk1, ep0, wDrawColorBlack);
 			}
 		}
 	}
-	if (noConnections)
+	if (noConnections) {
 		visible = TRUE;
-	SetTrkVisible( newTrk, visible);
+	}
+	SetTrkVisible(newTrk, visible);
 	SetTrkNoTies(newTrk, no_ties);
 	SetTrkBridge(newTrk, FALSE);
+	SetTrkRoadbed(newTrk, FALSE);
 
-	AuditTracks( "addTurnout T%d before dealing with leftovers", GetTrkIndex(newTrk) );
+	AuditTracks("addTurnout T%d before dealing with leftovers",
+	            GetTrkIndex(newTrk));
 	/* deal with the leftovers */
-	for (i=0;i<curTurnout->endCnt;i++) {
-		if ( (trk=leftover(i).trk) != NULL && !IsTrackDeleted(trk) ) {
+	for (i = 0; i < curTurnout->endCnt; i++) {
+		if ((trk = leftover(i).trk) != NULL) {
+			CHECK( !IsTrackDeleted(trk) );
 			/* move endPt beyond the turnout */
 			/* it it is short then delete it */
 			coOrd off;
 			DIST_T maxX;
 			track_p lt = leftover(i).trk;
-			if (QueryTrack(lt,Q_IS_CORNU)) {
+			if (QueryTrack(lt, Q_IS_CORNU)) {
 				UndrawNewTrack(lt);
-				DeleteTrack(lt,TRUE);
+				DeleteTrack(lt, TRUE);
 				leftover(i).trk = NULL;
 				continue;
 			}
-			EPINX_T ep, le = leftover(i).ep, nearest_ep =-1;
+			EPINX_T ep, le = leftover(i).ep, nearest_ep = -1;
 			coOrd pos, nearest_pos = zero;
 			ANGLE_T nearest_angle = 0.0;
 			DIST_T nearest_radius = 0.0;
 			coOrd nearest_center = zero;
 			trackParams_t params;
 			maxX = 0.0;
-			DIST_T dd = 10000.0;
-			a = NormalizeAngle( GetTrkEndAngle(lt,le) + 180.0 );
-			for (ep=0; ep<curTurnout->endCnt; ep++) {
-				FindPos( &off, NULL, GetTrkEndPos(newTrk,ep), GetTrkEndPos(lt,le), a, 100000.0 );
-				pos = GetTrkEndPos(newTrk,ep);
+			DIST_T dd = DIST_INF;
+			a = NormalizeAngle(GetTrkEndAngle(lt, le) + 180.0);
+			for (ep = 0; ep < curTurnout->endCnt; ep++) {
+				FindPos(&off, NULL, GetTrkEndPos(newTrk, ep), GetTrkEndPos(lt, le), a,
+				        DIST_INF);
+				pos = GetTrkEndPos(newTrk, ep);
 				DIST_T d = GetTrkDistance(lt, &pos);
-				if ((d<dd) && ( d<trackGauge/2)) {
-					ANGLE_T a = GetTrkEndAngle( lt, le );
-					ANGLE_T a2 = fabs(DifferenceBetweenAngles(GetTrkEndAngle(newTrk,ep),a+180));
-					if (GetTrkEndTrk(newTrk,ep)==NULL) { //Not if joined already
-						if (a2<90 && QueryTrack(lt,Q_IS_CORNU)) { //And Cornu in the right direction
-							GetTrackParams( PARAMS_EXTEND, newTrk, GetTrkEndPos(newTrk,ep), &params);
-							nearest_pos = GetTrkEndPos(newTrk,ep);
-							nearest_angle = NormalizeAngle(params.angle+180.0);
+				if ((d < dd) && (d < trackGauge / 2)) {
+					ANGLE_T a = GetTrkEndAngle(lt, le);
+					ANGLE_T a2 = fabs(DifferenceBetweenAngles(GetTrkEndAngle(newTrk, ep), a + 180));
+					if (GetTrkEndTrk(newTrk, ep) == NULL) { //Not if joined already
+						if (a2 < 90 && QueryTrack(lt, Q_IS_CORNU)) { //And Cornu in the right direction
+							GetTrackParams(PARAMS_EXTEND, newTrk, GetTrkEndPos(newTrk, ep), &params);
+							nearest_pos = GetTrkEndPos(newTrk, ep);
+							nearest_angle = NormalizeAngle(params.angle + 180.0);
 							nearest_radius = params.arcR;
 							nearest_center = params.arcP;
 							nearest_ep = ep;
@@ -2641,35 +2645,41 @@ nextEnd:;
 						dd = d;
 					}
 				}
-				if (off.x > maxX)
+				if (off.x > maxX) {
 					maxX = off.x;
+				}
 			}
 			maxX += trackGauge;
 			pos = Dto.pos;
-			if (QueryTrack(lt,Q_IS_CORNU)) {
-				if (nearest_ep >=0) {
-					SetCornuEndPt(lt, le, nearest_pos, nearest_center, nearest_angle, nearest_radius);
-					ConnectTracks(newTrk,nearest_ep,lt,le);
+			if (QueryTrack(lt, Q_IS_CORNU)) {
+				if (nearest_ep >= 0) {
+					SetCornuEndPt(lt, le, nearest_pos, nearest_center, nearest_angle,
+					              nearest_radius);
+					ConnectTracks(newTrk, nearest_ep, lt, le);
 				} else {
 					UndrawNewTrack(lt);
-					DeleteTrack(lt,TRUE);
+					DeleteTrack(lt, TRUE);
+					leftover(i).trk = NULL;
 				}
 			} else {
-	AuditTracks( "addTurnout T%d[%d] before trimming L%d[%d]", GetTrkIndex(newTrk), i, GetTrkIndex(lt), le );
-				wBool_t rc = TrimTrack( lt, le, maxX, nearest_pos, nearest_angle, nearest_radius, nearest_center );
-	AuditTracks( "addTurnout T%d[%d] after trimming L%d[%d]", GetTrkIndex(newTrk), i, GetTrkIndex(lt), le );
+				AuditTracks("addTurnout T%d[%d] before trimming L%d[%d]", GetTrkIndex(newTrk),
+				            i, GetTrkIndex(lt), le);
+				TrimTrack(lt, le, maxX, nearest_pos, nearest_angle, nearest_radius,
+				          nearest_center);
+				AuditTracks("addTurnout T%d[%d] after trimming L%d[%d]", GetTrkIndex(newTrk), i,
+				            GetTrkIndex(lt), le);
 
 			}
 		}
 	}
 
-	SetDescriptionOrig( newTrk );
+	SetDescriptionOrig(newTrk);
 	xx->descriptionOff = zero;
 	xx->descriptionSize = zero;
 
-	DrawNewTrack( newTrk );
+	DrawNewTrack(newTrk);
 
-	AuditTracks( "addTurnout T%d returns", GetTrkIndex(newTrk) );
+	AuditTracks("addTurnout T%d returns", GetTrkIndex(newTrk));
 	UndoEnd();
 	Dto.state = 0;
 	Dto.trk = NULL;
@@ -2677,14 +2687,15 @@ nextEnd:;
 }
 
 
-static void TurnoutRotate( void * pangle )
+static void TurnoutRotate(void* pangle)
 {
-	if (Dto.state == 0)
+	if (Dto.state == 0) {
 		return;
-	ANGLE_T angle = (ANGLE_T)(long)pangle;
+	}
+	ANGLE_T angle = (ANGLE_T)VP2L(pangle);
 	angle /= 1000.0;
 	Dto.pos = cmdMenuPos;
-	Rotate( &Dto.pos, cmdMenuPos, angle );
+	Rotate(&Dto.pos, cmdMenuPos, angle);
 	Dto.angle += angle;
 	TempRedraw(); // TurnoutRotate
 }
@@ -2692,65 +2703,70 @@ static void TurnoutRotate( void * pangle )
 static dynArr_t anchors_da;
 #define anchors(N) DYNARR_N(trkSeg_t,anchors_da,N)
 
-void static CreateArrowAnchor(coOrd pos,ANGLE_T a,DIST_T len) {
-	DYNARR_APPEND(trkSeg_t,anchors_da,1);
-	int i = anchors_da.cnt-1;
+void static CreateArrowAnchor(coOrd pos, ANGLE_T a, DIST_T len)
+{
+	DYNARR_APPEND(trkSeg_t, anchors_da, 1);
+	int i = anchors_da.cnt - 1;
 	anchors(i).type = SEG_STRLIN;
-	anchors(i).width = 0;
+	anchors(i).lineWidth = 0;
 	anchors(i).u.l.pos[0] = pos;
-	Translate(&anchors(i).u.l.pos[1],pos,NormalizeAngle(a+135),len);
+	Translate(&anchors(i).u.l.pos[1], pos, NormalizeAngle(a + 135), len);
 	anchors(i).color = wDrawColorBlue;
-	DYNARR_APPEND(trkSeg_t,anchors_da,1);
-	i = anchors_da.cnt-1;
+	DYNARR_APPEND(trkSeg_t, anchors_da, 1);
+	i = anchors_da.cnt - 1;
 	anchors(i).type = SEG_STRLIN;
-	anchors(i).width = 0;
+	anchors(i).lineWidth = 0;
 	anchors(i).u.l.pos[0] = pos;
-	Translate(&anchors(i).u.l.pos[1],pos,NormalizeAngle(a-135),len);
+	Translate(&anchors(i).u.l.pos[1], pos, NormalizeAngle(a - 135), len);
 	anchors(i).color = wDrawColorBlue;
 }
 
-void static CreateRotateAnchor(coOrd pos) {
-	DIST_T d = tempD.scale*0.15;
-	DYNARR_APPEND(trkSeg_t,anchors_da,1);
-	int i = anchors_da.cnt-1;
+void static CreateRotateAnchor(coOrd pos)
+{
+	DIST_T d = tempD.scale * 0.15;
+	DYNARR_APPEND(trkSeg_t, anchors_da, 1);
+	int i = anchors_da.cnt - 1;
 	anchors(i).type = SEG_CRVLIN;
-	anchors(i).width = 0.5;
+	anchors(i).lineWidth = 0.5;
 	anchors(i).u.c.center = pos;
 	anchors(i).u.c.a0 = 180.0;
 	anchors(i).u.c.a1 = 360.0;
-	anchors(i).u.c.radius = d*2;
+	anchors(i).u.c.radius = d * 2;
 	anchors(i).color = wDrawColorAqua;
 	coOrd head;					//Arrows
-	for (int j=0;j<3;j++) {
-		Translate(&head,pos,j*120,d*2);
-		CreateArrowAnchor(head,NormalizeAngle((j*120)+90),d);
+	for (int j = 0; j < 3; j++) {
+		Translate(&head, pos, j * 120, d * 2);
+		CreateArrowAnchor(head, NormalizeAngle((j * 120) + 90), d);
 	}
 }
 
-void static CreateMoveAnchor(coOrd pos) {
-	DYNARR_SET(trkSeg_t,anchors_da,anchors_da.cnt+5);
-	DrawArrowHeads(&DYNARR_N(trkSeg_t,anchors_da,anchors_da.cnt-5),pos,0,TRUE,wDrawColorBlue);
-	DYNARR_SET(trkSeg_t,anchors_da,anchors_da.cnt+5);
-	DrawArrowHeads(&DYNARR_N(trkSeg_t,anchors_da,anchors_da.cnt-5),pos,90,TRUE,wDrawColorBlue);
+void static CreateMoveAnchor(coOrd pos)
+{
+	DYNARR_SET(trkSeg_t, anchors_da, anchors_da.cnt + 5);
+	DrawArrowHeads(&DYNARR_N(trkSeg_t, anchors_da, anchors_da.cnt - 5), pos, 0,
+	               TRUE, wDrawColorBlue);
+	DYNARR_SET(trkSeg_t, anchors_da, anchors_da.cnt + 5);
+	DrawArrowHeads(&DYNARR_N(trkSeg_t, anchors_da, anchors_da.cnt - 5), pos, 90,
+	               TRUE, wDrawColorBlue);
 }
-	
+
 /**
  * Process the mouse events for laying track.
  *
  * \param action IN event type
- * \param pos    IN mouse position 
+ * \param pos    IN mouse position
  * \return    		next state
  */
 
 EXPORT STATUS_T CmdTurnoutAction(
-		wAction_t action,
-		coOrd pos )
+        wAction_t action,
+        coOrd pos)
 {
 	ANGLE_T angle;
 	static BOOL_T validAngle;
-	static ANGLE_T baseAngle;
 	static coOrd origPos;
 #ifdef NEWROTATE
+	static ANGLE_T baseAngle;
 	static ANGLE_T origAngle;
 #endif
 
@@ -2760,12 +2776,13 @@ EXPORT STATUS_T CmdTurnoutAction(
 		Dto.state = 0;
 		Dto.trk = NULL;
 		Dto.angle = 0.0;
-		DYNARR_RESET(trkSeg_t,anchors_da);
+		DYNARR_RESET(trkSeg_t, anchors_da);
+		SetAllTrackSelect(FALSE);
 		return C_CONTINUE;
 
 	case wActionMove:
-		DYNARR_RESET(trkSeg_t,anchors_da);
-		if (Dto.state && (MyGetKeyState()&WKEY_CTRL)) {
+		DYNARR_RESET(trkSeg_t, anchors_da);
+		if (Dto.state && (MyGetKeyState() & WKEY_CTRL)) {
 			CreateRotateAnchor(pos);
 		} else {
 			CreateMoveAnchor(pos);
@@ -2773,142 +2790,154 @@ EXPORT STATUS_T CmdTurnoutAction(
 		return C_CONTINUE;
 		break;
 	case C_DOWN:
-		DYNARR_RESET(trkSeg_t,anchors_da);
-		if ( curTurnout == NULL ) return C_CONTINUE;
-		PlaceTurnout( pos, NULL );
+		DYNARR_RESET(trkSeg_t, anchors_da);
+		if (curTurnout == NULL) { return C_CONTINUE; }
+		PlaceTurnout(pos, NULL);
 		Dto.state = 1;
-		CreateMoveAnchor(pos);
 		return C_CONTINUE;
 
 	case C_MOVE:
-		DYNARR_RESET(trkSeg_t,anchors_da);
-		if ( curTurnout == NULL ) return C_CONTINUE;
-		if ( curTurnoutEp >= (long)curTurnout->endCnt )
+		DYNARR_RESET(trkSeg_t, anchors_da);
+		if (curTurnout == NULL) { return C_CONTINUE; }
+		if (curTurnoutEp >= (long)curTurnout->endCnt) {
 			curTurnoutEp = 0;
+		}
 		Dto.state = 1;
-		PlaceTurnout( pos, Dto.trk );
-		CreateMoveAnchor(pos);
+		PlaceTurnout(pos, Dto.trk);
 		return C_CONTINUE;
 
 	case C_UP:
-		DYNARR_RESET(trkSeg_t,anchors_da);
-		CreateMoveAnchor(pos);
-		InfoMessage( _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel") );
+		DYNARR_RESET(trkSeg_t, anchors_da);
+		InfoMessage(
+		        _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel"));
 		return C_CONTINUE;
 
 	case C_RDOWN:
-		DYNARR_RESET(trkSeg_t,anchors_da);
-		if ( curTurnout == NULL ) return C_CONTINUE;
+		DYNARR_RESET(trkSeg_t, anchors_da);
+		if (curTurnout == NULL) { return C_CONTINUE; }
 		if (Dto.state == 0) {
 			Dto.pos = pos;      // If first, use pos, otherwise use current
-LOG( log_turnout, 1, ( "RDOWN @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y ) );
+			LOG(log_turnout, 1, ("RDOWN @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y));
 		}
 		Dto.rot0 = Dto.rot1 = pos;
-		CreateRotateAnchor(pos);
 		Dto.state = 2;
 		origPos = Dto.pos;
 #ifdef NEWROTATE
 		origAngle = Dto.angle;
 #else
-		Rotate( &origPos, Dto.rot0, -(Dto.angle + curTurnout->endPt[(int)curTurnoutEp].angle) );
+		Rotate(&origPos, Dto.rot0,
+		       -(Dto.angle + GetEndPtAngle(EndPtIndex(curTurnout->endPt,
+		                                   (EPINX_T)curTurnoutEp))));
 #endif
 		validAngle = FALSE;
 		return C_CONTINUE;
 
 	case C_RMOVE:
-		DYNARR_RESET(trkSeg_t,anchors_da);
-		if ( curTurnout == NULL ) return C_CONTINUE;
+		DYNARR_RESET(trkSeg_t, anchors_da);
+		if (curTurnout == NULL) { return C_CONTINUE; }
 		Dto.rot1 = pos;
-		if ( FindDistance(Dto.rot0, Dto.rot1) > 0.1*mainD.scale ) {
-			angle = FindAngle( Dto.rot0, Dto.rot1 );
+		if (FindDistance(Dto.rot0, Dto.rot1) > 0.1 * mainD.scale) {
+			angle = FindAngle(Dto.rot0, Dto.rot1);
 			if (!validAngle) {
+#ifdef NEWROTATE
 				baseAngle = angle/* - Dto.angle*/;
+#endif
 				validAngle = TRUE;
 			}
 			Dto.pos = origPos;
-LOG( log_turnout, 1, ( "RMOVE pre @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y ) );
+			LOG(log_turnout, 1, ("RMOVE pre @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y));
 #ifdef NEWROTATE
 			angle -= baseAngle;
-			Dto.angle = NormalizeAngle( origAngle + angle );
+			Dto.angle = NormalizeAngle(origAngle + angle);
 #else
 			angle += 180.0;
-			Dto.angle = angle - curTurnout->endPt[(int)curTurnoutEp].angle;
+			Dto.angle = angle - GetEndPtAngle(EndPtIndex(curTurnout->endPt,
+			                                  (EPINX_T)curTurnoutEp));
 #endif
-			Rotate( &Dto.pos, Dto.rot0, angle );
-LOG( log_turnout, 1, ( "RMOVE post @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y ) );
+			Rotate(&Dto.pos, Dto.rot0, angle);
+			LOG(log_turnout, 1, ("RMOVE post @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y));
 		}
-		FormatCompoundTitle( listLabels, curTurnout->title );
-		InfoMessage( _("Angle = %0.3f (%s)"), PutAngle( NormalizeAngle(Dto.angle + 90.0) ), message );
+		FormatCompoundTitle(listLabels, curTurnout->title);
+		InfoMessage(_("Angle = %0.3f (%s)"), PutAngle(NormalizeAngle(Dto.angle + 90.0)),
+		            message);
 		Dto.state = 2;
-		CreateRotateAnchor(Dto.rot0);
 		return C_CONTINUE;
 
 	case C_RUP:
-		DYNARR_RESET(trkSeg_t,anchors_da);
-		if ( curTurnout == NULL ) return C_CONTINUE;
+		DYNARR_RESET(trkSeg_t, anchors_da);
+		if (curTurnout == NULL) { return C_CONTINUE; }
 		Dto.state = 1;
-		CreateMoveAnchor(pos);
-		InfoMessage( _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel") );
+		InfoMessage(
+		        _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel"));
 		return C_CONTINUE;
 
 	case C_LCLICK:
-		DYNARR_RESET(trkSeg_t,anchors_da);
-		if ( curTurnout == NULL ) return C_CONTINUE;
-		if ( MyGetKeyState() & WKEY_SHIFT ) {
-			angle = curTurnout->endPt[(int)curTurnoutEp].angle;
+		DYNARR_RESET(trkSeg_t, anchors_da);
+		if (curTurnout == NULL) { return C_CONTINUE; }
+		if (MyGetKeyState() & WKEY_SHIFT) {
+			angle = GetEndPtAngle( EndPtIndex( curTurnout->endPt, (EPINX_T)curTurnoutEp ) );
 			curTurnoutEp++;
-			if (curTurnoutEp >= (long)curTurnout->endCnt)
+			if (curTurnoutEp >= (long)curTurnout->endCnt) {
 				curTurnoutEp = 0;
-			if (Dto.trk == NULL)
-				Dto.angle = NormalizeAngle( Dto.angle + (angle - curTurnout->endPt[(int)curTurnoutEp].angle ) );
-			PlaceTurnout( Dto.place, Dto.trk );
+			}
+			if (Dto.trk == NULL) {
+				Dto.angle = NormalizeAngle(Dto.angle + (angle - GetEndPtAngle( EndPtIndex(
+				                curTurnout->endPt, (EPINX_T)curTurnoutEp))));
+			}
+			PlaceTurnout(Dto.place, Dto.trk);
 		} else {
-			CmdTurnoutAction( C_DOWN, pos );
-			CmdTurnoutAction( C_UP, pos );
+			CmdTurnoutAction(C_DOWN, pos);
+			CmdTurnoutAction(C_UP, pos);
 		}
 		return C_CONTINUE;
 
 	case C_REDRAW:
+		wSetCursor(mainD.d, defaultCursor);
 		if (Dto.state) {
-			DrawSegs( &tempD, Dto.pos, Dto.angle,
-				curTurnout->segs, curTurnout->segCnt, trackGauge, wDrawColorBlue );
+			DrawSegs(&tempD, Dto.pos, Dto.angle,
+			         curTurnout->segs, curTurnout->segCnt, trackGauge, selectedColor);
 		}
-		if (anchors_da.cnt>0) {
-			DrawSegs( &tempD, zero, 0.0, &anchors(0), anchors_da.cnt, trackGauge, wDrawColorBlack );
+		DrawSegsDA(&tempD, NULL, zero, 0.0, &anchors_da, trackGauge, wDrawColorBlack,
+		           0 );
+		if (anchors_da.cnt > 0) {
+			wSetCursor(mainD.d, wCursorNone);
+		}
+		if (Dto.state == 2) {
+			DrawLine(&tempD, Dto.rot0, Dto.rot1, 0, wDrawColorBlue);
 		}
-		if (Dto.state == 2)
-			DrawLine( &tempD, Dto.rot0, Dto.rot1, 0, wDrawColorBlack );
 		return C_CONTINUE;
 
 	case C_CANCEL:
-		DYNARR_RESET(trkSeg_t,anchors_da);
+		DYNARR_RESET(trkSeg_t, anchors_da);
 		Dto.state = 0;
 		Dto.trk = NULL;
 		/*wHide( newTurn.reg.win );*/
 		return C_TERMINATE;
 
 	case C_TEXT:
-		if ((action>>8) != ' ') 
+		if ((action >> 8) != ' ') {
 			return C_CONTINUE;
-		/*no break*/
+		}
+	/*no break*/
 	case C_OK:
-		DYNARR_RESET(trkSeg_t,anchors_da);
+		DYNARR_RESET(trkSeg_t, anchors_da);
 		AddTurnout();
-		Dto.state=0;
+		Dto.state = 0;
 		Dto.trk = NULL;
 		return C_TERMINATE;
 
 	case C_FINISH:
-		DYNARR_RESET(trkSeg_t,anchors_da);
-		if (Dto.state != 0 && Dto.trk != NULL)
-			CmdTurnoutAction( C_OK, pos );
-		else
-			CmdTurnoutAction( C_CANCEL, pos );
+		DYNARR_RESET(trkSeg_t, anchors_da);
+		if (Dto.state != 0 && Dto.trk != NULL) {
+			CmdTurnoutAction(C_OK, pos);
+		} else {
+			CmdTurnoutAction(C_CANCEL, pos);
+		}
 		return C_TERMINATE;
 
 	case C_CMDMENU:
 		menuPos = pos;
-		wMenuPopupShow( turnoutPopupM );
+		wMenuPopupShow(turnoutPopupM);
 		return C_CONTINUE;
 
 	default:
@@ -2919,83 +2948,92 @@ LOG( log_turnout, 1, ( "RMOVE post @ %0.3fx%0.3f\n", Dto.pos.x, Dto.pos.y ) );
 
 #ifdef TURNOUTCMD
 static STATUS_T CmdTurnout(
-		wAction_t action,
-		coOrd pos )
+        wAction_t action,
+        coOrd pos)
 {
 	wIndex_t turnoutIndex;
-	turnoutInfo_t * turnoutPtr;
+	turnoutInfo_t* turnoutPtr;
 
 	switch (action & 0xFF) {
 
 	case C_START:
 		if (turnoutW == NULL) {
-/*			turnoutW = ParamCreateDialog( &turnoutPG, MakeWindowTitle("Turnout"), "Ok", , (paramActionCancelProc)Reset, TRUE, NULL, F_RESIZE|F_RECALLSIZE, TurnoutDlgUpdate ); */
-			turnoutW = ParamCreateDialog( &turnoutPG, MakeWindowTitle(_("Turnout")), _("Close"), (paramActionOkProc)TurnoutOk, wHide, TRUE, NULL, F_RESIZE|F_RECALLSIZE|PD_F_ALT_CANCELLABEL, TurnoutDlgUpdate );
-			InitNewTurn( turnoutNewM );
+			/*			turnoutW = ParamCreateDialog( &turnoutPG, MakeWindowTitle("Fixed-Track"), "Ok", , (paramActionCancelProc)Reset, TRUE, NULL, F_RESIZE|F_RECALLSIZE, TurnoutDlgUpdate ); */
+			turnoutW = ParamCreateDialog(&turnoutPG, MakeWindowTitle(_("Add Fixed-Track")),
+			                             _("Close"), (paramActionOkProc)TurnoutOk, wHide, TRUE, NULL,
+			                             F_RESIZE | F_RECALLSIZE | PD_F_ALT_CANCELLABEL, TurnoutDlgUpdate);
+			InitNewTurn(turnoutNewM);
 		}
-/*		ParamDialogOkActive( &turnoutPG, FALSE ); */
-		turnoutIndex = wListGetIndex( turnoutListL );
+		/*		ParamDialogOkActive( &turnoutPG, FALSE ); */
+		turnoutIndex = wListGetIndex(turnoutListL);
 		turnoutPtr = curTurnout;
-		wShow( turnoutW );
-		TurnoutChange( CHANGE_PARAMS|CHANGE_SCALE );
+		wShow(turnoutW);
+		TurnoutChange(CHANGE_PARAMS | CHANGE_SCALE);
 		if (curTurnout == NULL) {
-			NoticeMessage2( 0, MSG_TURNOUT_NO_TURNOUT, _("Ok"), NULL );
+			NoticeMessage2(0, MSG_TURNOUT_NO_TURNOUT, _("Ok"), NULL);
 			return C_TERMINATE;
 		}
 		if (turnoutIndex > 0 && turnoutPtr) {
 			curTurnout = turnoutPtr;
-			wListSetIndex( turnoutListL, turnoutIndex );
-			RedrawTurnout();
+			wListSetIndex(turnoutListL, turnoutIndex);
+			RedrawTurnout( turnoutD.d, NULL, 0, 0 );
 		}
-		InfoMessage( _("Pick turnout and active End Point, then place on the layout"));
-		ParamLoadControls( &turnoutPG );
-		ParamGroupRecord( &turnoutPG );
-		return CmdTurnoutAction( action, pos );
+		InfoMessage(_("Pick turnout and active End Point, then place on the layout"));
+		ParamLoadControls(&turnoutPG);
+		ParamGroupRecord(&turnoutPG);
+		SetAllTrackSelect(FALSE);
+		return CmdTurnoutAction(action, pos);
 
 	case wActionMove:
-		return CmdTurnoutAction( action, pos );
+		return CmdTurnoutAction(action, pos);
 
 	case C_DOWN:
 	case C_RDOWN:
-		ParamDialogOkActive( &turnoutPG, TRUE );
-		if (hideTurnoutWindow)
-			wHide( turnoutW );
-		 if (((action&0xFF) == C_DOWN) && (MyGetKeyState()&WKEY_CTRL))
-			return CmdTurnoutAction(C_RDOWN, pos);     //Convert CTRL into Right
-		/*no break*/
+		ParamDialogOkActive(&turnoutPG, TRUE);
+		if (hideTurnoutWindow) {
+			wHide(turnoutW);
+		}
+		if (((action & 0xFF) == C_DOWN) && (MyGetKeyState() & WKEY_CTRL)) {
+			return CmdTurnoutAction(C_RDOWN, pos);        //Convert CTRL into Right
+		}
+	/*no break*/
 	case C_MOVE:
-		if (MyGetKeyState()&WKEY_CTRL)
-			return CmdTurnoutAction (C_RMOVE, pos);
-		/*no break*/
+		if (MyGetKeyState() & WKEY_CTRL) {
+			return CmdTurnoutAction(C_RMOVE, pos);
+		}
+	/*no break*/
 	case C_RMOVE:
-		return CmdTurnoutAction( action, pos );
+		return CmdTurnoutAction(action, pos);
 
 	case C_UP:
 	case C_RUP:
-		if (hideTurnoutWindow)
-			wShow( turnoutW );
+		if (hideTurnoutWindow) {
+			wShow(turnoutW);
+		}
 
-		InfoMessage( _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel") );
-		if (((action&0xFF) == C_UP) && (MyGetKeyState()&WKEY_CTRL))
-						return CmdTurnoutAction (C_RUP, pos);
-		return CmdTurnoutAction( action, pos );
+		InfoMessage(
+		        _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel"));
+		if (((action & 0xFF) == C_UP) && (MyGetKeyState() & WKEY_CTRL)) {
+			return CmdTurnoutAction(C_RUP, pos);
+		}
+		return CmdTurnoutAction(action, pos);
 
 	case C_LCLICK:
-		CmdTurnoutAction( action, pos );
+		CmdTurnoutAction(action, pos);
 		HilightEndPt();
 		return C_CONTINUE;
 
 	case C_CANCEL:
-		wHide( turnoutW );
-		return CmdTurnoutAction( action, pos );
+		wHide(turnoutW);
+		return CmdTurnoutAction(action, pos);
 	case C_TEXT:
-		CmdTurnoutAction( action, pos );
+		CmdTurnoutAction(action, pos);
 		return C_CONTINUE;
 	case C_OK:
 	case C_FINISH:
 	case C_CMDMENU:
 	case C_REDRAW:
-		return CmdTurnoutAction( action, pos );
+		return CmdTurnoutAction(action, pos);
 
 	default:
 		return C_CONTINUE;
@@ -3003,59 +3041,64 @@ static STATUS_T CmdTurnout(
 }
 
 #endif
-
+
 /**
  * Event procedure for the hotbar.
  *
  * \param op   IN requested function
- * \param data IN	pointer to info on selected element	
+ * \param data IN	pointer to info on selected element
  * \param d    IN
  * \param origP IN
- * \return   
+ * \return
  */
 
-static char * CmdTurnoutHotBarProc(
-		hotBarProc_e op,
-		void * data,
-		drawCmd_p d,
-		coOrd * origP )
+static char* CmdTurnoutHotBarProc(
+        hotBarProc_e op,
+        void* data,
+        drawCmd_p d,
+        coOrd* origP)
 {
-	turnoutInfo_t * to = (turnoutInfo_t*)data;
-	switch ( op ) {
+	turnoutInfo_t* to = (turnoutInfo_t*)data;
+	switch (op) {
 	case HB_SELECT:		/* new element is selected */
-		CmdTurnoutAction( C_FINISH, zero ); 		/* finish current operation */
+		CmdTurnoutAction(C_FINISH, zero); 		/* finish current operation */
 		curTurnout = to;
-		DoCommandB( (void*)(intptr_t)turnoutHotBarCmdInx ); /* continue with new turnout / structure */
+		DoCommandB(I2VP(
+		                   turnoutHotBarCmdInx)); /* continue with new turnout / structure */
 		return NULL;
 	case HB_LISTTITLE:
-		FormatCompoundTitle( listLabels, to->title );
-		if (message[0] == '\0')
-			FormatCompoundTitle( listLabels|LABEL_DESCR, to->title );
+		FormatCompoundTitle(listLabels, to->title);
+		if (message[0] == '\0') {
+			FormatCompoundTitle(listLabels | LABEL_DESCR, to->title);
+		}
 		return message;
 	case HB_BARTITLE:
-		FormatCompoundTitle( hotBarLabels<<1, to->title );
+		FormatCompoundTitle(hotBarLabels << 1, to->title);
 		return message;
 	case HB_FULLTITLE:
 		return to->title;
 	case HB_DRAW:
-		DrawSegs( d, *origP, 0.0, to->segs, to->segCnt, trackGauge, wDrawColorBlack );
+		DrawSegs(d, *origP, 0.0, to->segs, to->segCnt, trackGauge, wDrawColorBlack);
 		return NULL;
 	}
 	return NULL;
 }
 
 
-EXPORT void AddHotBarTurnouts( void )
+EXPORT void AddHotBarTurnouts(void)
 {
 	wIndex_t inx;
-	turnoutInfo_t * to;
-	for ( inx=0; inx < turnoutInfo_da.cnt; inx ++ ) {
+	turnoutInfo_t* to;
+	for (inx = 0; inx < turnoutInfo_da.cnt; inx++) {
 		to = turnoutInfo(inx);
-		if ( !( IsParamValid(to->paramFileIndex) &&
-				to->segCnt > 0 &&
-				CompatibleScale( TRUE, to->scaleInx, GetLayoutCurScale()) ) )
-				continue;
-		AddHotBarElement( to->contentsLabel, to->size, to->orig, TRUE, FALSE, to->barScale, to, CmdTurnoutHotBarProc );
+		if (!(IsParamValid(to->paramFileIndex) &&
+		      to->segCnt > 0 &&
+		      (FIT_NONE != CompatibleScale(FIT_TURNOUT, to->scaleInx,
+		                                   GetLayoutCurScale())))) {
+			continue;
+		}
+		AddHotBarElement(to->contentsLabel, to->size, to->orig, TRUE, FALSE,
+		                 to->barScale, to, CmdTurnoutHotBarProc);
 	}
 }
 
@@ -3068,8 +3111,8 @@ EXPORT void AddHotBarTurnouts( void )
  */
 
 static STATUS_T CmdTurnoutHotBar(
-		wAction_t action,
-		coOrd pos )
+        wAction_t action,
+        coOrd pos)
 {
 
 	switch (action & 0xFF) {
@@ -3077,158 +3120,168 @@ static STATUS_T CmdTurnoutHotBar(
 	case C_START:
 		//TurnoutChange( CHANGE_PARAMS|CHANGE_SCALE );
 		if (curTurnout == NULL) {
-			NoticeMessage2( 0, MSG_TURNOUT_NO_TURNOUT, _("Ok"), NULL );
+			NoticeMessage2(0, MSG_TURNOUT_NO_TURNOUT, _("Ok"), NULL);
 			return C_TERMINATE;
 		}
-		FormatCompoundTitle( listLabels|LABEL_DESCR, curTurnout->title );
-		InfoMessage( _("Place %s and draw into position"), message );
-        wIndex_t listIndex = FindListItemByContext( turnoutListL, curTurnout );
-        if ( listIndex > 0 )
-                turnoutInx = listIndex;
-        ParamLoadControls( &turnoutPG );
-        ParamGroupRecord( &turnoutPG );
-		return CmdTurnoutAction( action, pos );
+		FormatCompoundTitle(listLabels | LABEL_DESCR, curTurnout->title);
+		InfoMessage(_("Place %s and draw into position"), message);
+		wIndex_t listIndex = FindListItemByContext(turnoutListL, curTurnout);
+		if (listIndex >= 0) {
+			turnoutInx = listIndex;
+		}
+		ParamLoadControls(&turnoutPG);
+		ParamGroupRecord(&turnoutPG);
+		return CmdTurnoutAction(action, pos);
 
 	case wActionMove:
-		return CmdTurnoutAction( action, pos );
+		return CmdTurnoutAction(action, pos);
 
 	case C_DOWN:
-		if (MyGetKeyState()&WKEY_CTRL) {
-			return CmdTurnoutAction( C_RDOWN, pos );
+		if (MyGetKeyState() & WKEY_CTRL) {
+			return CmdTurnoutAction(C_RDOWN, pos);
 		}
-		/*no break*/
+	/*no break*/
 	case C_RDOWN:
-		return CmdTurnoutAction( action, pos );
+		return CmdTurnoutAction(action, pos);
 
 	case C_MOVE:
-		if (MyGetKeyState()&WKEY_CTRL) {
-			return CmdTurnoutAction( C_RMOVE, pos );
+		if (MyGetKeyState() & WKEY_CTRL) {
+			return CmdTurnoutAction(C_RMOVE, pos);
 		}
-		/*no break*/
+	/*no break*/
 	case C_RMOVE:
-		return CmdTurnoutAction( action, pos );
+		return CmdTurnoutAction(action, pos);
 
 	case C_UP:
-		if (MyGetKeyState()&WKEY_CTRL) {
-			return CmdTurnoutAction( C_RUP, pos );
+		if (MyGetKeyState() & WKEY_CTRL) {
+			return CmdTurnoutAction(C_RUP, pos);
 		}
-		/*no break*/
+	/*no break*/
 	case C_RUP:
-		InfoMessage( _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel") );
-		return CmdTurnoutAction( action, pos );
+		InfoMessage(
+		        _("Left-Drag to place, Ctrl+Left-Drag or Right-Drag to Rotate, Space or Enter to accept, Esc to Cancel"));
+		return CmdTurnoutAction(action, pos);
 
 	case C_REDRAW:
-			return CmdTurnoutAction( action, pos );
+		return CmdTurnoutAction(action, pos);
 	case C_TEXT:
-		if ((action>>8) != ' ')
+		if ((action >> 8) != ' ') {
 			return C_CONTINUE;
-		/* no break*/
+		}
+	/* no break*/
 	case C_OK:
-		CmdTurnoutAction( action, pos );
+		CmdTurnoutAction(action, pos);
 		return C_CONTINUE;
 
 	case C_CANCEL:
 		HotBarCancel();
-		/*no break*/
+	/*no break*/
 	default:
-		return CmdTurnoutAction( action, pos );
+		return CmdTurnoutAction(action, pos);
 	}
 }
 
 #ifdef TURNOUTCMD
-#include "bitmaps/turnout.xpm"
+#include "bitmaps/turnout.xpm3"
 
 
-EXPORT void InitCmdTurnout( wMenu_p menu )
+EXPORT void InitCmdTurnout(wMenu_p menu)
 {
-	AddMenuButton( menu, CmdTurnout, "cmdTurnout", _("Predefined Track"), wIconCreatePixMap(turnout_xpm), LEVEL0_50, IC_WANT_MOVE|IC_STICKY|IC_LCLICK|IC_CMDMENU|IC_POPUP2, ACCL_TURNOUT, NULL );
-	turnoutHotBarCmdInx = AddMenuButton( menu, CmdTurnoutHotBar, "cmdTurnoutHotBar", "", NULL, LEVEL0_50, IC_WANT_MOVE|IC_STICKY|IC_LCLICK|IC_CMDMENU|IC_POPUP2, 0, NULL );
-	RegisterChangeNotification( TurnoutChange );
-	ParamRegister( &turnoutPG );
-	log_turnout = LogFindIndex( "turnout" );
-	log_traverseTurnout = LogFindIndex( "traverseTurnout" );
-	log_suppressCheckPaths = LogFindIndex( "suppresscheckpaths" );
-	log_splitturnout = LogFindIndex( "splitturnout" );
-	if ( turnoutPopupM == NULL ) {
-		turnoutPopupM = MenuRegister( "Turnout Rotate" );
-		AddRotateMenu( turnoutPopupM, TurnoutRotate );
+	AddMenuButton(menu, CmdTurnout, "cmdNewFixedTrack", _("Fixed-Track"),
+	              wIconCreatePixMap(turnout_xpm3[iconSize]), LEVEL0_50,
+	              IC_WANT_MOVE | IC_STICKY | IC_LCLICK | IC_CMDMENU | IC_POPUP2, ACCL_TURNOUT,
+	              NULL);
+	turnoutHotBarCmdInx = AddMenuButton(menu, CmdTurnoutHotBar, "cmdTurnoutHotBar",
+	                                    "", NULL, LEVEL0_50, IC_WANT_MOVE | IC_STICKY | IC_LCLICK | IC_CMDMENU |
+	                                    IC_POPUP2, 0, NULL);
+	RegisterChangeNotification(TurnoutChange);
+	ParamRegister(&turnoutPG);
+	log_turnout = LogFindIndex("turnout");
+	log_traverseTurnout = LogFindIndex("traverseTurnout");
+	log_suppressCheckPaths = LogFindIndex("suppresscheckpaths");
+	log_splitturnout = LogFindIndex("splitturnout");
+	if (turnoutPopupM == NULL) {
+		turnoutPopupM = MenuRegister("Turnout Rotate");
+		AddRotateMenu(turnoutPopupM, TurnoutRotate);
 	}
 }
 #endif
 
-EXPORT void InitTrkTurnout( void )
+EXPORT void InitTrkTurnout(void)
 {
-	T_TURNOUT = InitObject( &turnoutCmds );
+	T_TURNOUT = InitObject(&turnoutCmds);
 
 	/*InitDebug( "Turnout", &debugTurnout );*/
-	AddParam( "TURNOUT ", ReadTurnoutParam);
+	AddParam("TURNOUT ", ReadTurnoutParam);
 }
-
+
 #ifdef TEST
 
 wDrawable_t turnoutD;
 
-void wListAddValue( wList_p bl, char * val, wIcon_p, void * listData, void * itemData )
+void wListAddValue(wList_p bl, char* val, wIcon_p, void* listData,
+                   void* itemData)
 {
 }
 
-void wListClear( wList_p bl )
+void wListClear(wList_p bl)
 {
 }
 
-void wDrawSetScale( wDrawable_p d )
+void wDrawSetScale(wDrawable_p d)
 {
 	d->scale = 1.0;
 }
 
-void wDrawClear( wDrawable_p d )
+void wDrawClear(wDrawable_p d)
 {
 }
 
-void GetTrkCurveCenter( track_p t, coOrd *pos, DIST_T *radius )
+void GetTrkCurveCenter(track_p t, coOrd* pos, DIST_T* radius)
 {
 }
 
 #ifdef NOTRACK_C
 
-track_p NewTrack( wIndex_t index, TRKTYP_T type, EPINX_T endCnt, SIZE_T extraSize )
+track_p NewTrack(wIndex_t index, TRKTYP_T type, EPINX_T endCnt,
+                 SIZE_T extraSize)
 {
 	return NULL;
 }
 
-track_p OnTrack( coOrd *pos )
+track_p OnTrack(coOrd* pos)
 {
 	return NULL;
 }
 
-void ErrorMessage( char * msg, ... )
+void ErrorMessage(char* msg, ...)
 {
-	lprintf( "ERROR : %s\n", msg );
+	lprintf("ERROR : %s\n", msg);
 }
 
-void DeleteTrack( track_p t )
+void DeleteTrack(track_p t)
 {
 }
 
-void ConnectTracks( track_p t0, EPINX_T ep0, track_p t1, EPINX_T ep1 )
+void ConnectTracks(track_p t0, EPINX_T ep0, track_p t1, EPINX_T ep1)
 {
 }
 #endif
 
-main( INT_T argc, char * argv[] )
+main(INT_T argc, char* argv[])
 {
-	FILE * f;
+	FILE* f;
 	char line[STR_SIZE];
 	wIndex_t lineCnt = 0;
 
 	/*debugTurnout = 3;*/
-	if ((f = fopen("turnout.params", "r" )) == NULL ) {
-		Perror( "turnout.params" );
+	if ((f = fopen("turnout.params", "r")) == NULL) {
+		Perror("turnout.params");
 		Exit(1);
 	}
-	while ( fgets( line, sizeof line, f ) != NULL ) {
+	while (fgets(line, sizeof line, f) != NULL) {
 		lineCnt++;
-		ReadTurnoutParam( &lineCnt );
+		ReadTurnoutParam(&lineCnt);
 	}
 }
 #endif