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
parent
8186e7ef89
commit
421c1ca48d
|
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
# PostgreSQL documentation makefile
|
||||
#
|
||||
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.85 2006/12/15 01:20:59 momjian Exp $
|
||||
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.86 2006/12/15 16:50:07 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,29 +139,21 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package
|
|||
|
||||
JADE.tex.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d $(srcdir)/stylesheet.dsl -t tex -V tex-backend -i output-print
|
||||
|
||||
%-A4.tex-ps: %.sgml $(ALLSGML) stylesheet.dsl
|
||||
# multiple runs are necessary to create proper index entries
|
||||
$(JADE.tex.call) -V texdvi-output -V '%paper-type%'=A4 -o $@ $<
|
||||
%-A4.tex-ps: %.sgml $(ALLSGML) stylesheet.dsl bookindex.sgml
|
||||
$(JADE.tex.call) -V texdvi-output -V '%paper-type%'=A4 -o $@ $<
|
||||
|
||||
%-US.tex-ps: %.sgml $(ALLSGML) stylesheet.dsl
|
||||
# multiple runs are necessary to create proper index entries
|
||||
$(JADE.tex.call) -V texdvi-output -V '%paper-type%'=USletter -o $@ $<
|
||||
%-US.tex-ps: %.sgml $(ALLSGML) stylesheet.dsl bookindex.sgml
|
||||
$(JADE.tex.call) -V texdvi-output -V '%paper-type%'=USletter -o $@ $<
|
||||
|
||||
%-A4.tex-pdf: %.sgml $(ALLSGML) stylesheet.dsl
|
||||
# multiple runs are necessary to create proper index entries
|
||||
$(JADE.tex.call) -V texpdf-output -V '%paper-type%'=A4 -o $@ $<
|
||||
%-A4.tex-pdf: %.sgml $(ALLSGML) stylesheet.dsl bookindex.sgml
|
||||
$(JADE.tex.call) -V texpdf-output -V '%paper-type%'=A4 -o $@ $<
|
||||
|
||||
%-US.tex-pdf: %.sgml $(ALLSGML) stylesheet.dsl
|
||||
# multiple runs are necessary to create proper index entries
|
||||
$(JADE.tex.call) -V texpdf-output -V '%paper-type%'=USletter -o $@ $<
|
||||
%-US.tex-pdf: %.sgml $(ALLSGML) stylesheet.dsl bookindex.sgml
|
||||
$(JADE.tex.call) -V texpdf-output -V '%paper-type%'=USletter -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 $<
|
||||
|
|
@ -169,7 +164,7 @@ JADE.tex.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d $(srcdir)/styl
|
|||
|
||||
%.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 $<
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.62 2006/12/15 02:44:28 momjian Exp $ -->
|
||||
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.63 2006/12/15 16:50:07 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>
|
||||
|
|
@ -298,14 +295,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">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!-- $PostgreSQL: pgsql/doc/src/sgml/stylesheet.dsl,v 1.31 2006/12/10 01:55:29 petere Exp $ -->
|
||||
<!-- $PostgreSQL: pgsql/doc/src/sgml/stylesheet.dsl,v 1.32 2006/12/15 16:50:07 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue