Commit d49cc588 authored by Peter Eisentraut's avatar Peter Eisentraut

doc: Don't reformat .fo files before processing by fop

This messes up the whitespace in the output PDF document in some places.
parent 6feb69f6
...@@ -270,20 +270,16 @@ htmlhelp: stylesheet-hh.xsl postgres.xml ...@@ -270,20 +270,16 @@ htmlhelp: stylesheet-hh.xsl postgres.xml
$(XMLLINT) --noout --valid postgres.xml $(XMLLINT) --noout --valid postgres.xml
$(XSLTPROC) $(XSLTPROCFLAGS) $^ $(XSLTPROC) $(XSLTPROCFLAGS) $^
%-A4.fo.tmp: stylesheet-fo.xsl %.xml %-A4.fo: stylesheet-fo.xsl %.xml
$(XMLLINT) --noout --valid $*.xml $(XMLLINT) --noout --valid $*.xml
$(XSLTPROC) $(XSLTPROCFLAGS) --stringparam paper.type A4 -o $@ $^ $(XSLTPROC) $(XSLTPROCFLAGS) --stringparam paper.type A4 -o $@ $^
%-US.fo.tmp: stylesheet-fo.xsl %.xml %-US.fo: stylesheet-fo.xsl %.xml
$(XMLLINT) --noout --valid $*.xml $(XMLLINT) --noout --valid $*.xml
$(XSLTPROC) $(XSLTPROCFLAGS) --stringparam paper.type USletter -o $@ $^ $(XSLTPROC) $(XSLTPROCFLAGS) --stringparam paper.type USletter -o $@ $^
FOP = fop FOP = fop
# reformat FO output so that locations of errors are easier to find
%.fo: %.fo.tmp
$(XMLLINT) --format --output $@ $^
.SECONDARY: postgres-A4.fo postgres-US.fo .SECONDARY: postgres-A4.fo postgres-US.fo
%-fop.pdf: %.fo %-fop.pdf: %.fo
...@@ -404,7 +400,7 @@ clean: ...@@ -404,7 +400,7 @@ clean:
# index # index
rm -f HTML.index $(GENERATED_SGML) rm -f HTML.index $(GENERATED_SGML)
# XSLT # XSLT
rm -f postgres.xml postgres.xmltmp htmlhelp.hhp toc.hhc index.hhk *.fo *.fo.tmp rm -f postgres.xml postgres.xmltmp htmlhelp.hhp toc.hhc index.hhk *.fo
# EPUB # EPUB
rm -f postgres.epub rm -f postgres.epub
# Texinfo # Texinfo
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment