From 880dae5f2bfa89a40888bcfb14d7d3c9deb2cc9b Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 15 Dec 2006 16:50:10 +0000 Subject: [PATCH] Back out double-run of PDF/PS output. Requires building bookindex.sgml properly. Remove SGML docs about openjade performance patch, and instead add comment in style sheet where indenting code is commented out. Backpatch to 8.2.X. --- doc/src/sgml/Makefile | 11 ++++++----- doc/src/sgml/docguide.sgml | 13 +------------ doc/src/sgml/stylesheet.dsl | 10 +++++++++- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 95300bce1b..d38798b96f 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -2,7 +2,7 @@ # # PostgreSQL documentation makefile # -# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.81.2.1 2006/12/15 01:21:08 momjian Exp $ +# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.81.2.2 2006/12/15 16:50:10 momjian Exp $ # #---------------------------------------------------------------------------- @@ -99,6 +99,9 @@ endif COLLATEINDEX := LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g +# If HTML.index does not exist, create a dummy bookindex.sgml. During the +# next build, create bookindex.sgml with the proper index contents. A proper +# bookindex.sgml is required to have an index in the output. ifeq (,$(wildcard HTML.index)) bookindex.sgml: $(COLLATEINDEX) -o $@ -N @@ -136,16 +139,14 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package %.tex-ps: %.sgml $(ALLSGML) stylesheet.dsl # multiple runs are necessary to create proper index entries $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texdvi-output -o $@ $< - $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texdvi-output -o $@ $< %.tex-pdf: %.sgml $(ALLSGML) stylesheet.dsl # multiple runs are necessary to create proper index entries $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texpdf-output -o $@ $< - $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texpdf-output -o $@ $< %.dvi: %.tex-ps @rm -f $*.aux $*.log - # multiple runs are necessary to create proper index entries + # multiple runs are necessary to create proper intra-document links jadetex $< jadetex $< jadetex $< @@ -156,7 +157,7 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package %.pdf: %.tex-pdf @rm -f $*.aux $*.log $*.out - # multiple runs are necessary to create proper index entries + # multiple runs are necessary to create proper intra-document links pdfjadetex $< pdfjadetex $< pdfjadetex $< diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index 19f52ac422..68cb605a4b 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -1,4 +1,4 @@ - + Documentation @@ -115,9 +115,6 @@ DSSSL stylesheets), as well as a number of related tools. Jade is now being maintained by the OpenJade group, no longer by James Clark. - (If generating Postscript or PDF output, you will need to - compile from source and use a special patch to get output - in a reasonable amount of time.) @@ -296,14 +293,6 @@ make install installed and you want to install the rest of the tool chain locally.) - - - OpenJade release 1.3.2 and perhaps earlier and later releases - have a known bug that causes Postscript and PDF output - generation to take days. This patch - fixes the problem and generates output in a few minutes. - diff --git a/doc/src/sgml/stylesheet.dsl b/doc/src/sgml/stylesheet.dsl index 7f0e04c223..fdf36a6b1d 100644 --- a/doc/src/sgml/stylesheet.dsl +++ b/doc/src/sgml/stylesheet.dsl @@ -1,4 +1,4 @@ - + @@ -280,6 +280,14 @@ (define %refentry-new-page% #t) (define %refentry-keep% #f) +;; Indentation of verbatim environments. (This should really be done +;; with start-indent in DSSSL.) +;; Use of indentation in this area exposes a bug in openjade, +;; http://archives.postgresql.org/pgsql-docs/2006-12/msg00064.php +;; (define %indent-programlisting-lines% " ") +;; (define %indent-screen-lines% " ") +;; (define %indent-synopsis-lines% " ") + ;; Default graphic format: Jadetex wants eps, pdfjadetex wants pdf. ;; (Note that pdfjadetex will not accept eps, that's why we need to