From 5ea5b29b883065d2a14871eae83168d1022542a5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 6 Mar 2019 23:50:24 +0000 Subject: [PATCH] a4 --- .gitignore | 3 +-- Makefile | 9 ++++----- generate-board | 5 +++++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f83527f..a92ba0a 100644 --- 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 600fc31..0511413 100644 --- 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 83bb499..8ac9ca0 100755 --- 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; } -- 2.30.2