release: 1.5.9

[lilypond.git] / lily / system-start-delimiter.cc

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 85d4947d59c4b74e9737b664ff7789a19386740c..b756d16a46eae68638da6b48fee7fde7e346aa4d 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -21,7 +21,7 @@
 Molecule
 System_start_delimiter::staff_bracket (Grob*me,Real height)  
 {
-  Real arc_height = gh_scm2double (me->get_grob_property("arch-height")) ;
+  Real arc_height = gh_scm2double (me->get_grob_property ("arch-height")) ;
   
   SCM at = gh_list (ly_symbol2scm ("bracket"),
                    me->get_grob_property ("arch-angle"),
@@ -32,6 +32,24 @@ System_start_delimiter::staff_bracket (Grob*me,Real height)
                    me->get_grob_property ("bracket-thick"),
                    SCM_UNDEFINED);
 
+/*
+TODO: sort this out.
+    
+Another thing:
+In system-start-delimiter.cc I see the line
+
+  Real h = height + 2 * arc_height;
+
+But I really think that you mean
+
+ Real h = height + 2 * arc_width;
+
+(arc_height changes the x-axis-size of arc ; arc_width changes the
+y-axis-size)
+Will not fix it since I'm not sure.
+  
+   */
+
   Real h = height + 2 * arc_height;
   Box b (Interval (0, 1.5), Interval (-h/2, h/2));
   Molecule mol (b, at);
@@ -56,10 +74,10 @@ System_start_delimiter::simple_bar (Grob*me,Real h)
 {
   Real w = me->paper_l ()->get_var ("stafflinethickness") *
     gh_scm2double (me->get_grob_property ("thickness"));
-  return Lookup::filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
+  return Lookup::filledbox (Box (Interval (0,w), Interval (-h/2, h/2)));
 }
 
-MAKE_SCHEME_CALLBACK(System_start_delimiter,after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (System_start_delimiter,after_line_breaking,1);
 
 SCM
 System_start_delimiter::after_line_breaking (SCM smob)
@@ -81,7 +99,7 @@ System_start_delimiter::try_collapse (Grob*me)
 }
 
 
-MAKE_SCHEME_CALLBACK(System_start_delimiter,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (System_start_delimiter,brew_molecule,1);
 
 SCM
 System_start_delimiter::brew_molecule (SCM smob)
@@ -97,13 +115,13 @@ System_start_delimiter::brew_molecule (SCM smob)
   
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Interval ext = ly_scm2interval (Axis_group_interface::group_extent_callback
-                                 (me->self_scm(), gh_int2scm (Y_AXIS)));
+ (me->self_scm (), gh_int2scm (Y_AXIS)));
   Real l = ext.length () / staff_space;
   
   if (ext.empty_b ()
       || (gh_number_p (c) && l <= gh_scm2double (c)))
     {
-      me->suicide();
+      me->suicide ();
       return SCM_EOL;
     }
 
@@ -120,32 +138,55 @@ System_start_delimiter::brew_molecule (SCM smob)
 }
 
 Molecule
-System_start_delimiter::staff_brace (Grob*me,Real y)  
+System_start_delimiter::staff_brace (Grob*me, Real y)
 {
+  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;
+    }
+
   int lo = 0;
-  int hi = 255;
-  Font_metric *fm = Font_interface::get_default_font (me);
+
+  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;
+    {
+      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);
-
+      
   SCM at = gh_list (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
   at = fontify_atom (fm, at);
   
   b = fm->get_char (lo);
   b[X_AXIS] = Interval (0,0);
 
-  return Molecule(b, at);
+  return Molecule (b, at);
 }