diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-10-30 08:26:34 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-10-30 08:26:34 +0200 |
| commit | fe9e80c857dda9d3903efe6f542f0bc5bb6f3c7c (patch) | |
| tree | ad110338c37ee68c324c2e0967059d9a6d4a2a39 | |
| parent | 256f1c27bb7461bae80d2704e941d2171567d060 (diff) | |
| parent | 564e473b9419474fff8ca4282699ce7699a767b5 (diff) | |
| download | egawk-fe9e80c857dda9d3903efe6f542f0bc5bb6f3c7c.tar.gz egawk-fe9e80c857dda9d3903efe6f542f0bc5bb6f3c7c.tar.bz2 egawk-fe9e80c857dda9d3903efe6f542f0bc5bb6f3c7c.zip | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | doc/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 5 | ||||
| -rw-r--r-- | doc/Makefile.in | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 3841a037..3750304c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2015-10-30 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (awkcard.ps): Add options to force paper size + to letter. This makes the cut marks come out correctly even + if groff's default paper size is a4. + 2015-10-26 Arnold D. Robbins <arnold@skeeve.com> * gawk.1: Put commas outside quoting in regexps to avoid diff --git a/doc/Makefile.am b/doc/Makefile.am index 7f357ccb..c205513a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,6 +62,7 @@ SEDME2 = sed '/%%Page: 10 10/,/0 Cg EP/d' CARDSRC = $(srcdir)/macros $(srcdir)/cardfonts $(srcdir)/colors awkcard.tr CARDSRC_N = $(srcdir)/macros $(srcdir)/cardfonts $(srcdir)/no.colors awkcard.tr CARDFILES= $(CARDSRC) ad.block awkcard.in setter.outline +PAPEROPTS= -dpaper=letter -P-pletter # Use this if your troff can correctly handle macros from 'colors' file AWKCARD = awkcard.ps @@ -95,10 +96,10 @@ awkcard.tr: awkcard.in sed 's:SRCDIR:$(srcdir):' < $(srcdir)/awkcard.in > awkcard.tr awkcard.ps: $(CARDFILES) - $(TROFF) $(CARDSRC) | $(SEDME) | cat $(srcdir)/setter.outline - | $(SEDME2) > awkcard.ps + $(TROFF) $(PAPEROPTS) $(CARDSRC) | $(SEDME) | cat $(srcdir)/setter.outline - | $(SEDME2) > awkcard.ps awkcard.nc: $(CARDFILES) - $(TROFF) $(CARDSRC_N) | $(SEDME) | cat $(srcdir)/setter.outline - | $(SEDME2) > awkcard.ps && touch awkcard.nc + $(TROFF) $(PAPEROPTS) $(CARDSRC_N) | $(SEDME) | cat $(srcdir)/setter.outline - | $(SEDME2) > awkcard.ps && touch awkcard.nc awkcard.pdf: awkcard.ps ps2pdf awkcard.ps awkcard.pdf diff --git a/doc/Makefile.in b/doc/Makefile.in index 30cae76b..79fef6ce 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -386,6 +386,7 @@ SEDME2 = sed '/%%Page: 10 10/,/0 Cg EP/d' CARDSRC = $(srcdir)/macros $(srcdir)/cardfonts $(srcdir)/colors awkcard.tr CARDSRC_N = $(srcdir)/macros $(srcdir)/cardfonts $(srcdir)/no.colors awkcard.tr CARDFILES = $(CARDSRC) ad.block awkcard.in setter.outline +PAPEROPTS = -dpaper=letter -P-pletter # Use this if your troff can correctly handle macros from 'colors' file AWKCARD = awkcard.ps @@ -900,10 +901,10 @@ awkcard.tr: awkcard.in sed 's:SRCDIR:$(srcdir):' < $(srcdir)/awkcard.in > awkcard.tr awkcard.ps: $(CARDFILES) - $(TROFF) $(CARDSRC) | $(SEDME) | cat $(srcdir)/setter.outline - | $(SEDME2) > awkcard.ps + $(TROFF) $(PAPEROPTS) $(CARDSRC) | $(SEDME) | cat $(srcdir)/setter.outline - | $(SEDME2) > awkcard.ps awkcard.nc: $(CARDFILES) - $(TROFF) $(CARDSRC_N) | $(SEDME) | cat $(srcdir)/setter.outline - | $(SEDME2) > awkcard.ps && touch awkcard.nc + $(TROFF) $(PAPEROPTS) $(CARDSRC_N) | $(SEDME) | cat $(srcdir)/setter.outline - | $(SEDME2) > awkcard.ps && touch awkcard.nc awkcard.pdf: awkcard.ps ps2pdf awkcard.ps awkcard.pdf |