diff --git a/make-includes/standard_rules.make b/make-includes/standard_rules.make index f4be5f0..5a93768 100755 --- a/make-includes/standard_rules.make +++ b/make-includes/standard_rules.make @@ -33,7 +33,7 @@ # %.pdf %-print.pdf: $(IMGDIR)/%.tex latex --jobname=$(IMGDIR)/$* $< - dvips -q -f $(IMGDIR)/$* | ps2eps -q -l | epstopdf -f -o=$(IMGDIR)/$@ + dvips -q -f $(IMGDIR)/$* | ps2eps --quiet --loose | epstopdf --filter --outfile=$(IMGDIR)/$@ # # PDF from LaTeX. # @@ -63,7 +63,7 @@ # %-derived.xml: %.xml xmllint --xinclude $< > $@ - @sed -i -e '1a ' $@ + @sed --in-place --expression='1a ' $@ # # LaTeX from derived XML. # @@ -118,12 +118,13 @@ # PDF from PS # %.pdf %-print.pdf: %.ps - ps2eps --ignoreBB --nohires --loose < $< | ps2pdf -dEPSCrop - $(IMGDIR)/$@ + ps2eps --quiet --ignoreBB --nohires --loose < $< | epstopdf --filter --outfile=$(IMGDIR)/$@ # # PDF from EPS # %.pdf %-print.pdf: %.eps - ps2eps --ignoreBB --nohires --loose < $< | ps2pdf -dEPSCrop - $(IMGDIR)/$@ + epstopdf --outfile=$(IMGDIR)/$@ $< +# ps2eps --ignoreBB --nohires --loose < $< | ps2pdf -dEPSCrop - $(IMGDIR)/$@ # # PDF from SVG (via Inkscape) # The --export-area-drawing option now appears to behave correctly with