mirror of git://git.code.sf.net/p/zsh/code
38108: enable to create both zsh_{a4,us}.pdf
Default paper size is taken from LC_PAPER. Stop to check for pdfetex (obsolete and redundant).
This commit is contained in:
Jun-ichi Takimoto
parent
983060d5d1
commit
db42e7c504
|
|
@ -1,3 +1,11 @@
|
|||
2016-03-08 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
|
||||
|
||||
* 38074: Completion/Unix/Command/_git: _git reset HEAD:
|
||||
complete only staged files
|
||||
|
||||
* 38108: Config/defs.mk.in, Doc/Makefile.in, Doc/ztexi.yo,
|
||||
configure.ac: enable to create both zsh_{a4,us}.pdf
|
||||
|
||||
2016-03-07 Oliver Kiddle <opk@zsh.org>
|
||||
|
||||
* 38043: Src/Zle/compcore.c, Src/Zle/complist.c,
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -149,14 +159,14 @@ ps: us_ps a4_ps
|
|||
us_ps: zsh_us.ps
|
||||
.PHONY: us_ps
|
||||
|
||||
zsh_us.ps: zsh.dvi
|
||||
$(DVIPS) -t letter -o $@ zsh.dvi
|
||||
zsh_us.ps: zsh_us.dvi
|
||||
$(DVIPS) -t letter -o $@ zsh_us.dvi
|
||||
|
||||
a4_ps: zsh_a4.ps
|
||||
.PHONY: a4_ps
|
||||
|
||||
zsh_a4.ps: zsh.dvi
|
||||
$(DVIPS) -t a4 -o $@ zsh.dvi
|
||||
zsh_a4.ps: zsh_a4.dvi
|
||||
$(DVIPS) -t a4 -o $@ zsh_a4.dvi
|
||||
|
||||
html: zsh_toc.html
|
||||
.PHONY: html
|
||||
|
|
|
|||
|
|
@ -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()\
|
||||
|
|
|
|||
14
configure.ac
14
configure.ac
|
|
@ -632,14 +632,24 @@ 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([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
|
||||
TEXI2PDF='texi2dvi --pdf'
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue