* make/mutopia-rules.make ($(outdir)/%.pdf): use +lilypond.map to

get scalable cm fonts too.

* stepmake/stepmake/metafont-rules.make (ENCODINGOPTION): add
--encoding for mftrace if present.

diff --git a/ChangeLog b/ChangeLog
index 79048b5d6b8a493f9ffc39697a02f3897ba215af..00debe7a054892246be65f46c3fc0caa34a102fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2003-07-17  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * make/mutopia-rules.make ($(outdir)/%.pdf): use +lilypond.map to
+       get scalable cm fonts too.
+
+       * stepmake/stepmake/metafont-rules.make (ENCODINGOPTION): add
+       --encoding for mftrace if present.
+
        * input/regression/slur-area.ly: move from test/
 
        * input/test/: : remove simple-slur-endings slur-attachment

diff --git a/configure.in b/configure.in
index e987b5aad59e05e345d725c13a64023b1a673d12..0d8e38facb2336538de2da5ee1b445cfc4a283ef 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -60,7 +60,7 @@ STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, pktrace mftrace, OPTIONAL, 1.0.18)
+STEPMAKE_PROGS(MFTRACE, pktrace mftrace, OPTIONAL, 1.0.17)
 # new makeinfo for multi-page website docs
 STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.1)
 

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 46a3efa7b679e8dfb80d5d2aab6f8aa9eb9ab936..519f0798e053da17a25a3f0c9449fc1ea73d8708 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -52,10 +52,10 @@ $(outdir)/%.info: $(outdir)/%.nexi
 #
 $(outdir)/%-book.ps: $(outdir)/%.ps
        psbook $< $<.tmp
-       pstops  '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
+       pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
 
 $(outdir)/%.pdf: $(outdir)/%.dvi
-       dvips -u lilypond.map -o $@.pdfps  -Ppdf $<
+       dvips -u +lilypond.map -o $@.pdfps  -Ppdf $<
        ps2pdf $@.pdfps $@
 
 

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index ac833a82945140144a070fe9a2de9c7a9861c832..bd95ef14e2d435ca579d2e49e0faba3610d0b109 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -31,7 +31,7 @@ $(outdir)/%.dvi: %.ly
 
 
 $(outdir)/%.pdf: $(outdir)/%.dvi
-       dvips -u lilypond.map -o $@.pdfps  -Ppdf $<
+       dvips -u +lilypond.map -o $@.pdfps  -Ppdf $<
        ps2pdf $@.pdfps $@
 
 $(outdir)-$(PAPERSIZE)/%.dvi: %.ly

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index e8eb5e611594d8bc248cbbef9aafeb2ac6b9a40a..d696e2bf8c80f2aeb1c6298a36a156303f81d76a 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -29,12 +29,14 @@ $(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf
        gftopk $< $@
 
 
+ENCODINGFILE=$(wildcard $(outdir)/$(patsubst %.mf,%.enc,$<))
+ENCODINGOPTION=$(if $(ENCODINGFILE),--encoding=$(ENCODINGFILE),)
 $(outdir)/%.pfa: %.mf
-       $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(basename $(@F))
+       $(MFTRACE) $(ENCODINGOPTION) -I $(outdir)/ --pfa --simplify --keep-trying $(basename $(@F))
        mv $(basename $(@F)).pfa $(outdir)
 
 $(outdir)/%.pfb: %.mf
-       $(MFTRACE) -I $(outdir)/ --pfa --pfb --simplify --keep-trying  $(basename $(@F))
+       $(MFTRACE)  $(ENCODINGOPTION) -I $(outdir)/ --pfa --pfb --simplify --keep-trying  $(basename $(@F))
        -mv $(basename $(@F)).pfa $(outdir)
        mv $(basename $(@F)).pfb $(outdir)