From 989d64e4afd73950f27b8218cfa9799d20cf4282 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 28 Feb 2015 13:40:06 +0000
Subject: [PATCH] screw-recess-test: numbers

---
 .gitignore                      |  1 +
 Makefile                        | 18 ++++++++++++++++++
 screw-recess-test-number.fig.pl |  6 +++---
 screw-recess-test.scad          | 12 +++++++++---
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7a1b620..c4a28c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ funcs.scad
 knifeblock-knives-*.dxf*
 pandemic-counter-l*.dxf
 pandemic-counter-l*.eps
+screw-recess-test-number-s*.*
diff --git a/Makefile b/Makefile
index 937bcc9..8bf5fad 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,24 @@ pandemic-counter-l%.eps: pandemic-counter-letters.fig
 		fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
 	        @mv -f $@.tmp $@
 
+SCREWRECESSTEST_SIZES= 2 3 4 5 6
+SCREWRECESSTEST_DXFS=$(foreach s,$(SCREWRECESSTEST_SIZES), \
+	screw-recess-test-number-s$s.dxf)
+
+screw-recess-test-number-s%.fig: screw-recess-test-number.fig.pl
+	./$< $* >$@.tmp && mv -f $@.tmp $@
+
+screw-recess-test-number-s%.eps: screw-recess-test-number-s%.fig
+		fig2dev -L eps <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
+screw-recess-test-numbers screw-recess-test.stl: $(SCREWRECESSTEST_DXFS)
+
+.PRECIOUS: $(SCREWRECESSTEST_DXFS) $(SCREWRECESSTEST_DXFS) \
+	$(foreach s,$(SCREWRECESSTEST_SIZES), \
+		screw-recess-test-number-s$s.fig \
+		screw-recess-test-number-s$s.eps)
+
 %.dxf:		%.eps
 		pstoedit -dt -f "dxf: -polyaslines -mm" $< $@
 
diff --git a/screw-recess-test-number.fig.pl b/screw-recess-test-number.fig.pl
index d173654..023b315 100755
--- a/screw-recess-test-number.fig.pl
+++ b/screw-recess-test-number.fig.pl
@@ -1,12 +1,11 @@
 #!/usr/bin/perl
 
-my $number = shift ARGV;
+my $number = shift @ARGV;
 die unless $number =~ m/^\d+$/;
 
 my $fontsz = $number * 6 + 12;
 
-print <DATA> or die $!;
-__DATA__
+print <<END or die $!;
 #FIG 3.2  Produced by xfig version 3.2.5b
 Landscape
 Center
@@ -17,3 +16,4 @@ Single
 -2
 1200 2
 4 0 0 50 -1 18 $fontsz 0.0000 4 285 225 3600 4500 $number\001
+END
diff --git a/screw-recess-test.scad b/screw-recess-test.scad
index 5db4a56..4234a7a 100644
--- a/screw-recess-test.scad
+++ b/screw-recess-test.scad
@@ -80,14 +80,20 @@ tests = [
 
 function Test_blocksz(t) = screw_recess_dia_use(t) + 7;
 
-module OneTestCore(t, h, ymul){
+module OneTestCore(t, h, ymul, labelnumber=false){
   blocksz = Test_blocksz(t);
   translate([0, ymul * (blocksz*0.5 - 1.5), 0]) {
-    difference(){
+    %difference(){
       translate([-blocksz/2, -blocksz/2, 0])
 	cube([blocksz, blocksz, h]);
       child();
     }
+    if (labelnumber) {
+      rotate([90,0,0])
+	translate([-blocksz/4,blocksz/5, blocksz/2-1])
+	linear_extrude(height=0.3+1)
+      import(file=str("screw-recess-test-number-s",t[0],".dxf"), convexity=100);
+    }
   }
 }
 
@@ -97,7 +103,7 @@ module OneTest(t){
   OneTestCore(t, h, 1){
     RecessedScrewCutoutStandard(t, h+1);
   }
-  OneTestCore(t, ha, -1){
+  OneTestCore(t, ha, -1, true){
     RecessedScrewCutoutStandardAllen(t, ha+1);
   }
 }
-- 
2.30.2