X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fall-font-metrics.cc;h=76336652255a0a7f6c30eeba1ea86967be1f507b;hb=ff3d20fcb28e7ccf0fa9ad242dc16afb9cf0f7ba;hp=f0c377c03422e39f0fe5c86d15803f282ff29df2;hpb=1036b837e5c947284f1b64029b912793edab3dad;p=lilypond.git

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index f0c377c034..7633665225 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -1,4 +1,5 @@
-/*   
+/*
+  
   all-font-metrics.cc --  implement All_font_metrics
   
   source file of the GNU LilyPond music typesetter
@@ -34,6 +35,11 @@ All_font_metrics::~All_font_metrics ()
   scm_gc_unprotect_object (tfm_p_dict_->self_scm ());
 }
 
+/*
+  TODO: our AFM handling is broken: the units in an AFM file are
+  relative to the design size (1000 units = 1 designsize). Hence we
+  should include design size when generating an AFM metric. 
+ */
 Adobe_font_metric *
 All_font_metrics::find_afm (String name)
 {
@@ -47,17 +53,17 @@ All_font_metrics::find_afm (String name)
     {
       String path;
 
-      if (path.empty_b ())
+      if (path.is_empty ())
 	path = search_path_.find (name  + ".afm");
 
-      if (path.empty_b ())
+      if (path.is_empty ())
 	{
-	  String p = ly_find_afm (name.to_str0 ());
+	  String p = kpathsea_find_afm (name.to_str0 ());
 	  if (p.length ())
 	    path = p;
 	}
 
-      if (path.empty_b ())
+      if (path.is_empty ())
 	return 0;
       
       if (verbose_global_b)
@@ -84,7 +90,6 @@ All_font_metrics::find_afm (String name)
       */
       if (afm->checksum_)
 	{
-	  
 	  Tex_font_metric * tfm = find_tfm (name);
 	  
 	  /* FIXME: better warning message
@@ -99,8 +104,9 @@ All_font_metrics::find_afm (String name)
 	      s += " TFM: " + to_string ((int) tfm->info_.checksum);
 	      s += " AFM: " + to_string ((int) afm->checksum_);
 	      s += "\n";
-	      s += _ (" Rebuild all .afm files, and remove all .pk and .tfm files.  Rerun with -V to show font paths.");
-	      
+	      s += _ (" Rebuild all .afm files, and remove all .pk and .tfm files.\nRerun with -V to show font paths.\n");
+	      s += _("A script for removing font-files is delivered with the source-code,\n"
+		     "in buildscripts/clean-fonts.sh");
 	      error (s);
 	    }
 	}
@@ -121,21 +127,21 @@ All_font_metrics::find_tfm (String name)
     {
       String path;
       
-      if (path.empty_b ())
+      if (path.is_empty ())
 	{
-	  String p = ly_find_tfm (name.to_str0 ());
+	  String p = kpathsea_find_tfm (name.to_str0 ());
 	  if (p.length ())
 	    path = p;
 	}
 
-      if (path.empty_b ())
+      if (path.is_empty ())
 	path = search_path_.find (name  + ".tfm");
-      if (path.empty_b ())
+      if (path.is_empty ())
 	return 0;
 
-      
       if (verbose_global_b)
 	progress_indication ("[" + path);
+      
       val = Tex_font_metric::make_tfm (path);
 
       if (verbose_global_b)
@@ -157,13 +163,27 @@ All_font_metrics::find_tfm (String name)
 Font_metric *
 All_font_metrics::find_font (String name)
 {
-  Font_metric * f= find_afm (name);
-  if (f)
-    return f;
-
-  f = find_tfm (name);
-  if (f)
-    return f;
+  if ((name.left_string (4) == "feta") ||
+      (name.left_string (8) == "parmesan"))
+    {
+      Font_metric * f = find_afm (name);
+      if (f)
+	return f;
+      else
+      f =find_tfm (name);
+      if (f)
+	return f ;
+    }
+  else
+    {
+      Font_metric * f = find_tfm (name);
+      if (f)
+	return f;
+      else
+      f =find_afm (name);
+      if (f)
+	return f ;
+    }
 
   warning (_f ("can't find font: `%s'", name.to_str0 ()));
   warning (_ ("Loading default font"));
@@ -173,7 +193,7 @@ All_font_metrics::find_font (String name)
   /*
     we're in emergency recovery mode here anyway, so don't try to do
     anything smart that runs the risk of failing.  */
-  f= find_afm (def_name);
+  Font_metric*  f= find_afm (def_name);
   if (f)
     return f;