a4

diff --git a/.gitignore b/.gitignore
index f83527f3180940d7a4f36b65330dced7419ba870..a92ba0ae9e81965277eaed4773bd4deebb216e00 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,7 @@ faces.plag
 *.tmp
 maxprintable-*.ps
 minprintable-*.ps
-board-b.ps
-board-mt.ps
+board-*.ps
 boundings-*.ps
 layout-test.ps
 layout-test-?.ps

diff --git a/Makefile b/Makefile
index 600fc31694972b3d518e052714f35f1071ba1756..0511413b5be7dd820784f74ffe7fb0ad10738900 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,8 @@ BOARDFILES=                                           \
        $(addprefix maxprintable-,      a3)             \
        $(addprefix minprintable-,      a3)             \
        $(addprefix boundings-,         a3 a4)          \
+       $(addprefix board-,     pa3-bPageB pa3-bPageMT                  \
+                               pa4-bPageB pa4-bPageM pa4-bPageT )      \
        $(addprefix board-,             b mt)           \
        layout-test                                     \
        $(addprefix a4-test-,           b m t)          \
@@ -61,11 +63,8 @@ minprintable-%.ps: generate-board faces.plag input-graph misc-data.pl Parse.pm
 boundings-%.ps: generate-board faces.plag input-graph misc-data.pl Parse.pm
        ./generate-board -XBp$* faces.plag input-graph $o
 
-board-b.ps: generate-board faces.plag input-graph misc-data.pl Parse.pm
-       ./generate-board -Xpa3,bPageB faces.plag input-graph $o
-
-board-mt.ps: generate-board faces.plag input-graph misc-data.pl Parse.pm
-       ./generate-board -Xpa3,bPageMT faces.plag input-graph $o
+board-%.ps: generate-board faces.plag input-graph misc-data.pl Parse.pm
+       ./generate-board -X$* faces.plag input-graph $o
 
 layout-test.ps: maxprintable-a3.ps Makefile Parse.pm
        ./generate-board -XW faces.plag input-graph $o

diff --git a/generate-board b/generate-board
index 83bb4999d40361396172be94988ea1cec90c18ec..8ac9ca0ba01097c5622f985e47465713bc2ac6d4 100755 (executable)
--- a/generate-board
+++ b/generate-board
@@ -315,6 +315,7 @@ sub computeboundings() {
   $bb{PrintableB} = $page2minprintable->($bb{PageB});
   my $somepage = sub {
     my $id = shift @_;
+    print STDERR "defining page Page$id\n";
     $bb{"Page$id"} = [ @_ ];
     $bb{"Printable$id"} = $page2minprintable->($bb{"Page$id"});
   };
@@ -330,6 +331,10 @@ sub computeboundings() {
     $somepage->('M', 0, $m_offset, $a4_h, $m_offset + $a4_w );
     my $t_offset = $bb{PrintableM}[3] - $max_printeredge;
     $somepage->('T', 0, $t_offset, $a4_h, $t_offset + $a4_w );
+    $bb{PrintableAll} = [
+                        @{ $bb{PrintableB} }[0..1],
+                        @{ $bb{PrintableT} }[2..3],
+                       ];
   } else {
     confess;
   }