lilypond-1.3.154

diff --git a/lily/include/scaled-font-metric.hh b/lily/include/scaled-font-metric.hh
index 0535df0fc2768560845071096b7d13e570935345..4f7ca65fbc1cb56f3bbdce926c0be09545f7c8cf 100644 (file)
--- a/lily/include/scaled-font-metric.hh
+++ b/lily/include/scaled-font-metric.hh
@@ -20,7 +20,7 @@ struct Scaled_font_metric : public Font_metric
   virtual Box text_dimension (String) const;
   virtual Molecule find_by_name (String) const;
   static SCM make_scaled_font_metric (Font_metric*, Real);
-
+  virtual int count () const;
 protected:
   virtual   Box get_char (int)const;
   Font_metric *orig_l_;

diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc
index c815c086cc9c0f1539046d4ef1d28527bc7f3dfc..7077965c8f46c59a75c2232e63225c093cba3cb5 100644 (file)
--- a/lily/scaled-font-metric.cc
+++ b/lily/scaled-font-metric.cc
@@ -56,3 +56,9 @@ Scaled_font_metric::text_dimension (String t) const
   b.scale (magnification_f_);
   return b;
 }
+
+int
+Scaled_font_metric::count () const
+{
+  return orig_l_->count ();
+}

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 355eab3218e5b985cb9c179d0a8be3f36e1fcfb9..b756d16a46eae68638da6b48fee7fde7e346aa4d 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -140,69 +140,47 @@ System_start_delimiter::brew_molecule (SCM smob)
 Molecule
 System_start_delimiter::staff_brace (Grob*me, Real y)
 {
-  Font_metric *fm = Font_interface::get_default_font (me);
-  SCM font_defaults = gh_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
-                                        me->paper_l ()->style_sheet_));
+  Font_metric *fm = 0;
+  
+  for (int i = 0; ; i++)
+    {
+      if (!fm || y > fm->get_char (fm->count ()-1)[Y_AXIS].length ())
+       {
+         /* We go through the style sheet to lookup the font file
+            name.  This is better than using find_font directly,
+            esp. because that triggers mktextfm for non-existent
+            fonts. */
+         SCM alist = gh_list (gh_cons (ly_symbol2scm ("font-family"),
+                                       ly_symbol2scm ("braces")),
+                              gh_cons (ly_symbol2scm ("font-relative-size"),
+                                       gh_int2scm (i)),
+                              SCM_UNDEFINED);
+         fm = Font_interface::get_font (me, gh_list (alist, SCM_UNDEFINED));
+         /* Hmm, if lookup fails, we get cmr10 anyway */
+         if (ly_scm2string (gh_car (fm->description_)) == "cmr10")
+           break;
+       }
+      else
+       break;
+    }
 
-  Box b;
-#if 0
-  b = fm->get_char (0);
-  int count = fm->count () >? 2;
-#else 
-  int count = 255;
-#endif     
   int lo = 0;
-  int hi = count;
-  int relative_size = 0;
+
+  int hi = (fm->count () - 1) >? 2;
+  Box b;
 
   /* do a binary search for each Y, not very efficient, but passable?  */
   do
-  {
-    int cmp = (lo + hi) / 2;
-    b = fm->get_char (cmp);
-    if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y)
-      hi = cmp;
-    else
-      lo = cmp;
-
-    if (lo == count - 1 && b[Y_AXIS].length () < y && relative_size < 10)
-      {
-       /*
-         ugh: 7
-         We have four fonts: feta-braces0-3.mf
-         
-         In the style-sheet, all paper relative sizes need to start
-         looking at the feta-braces0 font.
-         
-         The smallest paper size, feta11 or -3, has to make 5 steps
-         to get to feta26 or +2.  Only after that, from +3 to +8 are
-         the real bigger sizes, so worst case we need 11 steps to get
-         to the font we need. */
-       fm = Font_interface::get_font
-         (me,
-          gh_list (gh_list (gh_cons (ly_symbol2scm ("font-relative-size"),
-                                     gh_int2scm (++relative_size)),
-                            SCM_UNDEFINED),
-                   me->mutable_property_alist_,
-                   me->immutable_property_alist_,
-                   font_defaults,
-                   SCM_UNDEFINED));
-#if 0
-       b = fm->get_char (0);
-       count = fm->count () >? 2;
-#else
-       count = 255;
-#endif     
-       lo = 0;
-       hi = count;
-      }
-  }
+    {
+      int cmp = (lo + hi) / 2;
+      b = fm->get_char (cmp);
+      if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y)
+       hi = cmp;
+      else
+       lo = cmp;
+    }
   while (hi - lo > 1);
-
-  // uRGURGU, why doesn't the height calculation work out??
-  SCM weird = me->get_grob_property ("weird");
-  if (gh_number_p (weird))
-    lo += gh_scm2int (weird);
+      
   SCM at = gh_list (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
   at = fontify_atom (fm, at);