From 3940408da5e65586a8ce76766e690f779c470c88 Mon Sep 17 00:00:00 2001
From: Juan Pablo Caram <jpcaram@gmail.com>
Date: Tue, 29 Dec 2015 17:35:43 -0500
Subject: [PATCH] Added non-compliant support for "-" in ApertureMacro names.
 Temporary fix for #185.

---
 camlib.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/camlib.py b/camlib.py
index 1448beaf..52f756de 100644
--- a/camlib.py
+++ b/camlib.py
@@ -1307,7 +1307,9 @@ class Gerber (Geometry):
         self.comm_re = re.compile(r'^G0?4(.*)$')
 
         # AD - Aperture definition
-        self.ad_re = re.compile(r'^%ADD(\d\d+)([a-zA-Z_$\.][a-zA-Z0-9_$\.]*)(?:,(.*))?\*%$')
+        # Aperture Macro names: Name = [a-zA-Z_.$]{[a-zA-Z_.0-9]+}
+        # NOTE: Adding "-" to support output from Upverter.
+        self.ad_re = re.compile(r'^%ADD(\d\d+)([a-zA-Z_$\.][a-zA-Z0-9_$\.\-]*)(?:,(.*))?\*%$')
 
         # AM - Aperture Macro
         # Beginning of macro (Ends with *%):