now all a4

diff --git a/.cvsignore b/.cvsignore
index 7f12f5e21e92065a516f2c836f172825358f1c15..259ae6d930d0ed00eaad13e17dfcc0c6f60078c2 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -32,5 +32,5 @@ detectors.pcb.output_*.*
 detectors.net
 detectors.net-info
 detectors.net-spec
-*.oprints
+*.oprints-l
 *.tmp

diff --git a/pcb/Makefile b/pcb/Makefile
index fdc16b053f0ad9a04175da2bb1576b9dc38c9a71..8128f8d9b0debaa76ee7f5dfd0931fd47e2a34bb 100644 (file)
--- a/pcb/Makefile
+++ b/pcb/Makefile
@@ -31,57 +31,47 @@ picprogs:   flasher.hex flash-all.hex
 
 netlists:      reversers.net detectors.net
 
-long2splita4=pstops -pa3 -d '0(-9cm,-10cm)+0(-0.5cm,-1cm)' <$< $o
-long2splita4comb=pstops -pa3 -d \
-       '2:0(-9cm,-6cm)+1(-0.5cm,-6cm)'
-#,0(-9cm,-1cm)+1(-0.5cm,-1cm)'
-
 # print from pcb(1) as follows:
 #   File / Print Layout / ...
-#      select media and offsets: A3
+#      select media and offsets: A4
 #      rotate
 #      ok
 #    (If `... exists, use anyway?', Sequence OK)
+#
+# then
+#   make {reversers,detectors}.oprints{-l,-lpr}
 
-OPRINTS=       %.oprint-back.ps        \
-               %.oprint-front.ps       \
-               %.oprint-fab.ps         \
-               %.oprint-frontsilk.ps   \
+OPRINTS=       %.oprint-copper.ps              \
+               %.pcb.output_fab.ps             \
+               %.pcb.output_frontsilk.ps       \
                %.oprint-assembly.ps
 
 %.oprints:     $(OPRINTS)
+                       true
+
+%.oprints-l:   $(OPRINTS) %.oprints
                        echo $^ $o
 
 pcboprints:    reversers.oprints detectors.oprints
 
 pcbcombprints: detectors.oprint-combine.ps reversers.oprint-combine.ps
 
-%.oprints-lpr: %.oprints
+%.oprints-lpr: %.oprints-l
                set -e; for f in `cat $^`; do echo lpr $$f; done
 
-%.distilled-a3.ps:     %.ps
-               ps2ps -sPAPERSIZE=a3 $< $@
+%.distilled.ps:        %.ps
+               ps2ps $< $@
 
-%.oprint-combine.ps:   %.pcb.output_back.distilled-a3.ps \
-                       %.pcb.output_front.distilled-a3.ps
+%.oprint-copper.ps:    %.pcb.output_back.distilled.ps \
+                       %.pcb.output_front.distilled.ps
                cat $^ >$@.tmp
                ps2ps $@.tmp $@-2.tmp
-               $(long2splita4comb) <$@-2.tmp $o
-
-%.oprint-back.ps:      %.pcb.output_back.ps Makefile
-               $(long2splita4)
-
-%.oprint-front.ps:     %.pcb.output_front.ps Makefile
-               $(long2splita4)
-
-%.oprint-fab.ps:       %.pcb.output_fab.ps Makefile
-               $(long2splita4)
+               pstops '2:0(-50mm,0mm)+1(50mm,0mm)' <$@-2.tmp $o
 
-%.oprint-frontsilk.ps: %.pcb.output_frontsilk.ps Makefile
-               $(long2splita4)
+%.oprint-copper.ps:    Makefile
 
 %.oprint-assembly.ps:  %.pcb.output_assembly.ps Makefile
-               pstops -pa3 '0@1.5(-12cm,-29cm)' <$< $o
+               pstops -pa4 '0@2(-109mm,-290mm)' <$< $o
 
 # these outputs from pstops are really A4 and can be viewed nicely with
 #  for f in *.oprint-*.ps; do gv -scale -1 -media A4 $f; done

diff --git a/pic.make b/pic.make
index fdc16b053f0ad9a04175da2bb1576b9dc38c9a71..8128f8d9b0debaa76ee7f5dfd0931fd47e2a34bb 100644 (file)
--- a/pic.make
+++ b/pic.make
@@ -31,57 +31,47 @@ picprogs:   flasher.hex flash-all.hex
 
 netlists:      reversers.net detectors.net
 
-long2splita4=pstops -pa3 -d '0(-9cm,-10cm)+0(-0.5cm,-1cm)' <$< $o
-long2splita4comb=pstops -pa3 -d \
-       '2:0(-9cm,-6cm)+1(-0.5cm,-6cm)'
-#,0(-9cm,-1cm)+1(-0.5cm,-1cm)'
-
 # print from pcb(1) as follows:
 #   File / Print Layout / ...
-#      select media and offsets: A3
+#      select media and offsets: A4
 #      rotate
 #      ok
 #    (If `... exists, use anyway?', Sequence OK)
+#
+# then
+#   make {reversers,detectors}.oprints{-l,-lpr}
 
-OPRINTS=       %.oprint-back.ps        \
-               %.oprint-front.ps       \
-               %.oprint-fab.ps         \
-               %.oprint-frontsilk.ps   \
+OPRINTS=       %.oprint-copper.ps              \
+               %.pcb.output_fab.ps             \
+               %.pcb.output_frontsilk.ps       \
                %.oprint-assembly.ps
 
 %.oprints:     $(OPRINTS)
+                       true
+
+%.oprints-l:   $(OPRINTS) %.oprints
                        echo $^ $o
 
 pcboprints:    reversers.oprints detectors.oprints
 
 pcbcombprints: detectors.oprint-combine.ps reversers.oprint-combine.ps
 
-%.oprints-lpr: %.oprints
+%.oprints-lpr: %.oprints-l
                set -e; for f in `cat $^`; do echo lpr $$f; done
 
-%.distilled-a3.ps:     %.ps
-               ps2ps -sPAPERSIZE=a3 $< $@
+%.distilled.ps:        %.ps
+               ps2ps $< $@
 
-%.oprint-combine.ps:   %.pcb.output_back.distilled-a3.ps \
-                       %.pcb.output_front.distilled-a3.ps
+%.oprint-copper.ps:    %.pcb.output_back.distilled.ps \
+                       %.pcb.output_front.distilled.ps
                cat $^ >$@.tmp
                ps2ps $@.tmp $@-2.tmp
-               $(long2splita4comb) <$@-2.tmp $o
-
-%.oprint-back.ps:      %.pcb.output_back.ps Makefile
-               $(long2splita4)
-
-%.oprint-front.ps:     %.pcb.output_front.ps Makefile
-               $(long2splita4)
-
-%.oprint-fab.ps:       %.pcb.output_fab.ps Makefile
-               $(long2splita4)
+               pstops '2:0(-50mm,0mm)+1(50mm,0mm)' <$@-2.tmp $o
 
-%.oprint-frontsilk.ps: %.pcb.output_frontsilk.ps Makefile
-               $(long2splita4)
+%.oprint-copper.ps:    Makefile
 
 %.oprint-assembly.ps:  %.pcb.output_assembly.ps Makefile
-               pstops -pa3 '0@1.5(-12cm,-29cm)' <$< $o
+               pstops -pa4 '0@2(-109mm,-290mm)' <$< $o
 
 # these outputs from pstops are really A4 and can be viewed nicely with
 #  for f in *.oprint-*.ps; do gv -scale -1 -media A4 $f; done

diff --git a/spice/Makefile b/spice/Makefile
index fdc16b053f0ad9a04175da2bb1576b9dc38c9a71..8128f8d9b0debaa76ee7f5dfd0931fd47e2a34bb 100644 (file)
--- a/spice/Makefile
+++ b/spice/Makefile
@@ -31,57 +31,47 @@ picprogs:   flasher.hex flash-all.hex
 
 netlists:      reversers.net detectors.net
 
-long2splita4=pstops -pa3 -d '0(-9cm,-10cm)+0(-0.5cm,-1cm)' <$< $o
-long2splita4comb=pstops -pa3 -d \
-       '2:0(-9cm,-6cm)+1(-0.5cm,-6cm)'
-#,0(-9cm,-1cm)+1(-0.5cm,-1cm)'
-
 # print from pcb(1) as follows:
 #   File / Print Layout / ...
-#      select media and offsets: A3
+#      select media and offsets: A4
 #      rotate
 #      ok
 #    (If `... exists, use anyway?', Sequence OK)
+#
+# then
+#   make {reversers,detectors}.oprints{-l,-lpr}
 
-OPRINTS=       %.oprint-back.ps        \
-               %.oprint-front.ps       \
-               %.oprint-fab.ps         \
-               %.oprint-frontsilk.ps   \
+OPRINTS=       %.oprint-copper.ps              \
+               %.pcb.output_fab.ps             \
+               %.pcb.output_frontsilk.ps       \
                %.oprint-assembly.ps
 
 %.oprints:     $(OPRINTS)
+                       true
+
+%.oprints-l:   $(OPRINTS) %.oprints
                        echo $^ $o
 
 pcboprints:    reversers.oprints detectors.oprints
 
 pcbcombprints: detectors.oprint-combine.ps reversers.oprint-combine.ps
 
-%.oprints-lpr: %.oprints
+%.oprints-lpr: %.oprints-l
                set -e; for f in `cat $^`; do echo lpr $$f; done
 
-%.distilled-a3.ps:     %.ps
-               ps2ps -sPAPERSIZE=a3 $< $@
+%.distilled.ps:        %.ps
+               ps2ps $< $@
 
-%.oprint-combine.ps:   %.pcb.output_back.distilled-a3.ps \
-                       %.pcb.output_front.distilled-a3.ps
+%.oprint-copper.ps:    %.pcb.output_back.distilled.ps \
+                       %.pcb.output_front.distilled.ps
                cat $^ >$@.tmp
                ps2ps $@.tmp $@-2.tmp
-               $(long2splita4comb) <$@-2.tmp $o
-
-%.oprint-back.ps:      %.pcb.output_back.ps Makefile
-               $(long2splita4)
-
-%.oprint-front.ps:     %.pcb.output_front.ps Makefile
-               $(long2splita4)
-
-%.oprint-fab.ps:       %.pcb.output_fab.ps Makefile
-               $(long2splita4)
+               pstops '2:0(-50mm,0mm)+1(50mm,0mm)' <$@-2.tmp $o
 
-%.oprint-frontsilk.ps: %.pcb.output_frontsilk.ps Makefile
-               $(long2splita4)
+%.oprint-copper.ps:    Makefile
 
 %.oprint-assembly.ps:  %.pcb.output_assembly.ps Makefile
-               pstops -pa3 '0@1.5(-12cm,-29cm)' <$< $o
+               pstops -pa4 '0@2(-109mm,-290mm)' <$< $o
 
 # these outputs from pstops are really A4 and can be viewed nicely with
 #  for f in *.oprint-*.ps; do gv -scale -1 -media A4 $f; done