From 39f1412aab623d7154950692781af36f470bdd6e Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 24 Jul 2004 12:25:49 +0000 Subject: * make/lilypond-vars.make: centralize LILYPOND_BOOK_FLAGS setting. (LILYPOND_BOOK_FLAGS): use -f tex for lilypond-book. * scm/framework-ps.scm (convert-to-pdf): new function. Call ps2pdf. (output-preview-framework): new function. Generate a preview .ps --- make/lilypond-vars.make | 2 +- make/mutopia-rules.make | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) (limited to 'make') diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index b571b4c160..e78d33c23b 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -42,5 +42,5 @@ LILYPOND_BOOK_FLAGS = --process="lilypond-bin -f tex --header=texidoc -I $(srcdi #texi-html for www only: LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html) -LY2DVI = $(script-dir)/lilypond.py +LY2DVI = $(LILYPOND) LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make index 8c51c6f197..a86e9c7e42 100644 --- a/make/mutopia-rules.make +++ b/make/mutopia-rules.make @@ -1,11 +1,5 @@ -$(outdir)/%.png: $(outdir)/%.ps - gs -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sOutputFile="$(name-stem)-page%d.png" -r90 -dNOPAUSE $< -c quit - -mv $(name-stem)-page*.png $(outdir)/ - rm -f $@ - ln -s $(name-stem)-page1.png $@ - $(outdir)/%.ly.txt: %.ly ln -f $< $@ @@ -19,13 +13,11 @@ $(outdir)/%.ly.txt: %.abc $(outdir)/%.ly: %.abc $(PYTHON) $(ABC2LY) --strict -o $@ $< -$(outdir)/%.ps: $(outdir)/%.ly - $(PYTHON) $(LY2DVI) --output=$@ $< - -$(outdir)/%.ps: %.ly - $(PYTHON) $(LY2DVI) --output=$@ $< +$(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly +# hmm. notdir builds srcdir builds? + cd $(outdir); $(LILYPOND) --pdf --ps --png $(notdir $<) -$(outdir)/%.pdf: $(outdir)/%.ps - ps2pdf -sPAPERSIZE=a4 $< $@ +$(outdir)/%.ly: %.ly + cp $< $@ -- cgit v1.2.3