Layer matcher WIP

1 files changed, 13 insertions, 13 deletions

diff --git a/gerbonara/gerber/layer_rules.py b/gerbonara/gerber/layer_rules.py
index 1733964..871e44f 100644
--- a/gerbonara/gerber/layer_rules.py
+++ b/gerbonara/gerber/layer_rules.py
@@ -11,7 +11,7 @@ MATCH_RULES = {
     'bottom silk':      r'.*\.gbo',
     'bottom paste':     r'.*\.gbp',
     'inner copper':     r'.*\.gp?([0-9]+)',
-    'drill outline':    r'.*\.(gko|gm[0-9]+)',
+    'mechanical outline':    r'.*\.(gko|gm[0-9]+)',
     'drill unknown':    r'.*\.(txt)',
     },
 
@@ -25,7 +25,7 @@ MATCH_RULES = {
     'bottom silk':      r'.*\.gbo|.*b.silks.*',
     'bottom paste':     r'.*\.gbp|.*b.paste.*',
     'inner copper':     r'.*\.gp?([0-9]+)|.*inn?e?r?([0-9]+).cu.*',
-    'drill outline':    r'.*\.(gm[0-9]+)|.*edge.cuts.*',
+    'mechanical outline':    r'.*\.(gm[0-9]+)|.*edge.cuts.*',
     'drill plated':     r'.*\.(drl)',
     },
 
@@ -39,7 +39,7 @@ MATCH_RULES = {
     'bottom silk':      r'.*\.bottomsilk\.\w+',
     'bottom paste':     r'.*\.bottompaste\.\w+',
     'inner copper':     r'.*\.inner_l([0-9]+)\.\w+', # FIXME verify this
-    'drill outline':    r'.*\.outline\.gbr',
+    'mechanical outline':    r'.*\.outline\.gbr',
     'drill plated':     r'.*\.plated-drill.cnc',
     'drill nonplated':  r'.*\.unplated-drill.cnc',
     },
@@ -64,10 +64,10 @@ MATCH_RULES = {
     'top silk':         r'.*\.PosiTop',
     'top paste':        r'.*\.PasteTop',
     'bottom copper':    r'.*\.Bot',
-    'bottop mask':      r'.*\.StopBot',
-    'bottop silk':      r'.*\.PosiBot',
-    'bottop paste':     r'.*\.PasteBot',
-    'drill outline':    r'.*\.Outline',
+    'bottom mask':      r'.*\.StopBot',
+    'bottom silk':      r'.*\.PosiBot',
+    'bottom paste':     r'.*\.PasteBot',
+    'mechanical outline':    r'.*\.Outline',
     'drill plated':     r'.*\.Drill',
     },
 
@@ -77,11 +77,11 @@ MATCH_RULES = {
     'top silk':         r'.*\.sst',
     'top paste':        r'.*\.spt',
     'bottom copper':    r'.*\.bot',
-    'bottop mask':      r'.*\.smb',
-    'bottop silk':      r'.*\.ssb',
-    'bottop paste':     r'.*\.spb',
+    'bottom mask':      r'.*\.smb',
+    'bottom silk':      r'.*\.ssb',
+    'bottom paste':     r'.*\.spb',
     'inner copper':     r'.*\.in([0-9]+)',
-    'drill outline':    r'.*\.(fab|drd)',
+    'mechanical outline':    r'.*\.(fab|drd)',
     'drill plated':     r'.*\.tap',
     'drill nonplated':  r'.*\.npt',
     },
@@ -97,12 +97,12 @@ MATCH_RULES = {
     'bottom silk':      r'.*(\.pls|\.bsk|\.bottomsilkscreen\.ger)|.*(silkscreen_bottom|bottom_silk).*',
     'bottom paste':     r'.*(\.crs|\.bsp|\.bcream\.ger)|.*(solderpaste_bottom|bottom_paste).*',
     'inner copper':     r'.*\.ly([0-9]+)|.*\.internalplane([0-9]+)\.ger',
-    'drill outline':    r'.*(\.dim|\.mil|\.gml)|.*\.(?:board)?outline\.ger|profile\.gbr',
+    'mechanical outline':    r'.*(\.dim|\.mil|\.gml)|.*\.(?:board)?outline\.ger|profile\.gbr',
     'drill plated':     r'.*\.(txt|exc|drd|xln)',
     },
 
 'siemens': {
-    'drill outline':    r'.*ContourPlated.ncd',
+    'mechanical outline':    r'.*ContourPlated.ncd',
     'inner copper':     r'.*L([0-9]+).gdo',
     'bottom silk':      r'.*SilkscreenBottom.gdo',
     'top silk':         r'.*SilkscreenTop.gdo',