* mf/GNUmakefile: remove SAUTER_FONTS.

* mf/GNUmakefile: remove AFM support.

diff --git a/ChangeLog b/ChangeLog
index 7eddc741cde390354f9f7fce4cae3e732c7f9a77..93bd07cbd151b767ea8e9bcb53cf6ea11968aea7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-12-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * mf/GNUmakefile: remove SAUTER_FONTS.
+
+       * scm/lily-library.scm (stderr): move stderr.
+
        * mf/GNUmakefile: remove AFM support.
 
        * buildscripts/mf-to-table.py (base): remove AFM support.

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 6b89f107cbfa760effb2907bdf6ef8cd101e9816..84ef5f298db1ace1ebcf96c41220aa6a2bf949a8 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -25,7 +25,8 @@ find_scaled_font (Output_def *mod, Font_metric *f, Real m,
   if (mod->parent_)
     return find_scaled_font (mod->parent_, f, m, font_encoding, input_encoding);
   
-  Real lookup_mag = m;
+  Real lookup_mag = m / output_scale (mod);
+
 
   SCM font_table = mod->lookup_variable (ly_symbol2scm ("scaled-fonts"));
   if (scm_hash_table_p (font_table) != SCM_BOOL_T)
@@ -45,8 +46,8 @@ find_scaled_font (Output_def *mod, Font_metric *f, Real m,
     sizes = SCM_EOL;
   
   SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag,
-                                                        font_encoding,
-                                                        input_encoding);
+                                                          font_encoding,
+                                                          input_encoding);
 
   sizes = scm_acons (scm_make_real (lookup_mag), val, sizes);
   scm_gc_unprotect_object (val);

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 8e353a07a307ad73e6ab84db7cc4985ddcf0911a..19b6e242a47a9da998114dbf18e184bdfdcb2704 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -76,15 +76,6 @@ foo:
 ## use separate package sauter-fonts-mftraced.
 SAUTER_FONTS = 
 
-#cmbxti8 ecbm14 ecrm12
-MORE_SAUTER_FONTS = cmbx14 cmbx17 \
-        cmbxti12 cmbxti14 \
-        cmbxti6 cmbxti7 cmbxti8 \
-        cmcsc12 cmcsc7 cmcsc8 \
-        cmss5 cmss6 cmss7 \
-        cmti5 cmti6 \
-        cmtt17 cmtt5 cmtt6 cmtt7
-
 ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)
 PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)
 PFB_FILES = $(PFA_FILES:%.pfa=%.pfb)
@@ -183,7 +174,6 @@ $(outdir)/lilypond.xmap: $(AFM_FILES)
 # using shell for loop seems most robust
 $(outdir)/lilypond.map: $(AFM_FILES)
        for i in $(FETA_FONTS); do echo $$i $$(fgrep FontName $(outdir)/$$i.afm | sed -e 's/FontName *//') '<'$$i.pfa; done > $@
-       for i in $(SAUTER_FONTS); do echo "$$i $$i <$$i.pfa"; done >> $@
 
 $(outdir)/Fontmap:
        echo '%!' > $@
@@ -197,7 +187,6 @@ $(outdir)/Fontmap:
 $(outdir)/Fontmap.lily: $(AFM_FILES) $(outdir)/Fontmap
        echo '%!' > $@
        for i in $(FETA_FONTS); do echo "/$$(fgrep FontName $(outdir)/$$i.afm | sed -e 's/FontName *//') ($$i.pfa);"; done >> $@
-       for i in $(SAUTER_FONTS); do echo "$$i ($$i.pfa);"; done >> $@
 
 
 $(outdir)/fonts.scale: $(PFA_FILES)
@@ -228,8 +217,7 @@ pfb: afm $(PFB_FILES) fontdir
 
 # stupid trick to have separate rules for each PFA font ;
 # otherwise building PFAs is all-or-nothing.
-$(SAUTER_FONTS:%=$(outdir)/%.bla):
-       $(foreach i, $@, touch $i && ) true
+
 
 $(outdir)/%.pfa: $(outdir)/%.bla
        $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir $(basename $@))  && mv $(notdir $@) $(outdir)/

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 75785aa6166a1f530a3b10dd19d44c86c1da398d..c4b4ad8207f71de91ffde46de318867ca48c57b8 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -53,8 +53,7 @@
 (define-public (tex-font-command-raw name magnification)
   (string-append
    "magfont"
-   (string-encode-integer
-    (hash name 1000000))
+   (digits->letters (format "~a" name))
    "m"
    (string-encode-integer
     (inexact->exact (round (* 1000 magnification))))))