lilypond-1.1.27

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index e01062ba333ce2aaa9b75d9bd6b52f9183da26f8..751e7ab15a8781f40e9827bfbb3020a83d9e320d 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -59,12 +59,12 @@ All_font_metrics::find_tfm (String name)
 
 Font_metric *
 All_font_metrics::find_font (String name)
-{
-  Font_metric * f= find_afm (name);
+{  Font_metric * f=0;
+  f = find_tfm (name);
   if (f)
     return f;
 
-  f = find_tfm (name);
+  f= find_afm (name);
   if (f)
     return f;
 

diff --git a/lily/lookup.cc b/lily/lookup.cc
index d63f467384fefdf68143f4066aa3924d4c48da9a..7efba44136d823f30422b3cdcf6a19b8c545a116 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -410,8 +410,7 @@ Lookup::text (String style, String text) const
     }
 
   Real w = 0;
-  Real h = 0;
-  Real d = 0;
+  Interval ydims (0,0);
 
   Font_metric* afm_l = all_fonts_global_p->find_font (style);
   DOUT << "\nChars: ";
@@ -425,14 +424,13 @@ Lookup::text (String style, String text) const
        {
          Character_metric *c = afm_l->get_char (text[i],false);
          w += c->dimensions()[X_AXIS].length ();
-         h = h >? c->dimensions()[Y_AXIS].max ();
-         d = d <? c->dimensions()[Y_AXIS].min ();
+         ydims.unite (c->dimensions()[Y_AXIS]);
        }
     }
 
   DOUT << "\n" << to_str (w) << "\n";
   a.dim_.x () = Interval (0, w);
-  a.dim_.y () = Interval (d, h);
+  a.dim_.y () = ydims;
   a.font_ = font_name_;
   return a;
 }

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 69c1f018d9d5517818cb5d4d72a4d5b8b089a3b7..57f966047c93583d87fe7a133515e06063d51f8c 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -14,8 +14,9 @@ LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
 TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
 XPM_FONTS = feta20
 AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) 
+TFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tfm)) 
 
-ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES)
+ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES)
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 INSTALLATION_DIR=$(datadir)/mf/
@@ -25,10 +26,11 @@ INSTALLATION_OUT_DIR=$(datadir)/tex
 INSTALLATION_OUT_FILES=$(TEXTABLES)
 
 INSTALLATION_OUT_DIR1=$(datadir)/afm
-INSTALLATION_OUT_FILES1=$(AFM_FILES)
+INSTALLATION_OUT_FILES1=$(AFM_FILES) $(TFM_FILES)#ugh
 
 INSTALLATION_OUT_DIR2=$(datadir)/ly
 INSTALLATION_OUT_FILES2=$(LYTABLES)
+
 export MFINPUTS:=.:$(MFINPUTS)
 include $(depth)/make/stepmake.make