diff options
| -rw-r--r-- | doc/src/sgml/Makefile | 29 | ||||
| -rw-r--r-- | doc/src/sgml/docguide.sgml | 21 |
2 files changed, 31 insertions, 19 deletions
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index c60dcf272ab..b8f4d67b05b 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.83 2006/12/10 16:01:06 petere Exp $ +# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.84 2006/12/10 20:46:03 petere Exp $ # #---------------------------------------------------------------------------- @@ -124,6 +124,7 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package ## Print ## + # RTF to allow minor editing for hardcopy %.rtf: %.sgml $(ALLSGML) stylesheet.dsl @@ -133,11 +134,19 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package # Regular TeX and pdfTeX have slightly differing requirements, so we # need to distinguish the path we're taking. -%.tex-ps: %.sgml $(ALLSGML) stylesheet.dsl - $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texdvi-output -o $@ $< +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 + $(JADE.tex.call) -V texdvi-output -V '%paper-type%'=A4 -o $@ $< + +%-US.tex-ps: %.sgml $(ALLSGML) stylesheet.dsl + $(JADE.tex.call) -V texdvi-output -V '%paper-type%'=USletter -o $@ $< -%.tex-pdf: %.sgml $(ALLSGML) stylesheet.dsl - $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -V texpdf-output -o $@ $< +%-A4.tex-pdf: %.sgml $(ALLSGML) stylesheet.dsl + $(JADE.tex.call) -V texpdf-output -V '%paper-type%'=A4 -o $@ $< + +%-US.tex-pdf: %.sgml $(ALLSGML) stylesheet.dsl + $(JADE.tex.call) -V texpdf-output -V '%paper-type%'=USletter -o $@ $< %.dvi: %.tex-ps @rm -f $*.aux $*.log @@ -145,7 +154,7 @@ features-unsupported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_package jadetex $< jadetex $< -# Postscript from TeX +# PostScript from TeX %.ps: %.dvi dvips -o $@ $< @@ -218,6 +227,7 @@ postgres.xml: postgres.sgml $(GENERATED_SGML) sed -e 's/\[\(amp\|copy\|egrave\|gt\|lt\|mdash\|nbsp\|ouml\|pi\|quot\|uuml\) *\]/\&\1;/g' \ -e '1a\' -e '<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">' \ >$@ +# ' hello Emacs override XSLTPROCFLAGS += --stringparam pg.version '$(VERSION)' @@ -227,8 +237,11 @@ xslthtml: stylesheet.xsl postgres.xml htmlhelp: stylesheet-hh.xsl postgres.xml $(XSLTPROC) $(XSLTPROCFLAGS) $^ -%.fo: stylesheet-fo.xsl %.xml - $(XSLTPROC) $(XSLTPROCFLAGS) -o $@ $^ +%-A4.fo: stylesheet-fo.xsl %.xml + $(XSLTPROC) $(XSLTPROCFLAGS) --stringparam paper.type A4 -o $@ $^ + +%-US.fo: stylesheet-fo.xsl %.xml + $(XSLTPROC) $(XSLTPROCFLAGS) --stringparam paper.type USletter -o $@ $^ ## diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index 68359fdd307..027de156b34 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.60 2006/12/10 02:37:40 petere Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.61 2006/12/10 20:46:03 petere Exp $ --> <appendix id="docguide"> <title>Documentation</title> @@ -601,18 +601,13 @@ gmake man.tar.gz <itemizedlist> <listitem> <para> - To make a <acronym>DVI</acronym> version: + To generate PostScript via <acronym>DVI</acronym> in A4 format: <screen> -<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres.dvi</userinput> +<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-A4.ps</userinput> </screen> - </para> - </listitem> - - <listitem> - <para> - To generate PostScript from the <acronym>DVI</acronym>: + In U.S. letter format: <screen> -<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres.ps</userinput> +<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-US.ps</userinput> </screen> </para> </listitem> @@ -621,7 +616,11 @@ gmake man.tar.gz <para> To make a <acronym>PDF</acronym>: <screen> -<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres.pdf</userinput> +<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-A4.pdf</userinput> +</screen> + or +<screen> +<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-US.pdf</userinput> </screen> (Of course you can also make a <acronym>PDF</acronym> version from the PostScript, but if you generate <acronym>PDF</acronym> |