From 96b8b8b6f9d8de4af01a77797273ad88c7a8e32e Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 11 Jan 2019 12:02:48 +0100 Subject: [PATCH] Create INSTALL file using Pandoc Replace using lynx with using pandoc. Pandoc creates better looking output and it avoids the delicate locale/encoding issues of lynx because it always uses UTF-8 for both input and output. Note: requires Pandoc >=1.13 Discussion: https://www.postgresql.org/message-id/flat/dcfaa74d-8037-bb32-f9e0-3fea7ccf4551@2ndquadrant.com/ Reviewed-by: Mi Tar --- doc/src/sgml/Makefile | 14 +++----------- doc/src/sgml/docguide.sgml | 4 +++- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 74aac01c39..93b0b60cdb 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -100,18 +100,10 @@ errcodes-table.sgml: $(top_srcdir)/src/backend/utils/errcodes.txt generate-errco ## ICONV = iconv -LYNX = lynx - -# The documentation may contain non-ASCII characters (mostly for -# contributor names), which lynx converts to the encoding determined -# by the current locale. To get text output that is deterministic and -# easily readable by everyone, we make lynx produce LATIN1 and then -# convert that to ASCII with transliteration for the non-ASCII characters. -# Official releases were historically built on FreeBSD, which has limited -# locale support and is very picky about locale name spelling. The -# below has been finely tuned to run on FreeBSD and Linux/glibc. +PANDOC = pandoc + INSTALL: % : %.html - $(PERL) -p -e 's, $@ + $(PANDOC) $< -t plain | $(ICONV) -f utf8 -t us-ascii//TRANSLIT > $@ INSTALL.html: %.html : stylesheet-text.xsl %.xml $(XMLLINT) --noout --valid $*.xml diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index 420a2f9d6e..aa0f278b02 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -358,7 +358,9 @@ ADDITIONAL_FLAGS='-Xmx1500m' corresponds to , with some minor changes to account for the different context. To recreate the file, change to the directory doc/src/sgml - and enter make INSTALL. + and enter make INSTALL. Building text output + requires Pandoc version 1.13 or newer as an + additional build tool. -- 2.39.5