From c0e4e1109a0311375c6fed2e615020fab8481336 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 Apr 2018 18:06:43 +0000 Subject: remake utf-8 man pages, with expanded groff definitions from wl git-svn-id: svn://tug.org/texlive/trunk@47444 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/man/man1/Makefile | 17 ++++++++++++----- Master/texmf-dist/doc/man/man1/findhyph.man1.pdf | Bin 28478 -> 34108 bytes .../doc/man/man1/luaotfload-tool.man1.pdf | Bin 20805 -> 43856 bytes Master/texmf-dist/doc/man/man5/Makefile | 12 +++++++++--- .../doc/man/man5/luaotfload.conf.man5.pdf | Bin 24386 -> 55457 bytes 5 files changed, 21 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/man/man1/Makefile b/Master/texmf-dist/doc/man/man1/Makefile index c6761641213..c36f6619c21 100644 --- a/Master/texmf-dist/doc/man/man1/Makefile +++ b/Master/texmf-dist/doc/man/man1/Makefile @@ -4,14 +4,19 @@ SRC = $(wildcard man1/*.1) PDF = $(patsubst %.1, %.man1.pdf, $(SRC)) -MKPDF = $(GROFF) $(PDFOPTS) $< | $(PSPDF) - $@.tmp && mv $@.tmp $@ || rm $@.tmp +# these variables with automatic variables don't get passed to the +# submake; these definitions are repeated in man5/Makefile. +# All of this is more complicated than it needs to be. +PSPDF_MV = $(PSPDF) - $@.tmp && mv $@.tmp $@ || rm $@.tmp +MKPDF = $(GROFF) $(PDFOPTS) $< | $(PSPDF_MV) +MKPDF_UTF8 = env GROFF_FONT_PATH=../../../tlpkg/dev/groff-utf8 \ + $(GROFF) -K utf8 $(PDFOPTS) $< | $(PSPDF_MV) all: pdf pdf: $(PDF) - clean: @echo 'Removing pdf files.' - @rm -f -- $(PDF) + rm -f -- $(PDF) %.man1.pdf: %.1 $(MKPDF) @@ -21,9 +26,11 @@ clean: man1/mendex.man1.pdf: man1/mendex.1 @echo 'Skipping mendex.1, leaving it to texjp.' -# Special case for findhyph, which uses UTF-8. Maybe there are more? +# man pages which use UTF-8; probably there are more. man1/findhyph.man1.pdf: man1/findhyph.1 - $(GROFF) -K utf8 $(PDFOPTS) $< | $(PSPDF) - $@.tmp && mv $@.tmp $@ || rm $@.tmp + $(MKPDF_UTF8) +man1/luaotfload-tool.man1.pdf: man1/luaotfload-tool.1 + $(MKPDF_UTF8) # # See ../Makefile for the so.rules target which generates this list of rules. diff --git a/Master/texmf-dist/doc/man/man1/findhyph.man1.pdf b/Master/texmf-dist/doc/man/man1/findhyph.man1.pdf index 809dab8a2ed..7296f37d8d2 100644 Binary files a/Master/texmf-dist/doc/man/man1/findhyph.man1.pdf and b/Master/texmf-dist/doc/man/man1/findhyph.man1.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf index cc18e2d1972..7033ba11b87 100644 Binary files a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf and b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf differ diff --git a/Master/texmf-dist/doc/man/man5/Makefile b/Master/texmf-dist/doc/man/man5/Makefile index c0afb8965a5..a81c5624d41 100644 --- a/Master/texmf-dist/doc/man/man5/Makefile +++ b/Master/texmf-dist/doc/man/man5/Makefile @@ -1,17 +1,23 @@ +# $Id$ # Public domain. Originally written by Manuel Pegourie-Gonnard, 2008. SRC = $(wildcard man5/*.5) PDF = $(patsubst %.5, %.man5.pdf, $(SRC)) -MKPDF = $(GROFF) $(PDFOPTS) $< | $(PSPDF) - $@.tmp && mv $@.tmp $@ || rm $@.tmp +PSPDF_MV = $(PSPDF) - $@.tmp && mv $@.tmp $@ || rm $@.tmp +MKPDF = $(GROFF) $(PDFOPTS) $< | $(PSPDF_MV) +MKPDF_UTF8 = env GROFF_FONT_PATH=../../../tlpkg/dev/groff-utf8 \ + $(GROFF) -K utf8 $(PDFOPTS) $< | $(PSPDF_MV) all: pdf pdf: $(PDF) - clean: @echo 'Removing pdf files.' - @rm -f -- $(PDF) + rm -f -- $(PDF) %.man5.pdf: %.5 $(MKPDF) +man5/luaotfload.conf.man5.pdf: man5/luaotfload.conf.5 + $(MKPDF_UTF8) + diff --git a/Master/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf b/Master/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf index 2d85ebd2f16..f86bf9b2014 100644 Binary files a/Master/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf and b/Master/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf differ -- cgit v1.2.3