From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 17 Jul 2003 12:34:24 +0000 (+0000)
Subject: * make/mutopia-rules.make ($(outdir)/%.pdf): use +lilypond.map to
X-Git-Tag: release/1.7.26~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1aa0b269044885643c505b7e67398f46eef914a4;p=lilypond.git

* 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 79048b5d6b..00debe7a05 100644
--- 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 e987b5aad5..0d8e38facb 100644
--- 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 46a3efa7b6..519f0798e0 100644
--- 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 ac833a8294..bd95ef14e2 100644
--- 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 e8eb5e6115..d696e2bf8c 100644
--- 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)