about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2024-06-24 12:54:08 +0900
committerJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2024-06-24 12:54:08 +0900
commit98a877d32c5ec047c3985183db655cccc707920f (patch)
treefc4ced7fbaea64d91920278a9b163372fa14f30c
parenta3b56d4f03e493985aa652248e9476c1f8181e4e (diff)
downloadzsh-98a877d32c5ec047c3985183db655cccc707920f.tar.gz
zsh-98a877d32c5ec047c3985183db655cccc707920f.tar.xz
zsh-98a877d32c5ec047c3985183db655cccc707920f.zip
52968: use pdfroff to create intro.pdf
roff2ps is removed in groff-1.23.0 (Jul. 2023). The "doubled output"
problem was fixed in groff-1.22.3 (Nov. 2014).
-rw-r--r--ChangeLog4
-rw-r--r--Doc/Makefile.in8
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 455cf38c3..36fae8a51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2024-06-24  Jun-ichi Takimoto  <takimoto-j@kba.biglobe.ne.jp>
+
+	* 52968: Doc/Makefile.in: use pdfroff to create intro.pdf
+
 2024-06-13  Jun-ichi Takimoto  <takimoto-j@kba.biglobe.ne.jp>
 
 	* 52951: Src/builtin.c: make sure to close memstream for 'print -v'
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index d9be182e9..401fb942b 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -118,15 +118,13 @@ zsh.pdf zsh_a4.pdf zsh_us.pdf: $(sdir)/zsh.texi
 	  $(TEXI2PDF) -o $@ -t @afourpaper $(sdir)/zsh.texi; \
 	fi
 
-# Use roff2ps / ps2pdf because pdfroff produces doubled output.
 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; \
+	  pdfroff -ms -P-pletter $(sdir)/intro.ms > $@; \
 	else \
-	  roff2ps -ms -P-pa4 < $(sdir)/intro.ms > intro.ps; \
-	fi; \
-	ps2pdf -sOutputFile=$@ intro.ps
+	  pdfroff -ms -P-pa4 $(sdir)/intro.ms > $@; \
+	fi
 
 texi: $(sdir)/zsh.texi
 .PHONY: texi