From 76039af5491eae6b1354d7d1ea93108737fdee16 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Fri, 17 Jan 2014 20:18:36 -0300
Subject: [PATCH] modules/pads.fpd: add -NOSILK variants; add silk measurements
 for rectangular pads

---
 modules/HIERARCHY | 13 ++++++++++
 modules/pads.fpd  | 63 +++++++++++++++++++++++++++++++++--------------
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/modules/HIERARCHY b/modules/HIERARCHY
index 109030c..47aa0b4 100644
--- a/modules/HIERARCHY
+++ b/modules/HIERARCHY
@@ -5,20 +5,33 @@ Connector
 		Pads
 			Round
 				PAD_C_1mm
+				PAD_C_1mm-NOSILK
 				PAD_C_60x60
+				PAD_C_60x60-NOSILK
 				PAD_C_80x80
+				PAD_C_80x80-NOSILK
 				PAD_C_100x100
+				PAD_C_100x100-NOSILK
 				PAD_C_150x150
+				PAD_C_150x150-NOSILK
 			Square
 				PAD_S_1mm
+				PAD_S_1mm-NOSILK
 				PAD_S_60x60
+				PAD_S_60x60-NOSILK
 				PAD_S_80x80
+				PAD_S_80x80-NOSILK
 				PAD_S_100x100
+				PAD_S_100x100-NOSILK
 				PAD_S_120x120
+				PAD_S_120x120-NOSILK
 				PAD_S_150x150
+				PAD_S_150x150-NOSILK
 			Rectangular
 				PAD_R_2mm
+				PAD_R_2mm-NOSILK
 				PAD_R_120x60
+				PAD_R_120x60-NOSILK
 			Array
 				2mm
 					PAD_2mm_2x50mil
diff --git a/modules/pads.fpd b/modules/pads.fpd
index e9003e0..ad95180 100644
--- a/modules/pads.fpd
+++ b/modules/pads.fpd
@@ -1,15 +1,33 @@
 /* MACHINE-GENERATED ! */
 
-frame padS {
-	set ?type = "S"
-
+frame padS_silk {
 	set x1 = x/2+2.5*w
 
 	set y1 = y/2+2.5*w
 
+	set ?nosilk = ""
+
+	__2: vec @(-x1, y1)
+	__3: vec @(x1, -y1)
+	rect __2 . w
+}
+
+frame padS {
+	set ?type = "S"
+
 	__0: vec @(x/2, y/2)
 	__1: vec @(-x/2, -y/2)
 	pad "1" __0 . bare
+	frame padS_silk @
+}
+
+frame padR_silk {
+	set x1 = x/2+2*w
+
+	set y1 = y/2+2*w
+
+	set ?nosilk = ""
+
 	__2: vec @(-x1, y1)
 	__3: vec @(x1, -y1)
 	rect __2 . w
@@ -18,34 +36,34 @@ frame padS {
 frame padR {
 	set ?type = "R"
 
-	set x1 = x/2+2*w
-
-	set y1 = y/2+2*w
-
 	__0: vec @(x/2, y/2)
 	__1: vec @(-x/2, -y/2)
 	rpad "1" . __0 bare
-	__2: vec @(-x1, y1)
-	__3: vec @(x1, -y1)
-	rect __2 . w
+	frame padR_silk @
 }
 
-frame padC {
-	set ?type = "C"
-
+frame padC_silk {
 	set x1 = (x+w)/2
 
 	set y1 = (y+w)/2
 
-	__0: vec @(x/2, y/2)
-	__1: vec @(-x/2, -y/2)
-	rpad "1" . __0 bare
+	set ?nosilk = ""
+
 	__2: vec @(-x1, y1)
 	circ @ . w
 	__3: vec @(x1, -y1)
 }
 
-package "PAD_${type}_$size"
+frame padC {
+	set ?type = "C"
+
+	__0: vec @(x/2, y/2)
+	__1: vec @(-x/2, -y/2)
+	rpad "1" . __0 bare
+	frame padC_silk @
+}
+
+package "PAD_${type}_$size$nosilk"
 unit auto
 
 table
@@ -68,12 +86,19 @@ set factor = 0.7
 
 set w = 5mil
 
+table
+    { nosilk }
+    { "" }
+    { "-NOSILK" }
+
 frame padC @
 frame padR @
 frame padS @
 measy padC.__1 >> padC.__0 y/2
 measy padS.__1 >> padS.__0 1mm
-measx padS.__2 >> padS.__3 1mm
-measx padC.__2 >> padC.__3 1mm
+measx padS_silk.__2 >> padS_silk.__3 1mm
+measx padC_silk.__2 >> padC_silk.__3 1mm
 measy padR.__1 >> padR.__0 1mm
 measx padR.__1 >> padR.__0 -1mm
+measx padR_silk.__2 >> padR_silk.__3 1mm
+measy padR_silk.__3 >> padR_silk.__2 -1mm