From 494444b90a09b82b84d9964b3989d2de0d48761b Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 27 Jul 2012 18:43:17 +0000 Subject: 30590: Work around problem turning intro.ms into PDF --- ChangeLog | 5 ++++- Doc/.distfiles | 2 +- Doc/Makefile.in | 12 +++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0f7b743f..79ad079da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-07-27 Peter Stephenson + * 30590: Doc/Makefile.in, Doc/.distfiles: work around problem + turning intro.ms into PDF. + * unposted: relabel as 5.0.0-dev-0. 2012-07-23 Geoff Wing @@ -16464,5 +16467,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5683 $ +* $Revision: 1.5684 $ ***************************************************** diff --git a/Doc/.distfiles b/Doc/.distfiles index b639949d3..85dc15781 100644 --- a/Doc/.distfiles +++ b/Doc/.distfiles @@ -18,5 +18,5 @@ DISTFILES_DOC=' *.html zsh.dvi zsh.pdf - intro.pdf + intro.a4.pdf intro.us.pdf ' diff --git a/Doc/Makefile.in b/Doc/Makefile.in index df3e1410b..55e314224 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -94,7 +94,7 @@ dvi: zsh.dvi zsh.dvi: $(sdir)/zsh.texi $(TEXI2DVI) $(sdir)/zsh.texi -pdf: zsh.pdf intro.pdf +pdf: zsh.pdf intro.a4.pdf intro.us.pdf .PHONY: pdf zsh.pdf: $(sdir)/zsh.texi @@ -104,8 +104,14 @@ zsh.pdf: $(sdir)/zsh.texi PDFTEX=$(PDFETEX) $(TEXI2DVI) --pdf $(sdir)/zsh.texi; \ fi -intro.pdf: $(sdir)/intro.ms - pdfroff -ms $(sdir)/intro.ms >intro.pdf +# Use roff2ps / ps2pdf because pdfroff produces doubled output. +intro.a4.pdf: $(sdir)/intro.ms + roff2ps -ms -P-pa4 < $(sdir)/intro.ms > intro.a4.ps + ps2pdf intro.a4.ps + +intro.us.pdf: $(sdir)/intro.ms + roff2ps -ms -P-pletter < $(sdir)/intro.ms > intro.us.ps + ps2pdf intro.us.ps texi: $(sdir)/zsh.texi .PHONY: texi -- cgit 1.4.1