From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19207 invoked by alias); 4 Mar 2016 15:00:26 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 38092 Received: (qmail 20990 invoked from network); 4 Mar 2016 15:00:24 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.1 X-Biglobe-Sender: Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\)) Subject: Re: zsh manual - missing bookmarks in pdf file? From: "Jun T." In-Reply-To: Date: Fri, 4 Mar 2016 23:25:40 +0900 Content-Transfer-Encoding: 7bit Message-Id: References: <22229.42616.86422.222557@lwm.klanderman.net> <87vb55leop.fsf@lwm.klanderman.net> <194AAF32-4EB5-412D-A200-27AE7832EF86@kba.biglobe.ne.jp> <87egbs7usn.fsf@lwm.klanderman.net> <1850B214-73A8-4373-A9AE-0C533702A6CD@kba.biglobe.ne.jp> <87si07lj6s.fsf@lwm.klanderman.net> <36FD86DF-3BA9-4277-B587-38EC212BDDEB@kba.biglobe.ne.jp> To: "zsh-workers@zsh.org" X-Mailer: Apple Mail (2.1510) X-Biglobe-Spnum: 55859 On 2016/03/04, at 13:16, Mikael Magnusson wrote: > > We could somehow use LC_PAPER to determine which to build, and allow > overriding/building both with a configure option? In the revised patch below, configure uses LC_PAPER to determine PAPERSIZE, and it is used as the paper size for both zsh.pdf and intro.pdf. A user can always use (without re-configure) % cd Doc % make zsh_a4.pdf # or zsh_us.pdf, intro.a4.pdf, intro.us.pdf to create a pdf with specific paper size. And % make everything will create both a4 and us pdf files (and two dvi files). # If LC_PAPER is not available (OS X, for example), then # paper size is set to a4. There is another minor problem: If pdfetex is not found, the original code sets PDFETEX to ': pdfetex', but this may not work because PDFETEX is used as PDFTEX=$(PDFETEX) $(TEXI2DVI) --pdf $(sdir)/zsh.texi; The patch includes a possible fix for this, but is it really necessary to check for pdfetex? Since texi2dvi checks for pdfetex by itself, probably PDFTEX=$(PDFETEX) is not necessary. Or it may be there for a (very) old texi2dvi? diff --git a/Config/defs.mk.in b/Config/defs.mk.in index 3c84610..2bc1748 100644 --- a/Config/defs.mk.in +++ b/Config/defs.mk.in @@ -79,8 +79,6 @@ ANSI2KNR = @ANSI2KNR@ YODL = @YODL@ @YODL_OPTIONS@ YODL2TXT = @YODL@2txt YODL2HTML = @YODL@2html -PDFETEX = @PDFETEX@ -TEXI2PDF = @TEXI2PDF@ # install utility INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/Doc/Makefile.in b/Doc/Makefile.in index d589991..08dfd5d 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -39,9 +39,11 @@ LN_S = @LN_S@ @DEFS_MK@ MAKEINFO = makeinfo -TEXI2DVI = texi2dvi +TEXI2DVI = @TEXI2DVI@ DVIPS = dvips +TEXI2PDF = @TEXI2PDF@ TEXI2HTML = @TEXI2HTML@ +PAPERSIZE = @PAPERSIZE@ .SUFFIXES: .yo .1 @@ -86,33 +88,41 @@ Zsh/seealso.yo Zsh/tcpsys.yo Zsh/zftpsys.yo Zsh/zle.yo all: man $(runhelp) texi ../META-FAQ .PHONY: all -everything: all dvi html pdf info +everything: all html info zsh_a4.dvi zsh_us.dvi zsh_a4.pdf zsh_us.pdf \ + intro.a4.pdf intro.us.pdf .PHONY: everything dvi: zsh.dvi .PHONY: dvi -zsh.dvi: $(sdir)/zsh.texi - $(TEXI2DVI) $(sdir)/zsh.texi +zsh.dvi zsh_a4.dvi zsh_us.dvi: $(sdir)/zsh.texi + if test $@ = zsh_us.dvi || \ + { test $@ = zsh.dvi && test "$(PAPERSIZE)" = us; }; then \ + $(TEXI2DVI) -o $@ $(sdir)/zsh.texi; \ + else \ + $(TEXI2DVI) -o $@ -t @afourpaper $(sdir)/zsh.texi; \ + fi -pdf: zsh.pdf intro.a4.pdf intro.us.pdf +pdf: zsh.pdf intro.pdf .PHONY: pdf -zsh.pdf: $(sdir)/zsh.texi - if [ x$(TEXI2PDF) != x ]; then \ - $(TEXI2PDF) $(sdir)/zsh.texi; \ +zsh.pdf zsh_a4.pdf zsh_us.pdf: $(sdir)/zsh.texi + if test $@ = zsh_us.pdf || \ + { test $@ = zsh.pdf && test "$(PAPERSIZE)" = us; }; then \ + $(TEXI2PDF) -o $@ $(sdir)/zsh.texi; \ else \ - PDFTEX=$(PDFETEX) $(TEXI2DVI) --pdf $(sdir)/zsh.texi; \ + $(TEXI2PDF) -o $@ -t @afourpaper $(sdir)/zsh.texi; \ fi # 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 +intro.pdf intro.a4.pdf intro.us.pdf: $(sdir)/intro.ms + if test $@ = intro.us.pdf || \ + { test $@ = intro.pdf && test "$(PAPERSIZE)" = us; }; then \ + roff2ps -ms -P-pletter < $(sdir)/intro.ms > intro.ps; \ + else \ + roff2ps -ms -P-pa4 < $(sdir)/intro.ms > intro.ps; \ + fi; \ + ps2pdf -sOutputFile=$@ intro.ps texi: $(sdir)/zsh.texi .PHONY: texi diff --git a/Doc/ztexi.yo b/Doc/ztexi.yo index e878345..7d52e6e 100644 --- a/Doc/ztexi.yo +++ b/Doc/ztexi.yo @@ -53,7 +53,6 @@ def(texinfo)(2)(\ NOTRANS(\input texinfo.tex)+NL()\ NOTRANS(@c %**start of header)+NL()\ NOTRANS(@iftex)+NL()\ - NOTRANS(@afourpaper)+NL()\ NOTRANS(@setchapternewpage off)+NL()\ NOTRANS(@end iftex)+NL()\ NOTRANS(@setfilename )ARG1+NL()\ diff --git a/configure.ac b/configure.ac index c3bd713..c5be36b 100644 --- a/configure.ac +++ b/configure.ac @@ -632,14 +632,33 @@ if test "x$ac_cv_prog_YODL" = xyodl; then fi AC_SUBST(YODL_OPTIONS) -AC_CHECK_PROGS([PDFETEX], [pdfetex], [: pdfetex]) -AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], []) +AC_CHECK_PROGS([PDFETEX], [pdfetex], []) +AC_CHECK_PROGS([TEXI2DVI], [texi2dvi], [: texi2dvi]) +AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [: texi2pdf]) AC_CHECK_PROGS([TEXI2HTML], [texi2any texi2html], [: texi2html]) +if test x"$TEXI2PDF" != xtexi2pdf && test x"$TEXI2DVI" = xtexi2dvi; then + if test x"$PDFETEX" != x; then + TEXI2PDF="PDFTEX=$PDFETEX texi2dvi --pdf" + else + TEXI2PDF='texi2dvi --pdf' + fi +fi + if test x"$TEXI2HTML" = xtexi2any; then TEXI2HTML='texi2any -c TEXI2HTML=1' fi +case "$LC_PAPER" in + ??_US*) + PAPERSIZE=us + ;; + *) + PAPERSIZE=a4 + ;; +esac +AC_SUBST(PAPERSIZE) + AC_CHECK_PROGS([ANSI2KNR], [ansi2knr], [: ansi2knr]) if test x"$ansi2knr" = xyes && test x"$ANSI2KNR" = x": ansi2knr"; then