Index: trunk/tests/RTT/ref/elem_pads.gbr/elem_pads.top.gbr
===================================================================
--- trunk/tests/RTT/ref/elem_pads.gbr/elem_pads.top.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/elem_pads.gbr/elem_pads.top.gbr	(revision 17363)
@@ -23,13 +23,7 @@
 Y43740D01*
 G37*
 G36*
-X23150Y21250D02*X21650D01*
-Y17750D01*
-X23150D01*
-Y21250D01*
-G37*
-G36*
-Y14250D02*X21650D01*
+X23150Y14250D02*X21650D01*
 Y10750D01*
 X23150D01*
 Y14250D01*
@@ -52,4 +46,10 @@
 X25750D01*
 Y21250D01*
 G37*
+G36*
+X23150D02*X21650D01*
+Y17750D01*
+X23150D01*
+Y21250D01*
+G37*
 M02*
Index: trunk/tests/RTT/ref/elem_pads.gbr/elem_pads.topmask.gbr
===================================================================
--- trunk/tests/RTT/ref/elem_pads.gbr/elem_pads.topmask.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/elem_pads.gbr/elem_pads.topmask.gbr	(revision 17363)
@@ -23,13 +23,7 @@
 Y44040D01*
 G37*
 G36*
-X23450Y21550D02*X21350D01*
-Y17450D01*
-X23450D01*
-Y21550D01*
-G37*
-G36*
-Y14550D02*X21350D01*
+X23450Y14550D02*X21350D01*
 Y10450D01*
 X23450D01*
 Y14550D01*
@@ -52,4 +46,10 @@
 X26050D01*
 Y21550D01*
 G37*
+G36*
+X23450D02*X21350D01*
+Y17450D01*
+X23450D01*
+Y21550D01*
+G37*
 M02*
Index: trunk/tests/RTT/ref/elem_pads.gbr/elem_pads.toppaste.gbr
===================================================================
--- trunk/tests/RTT/ref/elem_pads.gbr/elem_pads.toppaste.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/elem_pads.gbr/elem_pads.toppaste.gbr	(revision 17363)
@@ -23,13 +23,7 @@
 Y43740D01*
 G37*
 G36*
-X23150Y21250D02*X21650D01*
-Y17750D01*
-X23150D01*
-Y21250D01*
-G37*
-G36*
-Y14250D02*X21650D01*
+X23150Y14250D02*X21650D01*
 Y10750D01*
 X23150D01*
 Y14250D01*
@@ -52,4 +46,10 @@
 X25750D01*
 Y21250D01*
 G37*
+G36*
+X23150D02*X21650D01*
+Y17750D01*
+X23150D01*
+Y21250D01*
+G37*
 M02*
Index: trunk/tests/RTT/ref/elem_pins.gbr/elem_pins.topsilk.gbr
===================================================================
--- trunk/tests/RTT/ref/elem_pins.gbr/elem_pins.topsilk.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/elem_pins.gbr/elem_pins.topsilk.gbr	(revision 17363)
@@ -15,11 +15,11 @@
 X42500D02*X2500D01*
 Y42500D02*X17500D01*
 X2500Y22500D02*Y12500D01*
-Y22500D02*X17500D01*
-X27500D02*X42500D01*
+X27500Y22500D02*X42500D01*
 Y12500D02*X2500D01*
 X42500D02*Y22500D01*
-Y32500D02*Y42500D01*
+X2500D02*X17500D01*
+X42500Y32500D02*Y42500D01*
 X27500D02*X42500D01*
 X17500D02*G75*G03X27500Y42500I5000J0D01*G01*
 X17500Y22500D02*G75*G03X27500Y22500I5000J0D01*G01*
Index: trunk/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottom.gbr
===================================================================
--- trunk/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottom.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottom.gbr	(revision 17363)
@@ -11,15 +11,15 @@
 %LNBOTTOM*%
 %ADD12C,0.0001*%
 G54D12*G36*
-X14036Y18740D02*X19154D01*
+X14036Y11260D02*X19154D01*
+Y18740D01*
+X14036D01*
 Y11260D01*
-X14036D01*
-Y18740D01*
 G37*
 G36*
 X25846D02*X30964D01*
+Y18740D01*
+X25846D01*
 Y11260D01*
-X25846D01*
-Y18740D01*
 G37*
 M02*
Index: trunk/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottommask.gbr
===================================================================
--- trunk/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottommask.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottommask.gbr	(revision 17363)
@@ -11,15 +11,15 @@
 %LNBOTTOMMASK*%
 %ADD14C,0.0001*%
 G54D14*G36*
-X13736Y19040D02*X19454D01*
+X13736Y10960D02*X19454D01*
+Y19040D01*
+X13736D01*
 Y10960D01*
-X13736D01*
-Y19040D01*
 G37*
 G36*
 X25546D02*X31264D01*
+Y19040D01*
+X25546D01*
 Y10960D01*
-X25546D01*
-Y19040D01*
 G37*
 M02*
Index: trunk/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottompaste.gbr
===================================================================
--- trunk/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottompaste.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottompaste.gbr	(revision 17363)
@@ -11,15 +11,15 @@
 %LNBOTTOMPASTE*%
 %ADD20C,0.0001*%
 G54D20*G36*
-X14036Y18740D02*X19154D01*
+X14036Y11260D02*X19154D01*
+Y18740D01*
+X14036D01*
 Y11260D01*
-X14036D01*
-Y18740D01*
 G37*
 G36*
 X25846D02*X30964D01*
+Y18740D01*
+X25846D01*
 Y11260D01*
-X25846D01*
-Y18740D01*
 G37*
 M02*
Index: trunk/tests/RTT/ref/padrot.gbr/padrot.top.gbr
===================================================================
--- trunk/tests/RTT/ref/padrot.gbr/padrot.top.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/padrot.gbr/padrot.top.gbr	(revision 17363)
@@ -19,8 +19,7 @@
 Y45500D01*
 X19500D01*
 G37*
-G54D11*X12500Y20000D02*X19443Y17164D01*
-G54D12*G36*
+G36*
 X5500Y23000D02*X4500D01*
 Y14500D01*
 X5500D01*
@@ -33,7 +32,8 @@
 X28510Y29697D01*
 X22500Y35707D01*
 G37*
-G36*
+G54D11*X12500Y20000D02*X19443Y17164D01*
+G54D12*G36*
 X27226Y20652D02*X26848Y19726D01*
 X34717Y16512D01*
 X35095Y17438D01*
Index: trunk/tests/RTT/ref/padrot.gbr/padrot.topmask.gbr
===================================================================
--- trunk/tests/RTT/ref/padrot.gbr/padrot.topmask.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/padrot.gbr/padrot.topmask.gbr	(revision 17363)
@@ -19,8 +19,7 @@
 Y47500D01*
 X17500D01*
 G37*
-G54D13*X12500Y20000D02*X19443Y17164D01*
-G54D14*G36*
+G36*
 X7500Y25000D02*X2500D01*
 Y12500D01*
 X7500D01*
@@ -33,7 +32,8 @@
 X31339Y29697D01*
 X22500Y38536D01*
 G37*
-G36*
+G54D13*X12500Y20000D02*X19443Y17164D01*
+G54D14*G36*
 X26131Y23260D02*X24240Y18631D01*
 X35812Y13904D01*
 X37703Y18533D01*
Index: trunk/tests/RTT/ref/padrot.gbr/padrot.toppaste.gbr
===================================================================
--- trunk/tests/RTT/ref/padrot.gbr/padrot.toppaste.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/padrot.gbr/padrot.toppaste.gbr	(revision 17363)
@@ -19,8 +19,7 @@
 Y45500D01*
 X19500D01*
 G37*
-G54D17*X12500Y20000D02*X19443Y17164D01*
-G54D18*G36*
+G36*
 X5500Y23000D02*X4500D01*
 Y14500D01*
 X5500D01*
@@ -33,7 +32,8 @@
 X28510Y29697D01*
 X22500Y35707D01*
 G37*
-G36*
+G54D17*X12500Y20000D02*X19443Y17164D01*
+G54D18*G36*
 X27226Y20652D02*X26848Y19726D01*
 X34717Y16512D01*
 X35095Y17438D01*
Index: trunk/tests/RTT/ref/padrot.gbr/padrot.topsilk.gbr
===================================================================
--- trunk/tests/RTT/ref/padrot.gbr/padrot.topsilk.gbr	(revision 17362)
+++ trunk/tests/RTT/ref/padrot.gbr/padrot.topsilk.gbr	(revision 17363)
@@ -15,9 +15,26 @@
 Y47500D01*
 X2500D01*
 Y42500D02*Y47500D01*
+Y40000D02*X7500D01*
+Y27500D01*
+X2500Y40000D02*Y27500D01*
+X7500D01*
+X2500Y25000D02*Y12500D01*
+X7500D01*
+Y25000D02*Y12500D01*
+X2500Y25000D02*X7500D01*
+X17500Y42500D02*X30000D01*
+Y47500D02*Y42500D01*
+X17500Y47500D02*X30000D01*
+X17500D02*Y42500D01*
 X8964Y35000D02*X12500Y38536D01*
+X8964Y35000D02*X17803Y26161D01*
+X12500Y38536D02*X21339Y29697D01*
 X17803Y26161D02*X21339Y29697D01*
-X12500Y38536D02*X21339Y29697D01*
+X18964Y35000D02*X27803Y26161D01*
+X31339Y29697D01*
+X22500Y38536D02*X31339Y29697D01*
+X18964Y35000D02*X22500Y38536D01*
 X9240Y18631D02*X20812Y13904D01*
 X22703Y18533D01*
 X24240Y18631D02*X35812Y13904D01*
@@ -26,23 +43,6 @@
 X26131Y23260D02*X37703Y18533D01*
 X24240Y18631D02*X26131Y23260D01*
 X9240Y18631D02*X11131Y23260D01*
-X2500Y27500D02*X7500D01*
-X8964Y35000D02*X17803Y26161D01*
-X18964Y35000D02*X27803Y26161D01*
-X31339Y29697D01*
-X22500Y38536D02*X31339Y29697D01*
-X18964Y35000D02*X22500Y38536D01*
-X2500Y40000D02*X7500D01*
-X2500D02*Y27500D01*
-X17500Y42500D02*X30000D01*
-Y47500D02*Y42500D01*
-X17500Y47500D02*X30000D01*
-X17500D02*Y42500D01*
-X7500Y40000D02*Y27500D01*
-X2500Y25000D02*Y12500D01*
-X7500D01*
-Y25000D02*Y12500D01*
-X2500Y25000D02*X7500D01*
 G54D16*X1500Y48500D02*X2600D01*
 X2875Y48225D01*
 Y47675D01*
@@ -92,15 +92,6 @@
 X31500Y31300D02*X32000Y30800D01*
 X31500Y32300D02*Y31300D01*
 X32000Y32800D02*X31500Y32300D01*
-X19500Y13500D02*Y11500D01*
-X19000Y11000D01*
-X18000D02*X19000D01*
-X17500Y11500D02*X18000Y11000D01*
-X17500Y13000D02*Y11500D01*
-X15500Y13000D02*X19500D01*
-X17500Y12200D02*X15500Y11000D01*
-Y9300D02*X19500Y7300D01*
-Y9800D02*Y7300D01*
 X8000Y28050D02*Y26750D01*
 Y28050D02*X8325Y28375D01*
 X8975D01*
@@ -136,6 +127,15 @@
 X3000Y6800D02*Y5800D01*
 X3500Y5300D01*
 X4700D01*
+X19500Y13500D02*Y11500D01*
+X19000Y11000D01*
+X18000D02*X19000D01*
+X17500Y11500D02*X18000Y11000D01*
+X17500Y13000D02*Y11500D01*
+X15500Y13000D02*X19500D01*
+X17500Y12200D02*X15500Y11000D01*
+Y9300D02*X19500Y7300D01*
+Y9800D02*Y7300D01*
 X33500Y12500D02*Y10500D01*
 X33000Y10000D01*
 X32000D02*X33000D01*