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

Commit314c7b6

Browse files
committed
Make separate targets for building printable documentation in A4 and
US letter paper formats.
1 parent5f1f30d commit314c7b6

File tree

2 files changed

+31
-19
lines changed

2 files changed

+31
-19
lines changed

‎doc/src/sgml/Makefile

Lines changed: 21 additions & 8 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.83 2006/12/1016:01:06 petere Exp $
5+
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.84 2006/12/1020:46:03 petere Exp $
66
#
77
#----------------------------------------------------------------------------
88

@@ -124,6 +124,7 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package
124124
## Print
125125
##
126126

127+
127128
# RTF to allow minor editing for hardcopy
128129

129130
%.rtf:%.sgml$(ALLSGML) stylesheet.dsl
@@ -133,19 +134,27 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package
133134
# Regular TeX and pdfTeX have slightly differing requirements, so we
134135
# need to distinguish the path we're taking.
135136

136-
%.tex-ps:%.sgml$(ALLSGML) stylesheet.dsl
137-
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texdvi-output -o$@$<
137+
JADE.tex.call =$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d$(srcdir)/stylesheet.dsl -t tex -V tex-backend -i output-print
138+
139+
%-A4.tex-ps:%.sgml$(ALLSGML) stylesheet.dsl
140+
$(JADE.tex.call) -V texdvi-output -V'%paper-type%'=A4 -o$@$<
141+
142+
%-US.tex-ps:%.sgml$(ALLSGML) stylesheet.dsl
143+
$(JADE.tex.call) -V texdvi-output -V'%paper-type%'=USletter -o$@$<
138144

139-
%.tex-pdf:%.sgml$(ALLSGML) stylesheet.dsl
140-
$(JADE)$(JADEFLAGS)$(SGMLINCLUDE)$(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texpdf-output -o$@$<
145+
%-A4.tex-pdf:%.sgml$(ALLSGML) stylesheet.dsl
146+
$(JADE.tex.call) -V texpdf-output -V'%paper-type%'=A4 -o$@$<
147+
148+
%-US.tex-pdf:%.sgml$(ALLSGML) stylesheet.dsl
149+
$(JADE.tex.call) -V texpdf-output -V'%paper-type%'=USletter -o$@$<
141150

142151
%.dvi:%.tex-ps
143152
@rm -f$*.aux$*.log
144153
jadetex$<
145154
jadetex$<
146155
jadetex$<
147156

148-
#Postscript from TeX
157+
#PostScript from TeX
149158
%.ps:%.dvi
150159
dvips -o$@$<
151160

@@ -218,6 +227,7 @@ postgres.xml: postgres.sgml $(GENERATED_SGML)
218227
sed -e's/\[\(amp\|copy\|egrave\|gt\|lt\|mdash\|nbsp\|ouml\|pi\|quot\|uuml\) *\]/\&\1;/g'\
219228
-e'1a\' -e'<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">'\
220229
>$@
230+
# ' hello Emacs
221231

222232
overrideXSLTPROCFLAGS += --stringparam pg.version '$(VERSION)'
223233

@@ -227,8 +237,11 @@ xslthtml: stylesheet.xsl postgres.xml
227237
htmlhelp: stylesheet-hh.xsl postgres.xml
228238
$(XSLTPROC)$(XSLTPROCFLAGS)$^
229239

230-
%.fo: stylesheet-fo.xsl%.xml
231-
$(XSLTPROC)$(XSLTPROCFLAGS) -o$@$^
240+
%-A4.fo: stylesheet-fo.xsl%.xml
241+
$(XSLTPROC)$(XSLTPROCFLAGS) --stringparam paper.type A4 -o$@$^
242+
243+
%-US.fo: stylesheet-fo.xsl%.xml
244+
$(XSLTPROC)$(XSLTPROCFLAGS) --stringparam paper.type USletter -o$@$^
232245

233246

234247
##

‎doc/src/sgml/docguide.sgml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.60 2006/12/1002:37:40 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.61 2006/12/1020:46:03 petere Exp $ -->
22

33
<appendix id="docguide">
44
<title>Documentation</title>
@@ -601,18 +601,13 @@ gmake man.tar.gz
601601
<itemizedlist>
602602
<listitem>
603603
<para>
604-
Tomake a<acronym>DVI</acronym>version:
604+
Togenerate PostScript via<acronym>DVI</acronym>in A4 format:
605605
<screen>
606-
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres.dvi</userinput>
606+
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-A4.ps</userinput>
607607
</screen>
608-
</para>
609-
</listitem>
610-
611-
<listitem>
612-
<para>
613-
To generate PostScript from the <acronym>DVI</acronym>:
608+
In U.S. letter format:
614609
<screen>
615-
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres.ps</userinput>
610+
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-US.ps</userinput>
616611
</screen>
617612
</para>
618613
</listitem>
@@ -621,7 +616,11 @@ gmake man.tar.gz
621616
<para>
622617
To make a <acronym>PDF</acronym>:
623618
<screen>
624-
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres.pdf</userinput>
619+
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-A4.pdf</userinput>
620+
</screen>
621+
or
622+
<screen>
623+
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-US.pdf</userinput>
625624
</screen>
626625
(Of course you can also make a <acronym>PDF</acronym> version
627626
from the PostScript, but if you generate <acronym>PDF</acronym>

0 commit comments

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