From ba1f7531661302a13447abfd2839fb0b15fe168c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 7 Nov 2010 17:23:30 +0000
Subject: [PATCH] layout/Makefile: break options for *-m4-*.ps out into a
 separate variable, and create new *-b4-* pages with target bpages

---
 layout/Makefile | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/layout/Makefile b/layout/Makefile
index b9385ff..24f505e 100644
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -14,6 +14,10 @@ LAYOUTOPTS_PS=	-e'[sp]=*rm' -e'p=5C' $(LAYOUTOPTS_COLOUR)
 XLAYOUTOPTS_LAYER= -e'=5AND' -E'*~=5rsml' -e'p~=5r' -e'*~=9C' \
 		$(LAYOUTOPTS_PS)
 LAYOUTOPTS_COLOUR= -CA=\#f00 -CC=\#dd0 -CrpLD=\#00f -Ci=\#c0c
+LAYOUTOPTS_MB=	-E'=*aRsclDmno' -E'=5RNLDA' -E'*~=5rCdsml' \
+		$(LAYOUTOPTS_PS)
+LAYOUTOPTS_M=	-l$* $(LAYOUTOPTS_MB)
+LAYOUTOPTS_B=	-S2.828 $(LAYOUTOPTS_MB) -Cl=-
 
 PLANUI_PSDPI= 72
 PLANUI_WIDTH= 595
@@ -31,11 +35,12 @@ LAYERS=		$(LAYERS_L) $(LAYERS_E) $(LAYERS_S) $(LAYERS_M) \
 		testphys-a.ps testphys-m4.ps
 
 LPAGES=	 $(foreach x, 0 1 2 3 4 5 6, $(foreach y, 1 2 3 4 5, ours-p4-$xx$y.ps))
+BPAGES=  $(foreach x, 0 1, $(foreach y, 0 1, ours-b4-$xx$y.ps))
 
 CPROGS=		subseg2display compose-segenco
 
 default:	$(CPROGS) for-test-ui layers extras
-all:		default lpages tpages
+all:		default lpages bpages tpages
 for-pic:	ours+pindata.asm
 recurse:	$(CPROGS) for-pic for-test-ui
 client:		ours.layout-data.o ours.dgram-bot.overlay-info		\
@@ -48,6 +53,7 @@ for-test-ui:	client 							\
 
 layers:		$(LAYERS)
 lpages:		$(LPAGES)
+bpages:		$(BPAGES)
 tpages:		$(foreach x, 0 1 2 3 4 5 6, testphys-p4-$xx1.ps)
 extras:		ours-a.ps ours-al.ps dualjn-a.ps parts.ps
 
@@ -162,12 +168,10 @@ ours-s%.ps:	layout ours.redacted.segjoins ours.d4
 			$(filter-out layout, $^) $o
 
 ours-m%.ps:	ours.d4 layout
-		$(LAYOUT) <$< -l$* -E'=*aRsclDmno' \
-			-E'=5RNLDA' -E'*~=5rCdsml' $(LAYOUTOPTS_PS) $o
+		$(LAYOUT) <$< $(LAYOUTOPTS_M) $o
 
 testphys-m%.ps:	testphys.d4 layout
-		$(LAYOUT) <$< -l$* -E'=*aRsclDmno' \
-			-E'=5RNLDA' -E'*~=5rCdsml' $(LAYOUTOPTS_PS) $o
+		$(LAYOUT) <$< $(LAYOUTOPTS_M) $o
 
 ours-e%.ps:	ours.d4 layout
 		$(LAYOUT) <$< -l$* -E'=*aRsclMno' \
@@ -178,6 +182,11 @@ ours-p%.ps:	ours.d4 layout
 		$(LAYOUT) <$< -l$$(printf %s "$*" | sed -e 's/-/ -P/') \
 			$(LAYOUTOPTS_PHYS) $(XLAYOUTOPTS_LAYER) $o
 
+ours-b%.ps:	ours.d4 layout
+		$(LAYOUT) <$< -l$$(printf %s "$*" | \
+			sed -e 's/-/ -P/; s/x/.25x/; s/$$/.3/') \
+			$(LAYOUTOPTS_B) $o
+
 testphys-p%.ps:	testphys.d4 layout
 		$(LAYOUT) <$< -l$$(printf %s "$*" | sed -e 's/-/ -P/') \
 			$(LAYOUTOPTS_PHYS) $(XLAYOUTOPTS_LAYER) $o
-- 
2.30.2