From 6e014c6117d8697639a4897af8fc3576dba1a8e6 Mon Sep 17 00:00:00 2001 From: "visualgui823@live.com" Date: Fri, 3 Jun 2016 10:45:18 +0000 Subject: compliant fs format as FS[Nn][Gn][Dn][Mn] --- gerber/rs274x.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gerber/rs274x.py') 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"(?PFS)(?P(L|T|D))?(?P(A|I))X(?P[0-7][0-7])Y(?P[0-7][0-7])" + FS = r"(?PFS)(?P(L|T|D))?(?P(A|I))[NG0-9]*X(?P[0-7][0-7])Y(?P[0-7][0-7])[DM0-9]*" MO = r"(?PMO)(?P(MM|IN))" LP = r"(?PLP)(?P(D|C))" AD_CIRCLE = r"(?PAD)D(?P\d+)(?PC)[,]?(?P[^,%]*)" -- cgit