* make/lysdoc-targets.make (local-WWW): remove ps.gz target.

[lilypond.git] / make / ly-rules.make

diff --git a/make/ly-rules.make b/make/ly-rules.make
index d513ae3dcf9422c65e3facea28a7d9b40f9f7198..5048f717f4fd4e442906e1ce5ce924167616368b 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -1,49 +1,32 @@
 .SUFFIXES: .doc .dvi .tely .texi .ly
 
 
-$(outdir)/%.latex: %.doc
-       if [ -f $@ ]; then chmod a+w $@; fi
+$(outdir)/%.latex $(outdir)/%.fonts.ps:  %.doc
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --verbose $(LILYPOND_BOOK_FLAGS) $<
-       chmod -w $@
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
-       if [ -f $@ ]; then chmod a+w $@; fi
-       time $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
-       chmod -w $@
+       rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null)
+       $(PYTHON) $(LILYPOND_BOOK) --psfonts=$(basename $<).fonts.ps $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
 
 $(outdir)/%.texi: $(outdir)/%.tely
-       if [ -f $@ ]; then chmod a+w $@; fi
-       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+       rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null)
+       $(PYTHON) $(LILYPOND_BOOK) --psfonts=$(notdir $(basename $<)).fonts.ps $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
 #
 # DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
 #      rm -f $<
-       chmod -w $@
 
-# nexi: no-lily texi
-# for plain info doco: don't run lily
+# nexi: n[o-lilypond t]exi
+# for plain info doco: don't run lilypond
 $(outdir)/%.nexi: %.tely
-       if [ -f $@ ]; then chmod a+w $@; fi
+       rm -f $(outdir)/$*.texi
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) --process='true' $<
        mv $(outdir)/$*.texinfo $@ 2>/dev/null || mv $(outdir)/$*.texi $@
-       chmod -w $@
 
-# nfo: info from non-lily texi
 $(outdir)/%.info: $(outdir)/%.nexi
        $(MAKEINFO) -I $(outdir) --output=$(outdir)/$(*F).info $<
 
-# nfo: info from non-lily texi
-#$(outdir)/%.nfo: $(outdir)/%.nexi
-#      $(MAKEINFO) --output=$(outdir)/$(*F).info $<
-
-#
-# let's not do this: this interferes with the lilypond-book dependency mechanism.
-#
-##$(outdir)/%.tex: $(outdir)/%.ly
-##     $(LILYPOND) $(LILYPOND_BOOK_INCLUDES) -o $@ $< 
-
-#
 # Timothy's booklet
 #
 $(outdir)/%-book.ps: $(outdir)/%.ps
@@ -51,8 +34,11 @@ $(outdir)/%-book.ps: $(outdir)/%.ps
        pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
 
 $(outdir)/%.pdf: $(outdir)/%.dvi
-       dvips -u +lilypond.map -o $@.pdfps -t $(DVIPS_PAPERSIZE)  -Ppdf $<
-       ps2pdf -sPAPERSIZE=$(DVIPS_PAPERSIZE) $@.pdfps $@
+       $(cd $(outdir) && dvips $(DVIPS_FLAGS)  -o $(notdir $@).pdfps -t $(DVIPS_PAPERSIZE)  $(notdir $<)  \
+        && gs -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$(notdir $@) -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -c .setpdfwrite -f $(notdir $@).pdfps )
+
+# without -dSAFER
+# gs 8.15 complains of safety of loading a ttf directly 
 
 
 $(outdir)/%.html.omf: %.tely
@@ -64,7 +50,6 @@ $(outdir)/%.pdf.omf: %.tely
 $(outdir)/%.ps.gz.omf: %.tely
        $(call GENERATE_OMF,ps.gz) 
 
-
 $(outdir)/%.html.omf: $(outdir)/%.texi
        $(call GENERATE_OMF,html)