From: ian <ian>
Date: Mon, 30 Aug 2004 02:16:47 +0000 (+0000)
Subject: a3 handling improved
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=2adc4a678aa9cdbd475511fbda44795478551807;p=trains.git

a3 handling improved
---

diff --git a/.cvsignore b/.cvsignore
index bca0174..7f12f5e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -33,3 +33,4 @@ detectors.net
 detectors.net-info
 detectors.net-spec
 *.oprints
+*.tmp
diff --git a/pcb/Makefile b/pcb/Makefile
index 35e0d85..fdc16b0 100644
--- a/pcb/Makefile
+++ b/pcb/Makefile
@@ -32,6 +32,9 @@ 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 / ...
@@ -51,9 +54,20 @@ OPRINTS=	%.oprint-back.ps 	\
 
 pcboprints:	reversers.oprints detectors.oprints
 
+pcbcombprints:	detectors.oprint-combine.ps reversers.oprint-combine.ps
+
 %.oprints-lpr:	%.oprints
 		set -e; for f in `cat $^`; do echo lpr $$f; done
 
+%.distilled-a3.ps:	%.ps
+		ps2ps -sPAPERSIZE=a3 $< $@
+
+%.oprint-combine.ps:	%.pcb.output_back.distilled-a3.ps \
+			%.pcb.output_front.distilled-a3.ps
+		cat $^ >$@.tmp
+		ps2ps $@.tmp $@-2.tmp
+		$(long2splita4comb) <$@-2.tmp $o
+
 %.oprint-back.ps:	%.pcb.output_back.ps Makefile
 		$(long2splita4)
 
diff --git a/pic.make b/pic.make
index 35e0d85..fdc16b0 100644
--- a/pic.make
+++ b/pic.make
@@ -32,6 +32,9 @@ 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 / ...
@@ -51,9 +54,20 @@ OPRINTS=	%.oprint-back.ps 	\
 
 pcboprints:	reversers.oprints detectors.oprints
 
+pcbcombprints:	detectors.oprint-combine.ps reversers.oprint-combine.ps
+
 %.oprints-lpr:	%.oprints
 		set -e; for f in `cat $^`; do echo lpr $$f; done
 
+%.distilled-a3.ps:	%.ps
+		ps2ps -sPAPERSIZE=a3 $< $@
+
+%.oprint-combine.ps:	%.pcb.output_back.distilled-a3.ps \
+			%.pcb.output_front.distilled-a3.ps
+		cat $^ >$@.tmp
+		ps2ps $@.tmp $@-2.tmp
+		$(long2splita4comb) <$@-2.tmp $o
+
 %.oprint-back.ps:	%.pcb.output_back.ps Makefile
 		$(long2splita4)
 
diff --git a/spice/Makefile b/spice/Makefile
index 35e0d85..fdc16b0 100644
--- a/spice/Makefile
+++ b/spice/Makefile
@@ -32,6 +32,9 @@ 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 / ...
@@ -51,9 +54,20 @@ OPRINTS=	%.oprint-back.ps 	\
 
 pcboprints:	reversers.oprints detectors.oprints
 
+pcbcombprints:	detectors.oprint-combine.ps reversers.oprint-combine.ps
+
 %.oprints-lpr:	%.oprints
 		set -e; for f in `cat $^`; do echo lpr $$f; done
 
+%.distilled-a3.ps:	%.ps
+		ps2ps -sPAPERSIZE=a3 $< $@
+
+%.oprint-combine.ps:	%.pcb.output_back.distilled-a3.ps \
+			%.pcb.output_front.distilled-a3.ps
+		cat $^ >$@.tmp
+		ps2ps $@.tmp $@-2.tmp
+		$(long2splita4comb) <$@-2.tmp $o
+
 %.oprint-back.ps:	%.pcb.output_back.ps Makefile
 		$(long2splita4)