Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit421c1ca

Browse files
committed
Back out double-run of PDF/PS output. Requires building bookindex.sgml
properly.Remove SGML docs about openjade performance patch, and instead addcomment in style sheet where indenting code is commented out.Backpatch to 8.2.X.
1 parent8186e7e commit421c1ca

File tree

3 files changed

+20
-28
lines changed

3 files changed

+20
-28
lines changed

‎doc/src/sgml/Makefile

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# PostgreSQL documentation makefile
44
#
5-
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.85 2006/12/1501:20:59 momjian Exp $
5+
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.86 2006/12/1516:50:07 momjian Exp $
66
#
77
#----------------------------------------------------------------------------
88

@@ -99,6 +99,9 @@ endif
9999

100100
COLLATEINDEX := LC_ALL=C$(PERL)$(COLLATEINDEX) -f -g
101101

102+
# If HTML.index does not exist, create a dummy bookindex.sgml. During the
103+
# next build, create bookindex.sgml with the proper index contents. A proper
104+
# bookindex.sgml is required to have an index in the output.
102105
ifeq (,$(wildcard HTML.index))
103106
bookindex.sgml:
104107
$(COLLATEINDEX) -o$@ -N
@@ -136,29 +139,21 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package
136139

137140
JADE.tex.call =$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d$(srcdir)/stylesheet.dsl -t tex -V tex-backend -i output-print
138141

139-
%-A4.tex-ps:%.sgml$(ALLSGML) stylesheet.dsl
140-
# multiple runs are necessary to create proper index entries
141-
$(JADE.tex.call) -V texdvi-output -V'%paper-type%'=A4 -o$@$<
142+
%-A4.tex-ps:%.sgml$(ALLSGML) stylesheet.dsl bookindex.sgml
142143
$(JADE.tex.call) -V texdvi-output -V'%paper-type%'=A4 -o$@$<
143144

144-
%-US.tex-ps:%.sgml$(ALLSGML) stylesheet.dsl
145-
# multiple runs are necessary to create proper index entries
146-
$(JADE.tex.call) -V texdvi-output -V'%paper-type%'=USletter -o$@$<
145+
%-US.tex-ps:%.sgml$(ALLSGML) stylesheet.dsl bookindex.sgml
147146
$(JADE.tex.call) -V texdvi-output -V'%paper-type%'=USletter -o$@$<
148147

149-
%-A4.tex-pdf:%.sgml$(ALLSGML) stylesheet.dsl
150-
# multiple runs are necessary to create proper index entries
151-
$(JADE.tex.call) -V texpdf-output -V'%paper-type%'=A4 -o$@$<
148+
%-A4.tex-pdf:%.sgml$(ALLSGML) stylesheet.dsl bookindex.sgml
152149
$(JADE.tex.call) -V texpdf-output -V'%paper-type%'=A4 -o$@$<
153150

154-
%-US.tex-pdf:%.sgml$(ALLSGML) stylesheet.dsl
155-
# multiple runs are necessary to create proper index entries
156-
$(JADE.tex.call) -V texpdf-output -V'%paper-type%'=USletter -o$@$<
151+
%-US.tex-pdf:%.sgml$(ALLSGML) stylesheet.dsl bookindex.sgml
157152
$(JADE.tex.call) -V texpdf-output -V'%paper-type%'=USletter -o$@$<
158153

159154
%.dvi:%.tex-ps
160155
@rm -f$*.aux$*.log
161-
# multiple runs are necessary to create properindex entries
156+
# multiple runs are necessary to create properintra-document links
162157
jadetex$<
163158
jadetex$<
164159
jadetex$<
@@ -169,7 +164,7 @@ JADE.tex.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d $(srcdir)/styl
169164

170165
%.pdf:%.tex-pdf
171166
@rm -f$*.aux$*.log$*.out
172-
# multiple runs are necessary to create properindex entries
167+
# multiple runs are necessary to create properintra-document links
173168
pdfjadetex$<
174169
pdfjadetex$<
175170
pdfjadetex$<

‎doc/src/sgml/docguide.sgml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.62 2006/12/1502:44:28 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.63 2006/12/1516:50:07 momjian Exp $ -->
22

33
<appendix id="docguide">
44
<title>Documentation</title>
@@ -115,9 +115,6 @@
115115
<acronym>DSSSL</acronym> stylesheets), as well as a number of
116116
related tools. <productname>Jade</productname> is now being
117117
maintained by the OpenJade group, no longer by James Clark.
118-
(If generating Postscript or PDF output, you will need to
119-
compile from source and use a special patch to get output
120-
in a reasonable amount of time.)
121118
</para>
122119
</listitem>
123120
</varlistentry>
@@ -298,14 +295,6 @@ make install
298295
installed and you want to install the rest of the tool chain
299296
locally.)
300297
</para>
301-
302-
<para>
303-
OpenJade release 1.3.2 and perhaps earlier and later releases
304-
have a known bug that causes Postscript and PDF output
305-
generation to take days. This <ulink
306-
url="http://archives.postgresql.org/pgsql-docs/2006-12/msg00064.php">patch</ulink>
307-
fixes the problem and generates output in a few minutes.
308-
</para>
309298
</step>
310299

311300
<step id="doc-openjade-install">

‎doc/src/sgml/stylesheet.dsl

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/stylesheet.dsl,v1.31 2006/12/1001:55:29 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/stylesheet.dsl,v1.32 2006/12/15 16:50:07 momjian Exp $ -->
22
<!DOCTYPE style-sheet PUBLIC"-//James Clark//DTD DSSSL Style Sheet//EN" [
33

44
<!-- must turn on one of these with -i on the jade command line -->
@@ -280,6 +280,14 @@
280280
(define %refentry-new-page% #t)
281281
(define %refentry-keep% #f)
282282

283+
;; Indentation of verbatim environments. (This should really be done
284+
;; with start-indent in DSSSL.)
285+
;; Use of indentation in this area exposes a bug in openjade,
286+
;; http://archives.postgresql.org/pgsql-docs/2006-12/msg00064.php
287+
;; (define %indent-programlisting-lines%" ")
288+
;; (define %indent-screen-lines%" ")
289+
;; (define %indent-synopsis-lines%" ")
290+
283291

284292
;;Default graphic format: Jadetex wants eps, pdfjadetex wants pdf.
285293
;; (Note that pdfjadetex will not accept eps, that's why we need to

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp