layout/Makefile: break out LAYOUTOPTS_E and LAYOUTOPTS_BS

diff --git a/layout/Makefile b/layout/Makefile
index 601bca2924fa749643776e025404d1bdd1124d62..63b87e59b278d4232b3fb81585e8f65818d46bc0 100644 (file)
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -17,7 +17,11 @@ 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=-
+LAYOUTOPTS_BS= -S2.828
+LAYOUTOPTS_B=  $(LAYOUTOPTS_BS) $(LAYOUTOPTS_MB) -Cl=-
+LAYOUTOPTS_E=   -E'=*aRsclMno' \
+               -e'=5RN' -E'*~=5rsm' -e'p~=5r' -e'*=*l' \
+               -e'[sp]=*rm'
 
 PLANUI_PSDPI= 72
 PLANUI_WIDTH= 595
@@ -174,9 +178,7 @@ testphys-m%.ps:     testphys.d4 layout
                $(LAYOUT) <$< $(LAYOUTOPTS_M) $o
 
 ours-e%.ps:    ours.d4 layout
-               $(LAYOUT) <$< -l$* -E'=*aRsclMno' \
-                       -e'=5RN' -E'*~=5rsm' -e'p~=5r' -e'*=*l' \
-                       -e'[sp]=*rm' $(LAYOUTOPTS_COLOUR) $o
+               $(LAYOUT) <$< -l$* $(LAYOUTOPTS_E) $(LAYOUTOPTS_COLOUR) $o
 
 ours-p%.ps:    ours.d4 layout
                $(LAYOUT) <$< -l$$(printf %s "$*" | sed -e 's/-/ -P/') \