From: Andreas Seltenreich <andreas+pg@gate450.dyndns.org>
To: Peter Eisentraut <peter_e@gmx.net>
Cc: pgsql-docs@postgresql.org
Subject: Re: Texinfo docs/target
References: <87br0gmi29.fsf@gate450.dyndns.org>
	<200511192307.48944.peter_e@gmx.net>
Mail-Followup-To: Peter Eisentraut <peter_e@gmx.net>,
	andreas+pg@gate450.dyndns.org, pgsql-docs@postgresql.org
Date: Fri, 29 Sep 2006 06:32:27 +0200
In-Reply-To: <200511192307.48944.peter_e@gmx.net> (Peter Eisentraut's message
	of "Sat\, 19 Nov 2005 23\:07\:48 +0100")
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.50 (gnu/linux)
Message-ID: <87ejtvz410.fsf@gate450.dyndns.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=

Peter Eisentraut <peter_e@gmx.net> writes:

> Andreas Seltenreich wrote:
>> Now I'm wondering, if it'd be worth fixing the index and some minor
>> encoding deficiencies (e.g. medium-length dashes end up as
>> "[mdash]"), and adding Autoconf support in order to make it a proper
>> target.
>
> We probably won't ship it with the default distribution, but I don't see 
> any harm in at least providing build support for it initially.

The index seems to work with more recent versions of DB2X, and the
apparent encoding problems turned out to be an overlook in the
postgres.xml target.

I had to run makeinfo with the --no-validate option, mostly because
the info design doesn't allow duplicate node names.  However, it
doesn't seem to impair navigation besides addressing nodes by name,
and since most of the duplicate names are nodes like "Changes" in the
release notes section, I don't think it will be more of a nuisance
than being unable to look up Pi in the index...

I figured adding autoconf support for db2x/info wouldn't be very wise
as long as the experimental postgres.xml target the new rules depend
on doesn't have any either.

Patch attached.

regards,
andreas


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=Makefile.diff

Index: doc/src/sgml/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql/doc/src/sgml/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- doc/src/sgml/Makefile	6 Apr 2006 18:54:36 -0000	1.76
+++ doc/src/sgml/Makefile	29 Sep 2006 04:27:59 -0000
@@ -212,7 +212,7 @@
 
 postgres.xml: postgres.sgml $(GENERATED_SGML)
 	$(OSX) -x lower $< | \
-	  sed -e 's/\[\(lt\|gt\|amp\|nbsp\|copy\|quot\|ouml\|uuml\|egrave\) *\]/\&\1;/g' \
+	  sed -e 's/\[\(amp\|copy\|egrave\|gt\|lt\|mdash\|nbsp\|ouml\|pi\|quot\|uuml\) *\]/\&\1;/g' \
 	      -e '1a\' -e '<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">' \
 	  >$@
 
@@ -222,6 +222,24 @@
 htmlhelp: stylesheet-hh.xsl postgres.xml
 	$(XSLTPROC) $(XSLTPROCFLAGS) --stringparam pg.version '$(VERSION)' $^
 
+##
+## Experimental Texinfo targets
+##
+
+DB2X_TEXIXML = db2x_texixml
+DB2X_XSLTPROC = db2x_xsltproc
+MAKEINFO = makeinfo
+
+postgres.texixml: postgres.xml
+	$(DB2X_XSLTPROC) -s texi $< -o $@
+
+postgres.texi: postgres.texixml
+	$(DB2X_TEXIXML) --encoding=iso-8859-1//TRANSLIT $< \
+			--to-stdout > $@
+
+postgres.info: postgres.texi
+	$(MAKEINFO) --enable-encoding --no-split \
+		    --no-validate $< -o $@
 
 ##
 ## Check
@@ -249,3 +267,5 @@
 	rm -f INSTALL HISTORY regress_README
 # XML
 	rm -f postgres.xml htmlhelp.hhp toc.hhc index.hhk
+# Texinfo
+	rm -f *.texixml *.texi *.info db2texi.refs

--=-=-=--