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.
This commit is contained in:
Bruce Momjian 2006-12-15 16:50:10 +00:00
parent 6d3985b46e
commit 880dae5f2b
3 changed files with 16 additions and 18 deletions

View File

@ -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 $<

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.59.2.1 2006/12/15 02:44:33 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.59.2.2 2006/12/15 16:50:10 momjian Exp $ -->
<appendix id="docguide">
<title>Documentation</title>
@ -115,9 +115,6 @@
<acronym>DSSSL</acronym> stylesheets), as well as a number of
related tools. <productname>Jade</productname> 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.)
</para>
</listitem>
</varlistentry>
@ -296,14 +293,6 @@ make install
installed and you want to install the rest of the tool chain
locally.)
</para>
<para>
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 <ulink
url="http://archives.postgresql.org/pgsql-docs/2006-12/msg00064.php">patch</ulink>
fixes the problem and generates output in a few minutes.
</para>
</step>
<step id="doc-openjade-install">

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/stylesheet.dsl,v 1.30.2.1 2006/12/15 14:54:48 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/stylesheet.dsl,v 1.30.2.2 2006/12/15 16:50:10 momjian Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!-- must turn on one of these with -i on the jade command line -->
@ -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