Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / stepmake / stepmake / tex-rules.make

diff --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make
index c5da9738cd6540fb758ba955ee5c7389c1132d93..6751e5da9a03b292ae95b1535bcdbb0053d99928 100644 (file)
--- a/stepmake/stepmake/tex-rules.make
+++ b/stepmake/stepmake/tex-rules.make
@@ -13,9 +13,24 @@ $(outdir)/%.dvi: $(outdir)/%.latex
          (makeindex $(basename $(<F)) || true) && \
          latex \\nonstopmode \\input $(<F) )
 
-$(outdir)/%.ps: $(outdir)/%.dvi
-       cd $(outdir) && dvips -ta4 -o $(@F) $(<F)
+$(outdir)/%.pdf: $(outdir)/%.dvi
+       cd $(outdir) \
+               && dvips $(DVIPS_FLAGS) -t $(DVIPS_PAPERSIZE) \
+                       -o $(@F).pdfps $(<F) \
+               && gs -dCompatibilityLevel=1.2\
+                       -sPAPERSIZE=a4\
+                       -q\
+                       -dNOPAUSE\
+                       -dBATCH\
+                       -sDEVICE=pdfwrite\
+                       -sOutputFile=$(@F)\
+                       -dCompatibilityLevel=1.2\
+                       -sPAPERSIZE=a4\
+                       -c .setpdfwrite\
+                       -f $(@F).pdfps
+
+
+# without -dSAFER
+# gs 8.15 complains of safety of loading a ttf directly
 
-$(outdir)-$(PAPERSIZE)/%.ps: $(outdir)-$(PAPERSIZE)/%.dvi
-       cd $(outdir) && dvips -t$(PAPERSIZE) -o $(@F) $(<F)