diff options
| author | Garret Fick <garret@fickworkshop.com> | 2016-06-04 13:36:56 +0800 |
|---|---|---|
| committer | Garret Fick <garret@fickworkshop.com> | 2016-06-04 13:36:56 +0800 |
| commit | bebcda883bdbd7be25bca2da10ae954a7efdb730 (patch) | |
| tree | 2962289590962061ac2126b8e8ec1814c02b7b13 | |
| parent | ea97d9d0376db6ff7afcc7669eec84a228f8d201 (diff) | |
| parent | 6e014c6117d8697639a4897af8fc3576dba1a8e6 (diff) | |
| download | gerbonara-bebcda883bdbd7be25bca2da10ae954a7efdb730.tar.gz gerbonara-bebcda883bdbd7be25bca2da10ae954a7efdb730.tar.bz2 gerbonara-bebcda883bdbd7be25bca2da10ae954a7efdb730.zip | |
Merge pull request #4 from visualgui823/master
compliant fs format as FS<L or T><A or I>[Nn][Gn]<Xn><Yn>[Dn][Mn]
| -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>[^,%]*)" |