diff options
author | Garret Fick <garret@ficksworkshop.com> | 2016-06-04 14:57:26 +0800 |
---|---|---|
committer | Garret Fick <garret@ficksworkshop.com> | 2016-06-04 14:57:26 +0800 |
commit | 9e6d813c1f95c1e1373276565039a43abb064de8 (patch) | |
tree | e847b38878440dc4d4cee82f0333766088379160 | |
parent | fca36a29b9a07dc0cb031ae87b72385150b55c3e (diff) | |
parent | bebcda883bdbd7be25bca2da10ae954a7efdb730 (diff) | |
download | gerbonara-9e6d813c1f95c1e1373276565039a43abb064de8.tar.gz gerbonara-9e6d813c1f95c1e1373276565039a43abb064de8.tar.bz2 gerbonara-9e6d813c1f95c1e1373276565039a43abb064de8.zip |
Merge branch 'master' of https://github.com/garretfick/pcb-tools
-rw-r--r-- | gerber/rs274x.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gerber/rs274x.py b/gerber/rs274x.py index 2bc8f9a..7eba1c2 100644 --- a/gerber/rs274x.py +++ b/gerber/rs274x.py @@ -167,7 +167,7 @@ class GerberParser(object): STRING = r"[a-zA-Z0-9_+\-/!?<>”’(){}.\|&@# :]+" NAME = r"[a-zA-Z_$\.][a-zA-Z_$\.0-9+\-]+" - FS = r"(?P<param>FS)(?P<zero>(L|T|D))?(?P<notation>(A|I))X(?P<x>[0-7][0-7])Y(?P<y>[0-7][0-7])" + FS = r"(?P<param>FS)(?P<zero>(L|T|D))?(?P<notation>(A|I))[NG0-9]*X(?P<x>[0-7][0-7])Y(?P<y>[0-7][0-7])[DM0-9]*" MO = r"(?P<param>MO)(?P<mo>(MM|IN))" LP = r"(?P<param>LP)(?P<lp>(D|C))" AD_CIRCLE = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>C)[,]?(?P<modifiers>[^,%]*)" |