improve compatibility with RS-274x specification:

- can merge multiple files having different file scope modifier, such as AS, MI, OF, SF, and IR
- support modal coordinate notation

13 files changed, 27 insertions, 40 deletions

diff --git a/tests/expects/RS2724x_offset.gtl b/tests/expects/RS2724x_offset.gtl
index 9f15f4c..3dc3e6a 100644
--- a/tests/expects/RS2724x_offset.gtl
+++ b/tests/expects/RS2724x_offset.gtl
@@ -1,6 +1,5 @@
 %MOMM*%
 %FSLAX34Y34*%
-%INTop Layer*%
 %IPPOS*%
 %AMCOMP*
 20,1,0.2,0,0.1,0.4,0.1,$1*
diff --git a/tests/expects/RS2724x_rotate.gtl b/tests/expects/RS2724x_rotate.gtl
index 0a2d1aa..f7c82cd 100644
--- a/tests/expects/RS2724x_rotate.gtl
+++ b/tests/expects/RS2724x_rotate.gtl
@@ -1,6 +1,5 @@
 %MOMM*%
 %FSLAX34Y34*%
-%INTop Layer*%
 %IPPOS*%
 %AMCOMP*
 20,1,0.2,0,0.1,0.4,0.1,($1)+(20)*
@@ -10,15 +9,8 @@
 5,1,6,1.2,0.2,0.4,($1)+(20)*
 6,-0.7,0,0.5,0.05,0.15,2,0.05,0.6,($1)+(20)*
 7,0.7,0,0.6,0.5,0.15,($1)+(20)*%
-%AMMACP*
-5,1,$2,0,0,$1,($3)+(20)*
-1,0,$4,0,0,20*%
-%AMMACPO*
-$4=($2)-($1)*
-$5=($2)-($4)*
-21,1,$1,$5,0,0,20*
-1,1,$4,0,($4)/(2),20*
-1,1,$4,0,($4)/(-2),20*
+%AMMACR*
+21,1,$1,$2,0,0,20*
 1,0,$3,0,0,20*%
 %AMMACLO*
 $4=($1)-($2)*
@@ -27,9 +19,16 @@ $5=($1)-($4)*
 1,1,$4,($4)/(2),0,20*
 1,1,$4,($4)/(-2),0,20*
 1,0,$3,0,0,20*%
-%AMMACR*
-21,1,$1,$2,0,0,20*
+%AMMACPO*
+$4=($2)-($1)*
+$5=($2)-($4)*
+21,1,$1,$5,0,0,20*
+1,1,$4,0,($4)/(2),20*
+1,1,$4,0,($4)/(-2),20*
 1,0,$3,0,0,20*%
+%AMMACP*
+5,1,$2,0,0,$1,($3)+(20)*
+1,0,$4,0,0,20*%
 %ADD10C,0.01*%
 %ADD11C,1X0.4*%
 %ADD12MACR,1X0.5X0.2*%
diff --git a/tests/expects/RS2724x_save.gtl b/tests/expects/RS2724x_save.gtl
index 02dbaa8..5053d99 100644
--- a/tests/expects/RS2724x_save.gtl
+++ b/tests/expects/RS2724x_save.gtl
@@ -1,6 +1,5 @@
 %MOMM*%
 %FSLAX34Y34*%
-%INTop Layer*%
 %IPPOS*%
 %AMCOMP*
 20,1,0.2,0,0.1,0.4,0.1,$1*
diff --git a/tests/expects/RS2724x_to_inch.gtl b/tests/expects/RS2724x_to_inch.gtl
index 3ec60d8..cb9234e 100644
--- a/tests/expects/RS2724x_to_inch.gtl
+++ b/tests/expects/RS2724x_to_inch.gtl
@@ -1,6 +1,5 @@
 %MOIN*%
 %FSLAX25Y25*%
-%INTop Layer*%
 %IPPOS*%
 %AMCOMP*
 20,1,0.00787402,0,0.00393701,0.015748,0.00393701,$1*
diff --git a/tests/expects/RS2724x_to_metric.gtl b/tests/expects/RS2724x_to_metric.gtl
index 93adfc1..a8efda8 100644
--- a/tests/expects/RS2724x_to_metric.gtl
+++ b/tests/expects/RS2724x_to_metric.gtl
@@ -1,6 +1,5 @@
 %MOMM*%
 %FSLAX34Y34*%
-%INTop Layer*%
 %IPPOS*%
 %AMCOMP*
 20,1,0.2,0,0.1,0.399999,0.1,$1*
diff --git a/tests/expects/dxf_offset.gtl b/tests/expects/dxf_offset.gtl
index 18d7a62..3d2646d 100644
--- a/tests/expects/dxf_offset.gtl
+++ b/tests/expects/dxf_offset.gtl
@@ -1,10 +1,9 @@
-G75*
 %MOMM*%
-%OFA0B0*%
 %FSLAX34Y34*%
 %IPPOS*%
-%LPD*%
 %ADD10C,0*%
+G75*
+%LPD*%
 D10*
 G01*
 X200000Y50000D02*
diff --git a/tests/expects/dxf_rectangle_inch.gtl b/tests/expects/dxf_rectangle_inch.gtl
index ca99021..44bb5ed 100644
--- a/tests/expects/dxf_rectangle_inch.gtl
+++ b/tests/expects/dxf_rectangle_inch.gtl
@@ -1,10 +1,9 @@
-G75*
 %MOIN*%
-%OFA0B0*%
 %FSLAX25Y25*%
 %IPPOS*%
-%LPD*%
 %ADD10C,0*%
+G75*
+%LPD*%
 D10*
 G01*
 X0Y0D02*
diff --git a/tests/expects/dxf_rectangle_metric.gtl b/tests/expects/dxf_rectangle_metric.gtl
index db4c439..fed828a 100644
--- a/tests/expects/dxf_rectangle_metric.gtl
+++ b/tests/expects/dxf_rectangle_metric.gtl
@@ -1,10 +1,9 @@
-G75*
 %MOMM*%
-%OFA0B0*%
 %FSLAX34Y34*%
 %IPPOS*%
-%LPD*%
 %ADD10C,0*%
+G75*
+%LPD*%
 D10*
 G01*
 X0Y0D02*
diff --git a/tests/expects/dxf_rotate.gtl b/tests/expects/dxf_rotate.gtl
index 912ad60..71f9f83 100644
--- a/tests/expects/dxf_rotate.gtl
+++ b/tests/expects/dxf_rotate.gtl
@@ -1,10 +1,9 @@
-G75*
 %MOMM*%
-%OFA0B0*%
 %FSLAX34Y34*%
 %IPPOS*%
-%LPD*%
 %ADD10C,0*%
+G75*
+%LPD*%
 D10*
 G01*
 X124805Y2611D02*
diff --git a/tests/expects/dxf_save_fill.gtl b/tests/expects/dxf_save_fill.gtl
index c293826..54624b8 100644
--- a/tests/expects/dxf_save_fill.gtl
+++ b/tests/expects/dxf_save_fill.gtl
@@ -1,10 +1,9 @@
-G75*
 %MOMM*%
-%OFA0B0*%
 %FSLAX34Y34*%
 %IPPOS*%
-%LPD*%
 %ADD10C,0*%
+G75*
+%LPD*%
 D10*
 G36*
 G01*
diff --git a/tests/expects/dxf_save_line.gtl b/tests/expects/dxf_save_line.gtl
index e9a931b..6a15313 100644
--- a/tests/expects/dxf_save_line.gtl
+++ b/tests/expects/dxf_save_line.gtl
@@ -1,10 +1,9 @@
-G75*
 %MOMM*%
-%OFA0B0*%
 %FSLAX34Y34*%
 %IPPOS*%
-%LPD*%
 %ADD10C,0*%
+G75*
+%LPD*%
 D10*
 G01*
 X90000Y0D02*
diff --git a/tests/expects/dxf_save_mousebites.gtl b/tests/expects/dxf_save_mousebites.gtl
index b893454..282234d 100644
--- a/tests/expects/dxf_save_mousebites.gtl
+++ b/tests/expects/dxf_save_mousebites.gtl
@@ -1,10 +1,9 @@
-G75*
 %MOMM*%
-%OFA0B0*%
 %FSLAX34Y34*%
 %IPPOS*%
-%LPD*%
 %ADD10C,0.5*%
+G75*
+%LPD*%
 D10*
 X10000Y90000D03*
 X10000Y80000D03*
diff --git a/tests/expects/dxf_to_inch.gtl b/tests/expects/dxf_to_inch.gtl
index ee630c9..74a4118 100644
--- a/tests/expects/dxf_to_inch.gtl
+++ b/tests/expects/dxf_to_inch.gtl
@@ -1,10 +1,9 @@
-G75*
 %MOIN*%
-%OFA0B0*%
 %FSLAX25Y25*%
 %IPPOS*%
-%LPD*%
 %ADD10C,0*%
+G75*
+%LPD*%
 D10*
 G01*
 X35433Y0D02*