patch::: 1.3.122.mb1

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

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 5c345fb3e96e6e5af1b539faf4cf5107173b5c08..55af3b8196f2441afa58017df2ee8522128533c8 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -14,51 +14,47 @@
 #include "molecule.hh"
 #include "font-interface.hh"
 #include "all-font-metrics.hh"
-#include "score-element.hh"
+#include "grob.hh"
 #include "lookup.hh"
 
 Molecule
-System_start_delimiter::staff_bracket (Score_element*me,Real height)  
+System_start_delimiter::staff_bracket (Grob*me,Real height)  
 {
-  Paper_def* p= me->paper_l ();
-  SCM scmss = p->get_scmvar ("staffspace");
-  Real ss = gh_scm2double (scmss);
-  Real arc_height = gh_scm2double (me->get_elt_property("arch-height")) * ss ;
+  Real arc_height = gh_scm2double (me->get_grob_property("arch-height")) ;
   
   SCM at = gh_list (ly_symbol2scm ("bracket"),
-                   scm_product (me->get_elt_property ("arch-angle"), scmss),
-                   scm_product (me->get_elt_property ("arch-width"), scmss),
+                   me->get_grob_property ("arch-angle"),
+                   me->get_grob_property ("arch-width"),
                    gh_double2scm (arc_height),
-                   scm_product (me->get_elt_property ("bracket-width"),scmss),
                    gh_double2scm (height),
-                   scm_product (me->get_elt_property ("arch-thick"),scmss),
-                   scm_product (me->get_elt_property ("bracket-thick"),scmss),
+                   me->get_grob_property ("arch-thick"),
+                   me->get_grob_property ("bracket-thick"),
                    SCM_UNDEFINED);
 
   Real h = height + 2 * arc_height;
-  Box b (Interval (0, 1.5 * ss), Interval (-h/2, h/2));
+  Box b (Interval (0, 1.5), Interval (-h/2, h/2));
   Molecule mol (b, at);
   mol.align_to (X_AXIS, CENTER);
   return mol;
 }
 
 void
-System_start_delimiter::set_interface (Score_element*me)
+System_start_delimiter::set_interface (Grob*me)
 {
   me->set_interface (ly_symbol2scm ("system-start-delimiter-interface"));
 }
 
 bool
-System_start_delimiter::has_interface (Score_element*me)
+System_start_delimiter::has_interface (Grob*me)
 {
   return  me->has_interface (ly_symbol2scm ("system-start-delimiter-interface"));
 }
 
 Molecule
-System_start_delimiter::simple_bar (Score_element*me,Real h) 
+System_start_delimiter::simple_bar (Grob*me,Real h) 
 {
   Real w = me->paper_l ()->get_var ("stafflinethickness") *
-    gh_scm2double (me->get_elt_property ("thickness"));
+    gh_scm2double (me->get_grob_property ("thickness"));
   return Lookup::filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
 }
 
@@ -67,16 +63,16 @@ MAKE_SCHEME_CALLBACK(System_start_delimiter,after_line_breaking,1);
 SCM
 System_start_delimiter::after_line_breaking (SCM smob)
 {
-  try_collapse (unsmob_element (smob));
+  try_collapse (unsmob_grob (smob));
   return SCM_UNSPECIFIED;
 }
 
 void
-System_start_delimiter::try_collapse (Score_element*me)
+System_start_delimiter::try_collapse (Grob*me)
 {
-  SCM   gl = me->get_elt_property ("glyph");
+  SCM   gl = me->get_grob_property ("glyph");
   
-  if (scm_ilength (me->get_elt_property ("elements")) <=  1 && gl == ly_symbol2scm ("bar-line"))
+  if (scm_ilength (me->get_grob_property ("elements")) <=  1 && gl == ly_symbol2scm ("bar-line"))
     {
       me->suicide ();
     }
@@ -89,19 +85,19 @@ MAKE_SCHEME_CALLBACK(System_start_delimiter,brew_molecule,1);
 SCM
 System_start_delimiter::brew_molecule (SCM smob)
 {
-  Score_element * me = unsmob_element (smob);
+  Grob * me = unsmob_grob (smob);
   Interval ext = ly_scm2interval (Axis_group_interface::group_extent_callback (me->self_scm(), gh_int2scm (Y_AXIS)));
   Real l = ext.length (); 
   Molecule m;
 
-  SCM s = me->get_elt_property ("collapse-height");
+  SCM s = me->get_grob_property ("collapse-height");
   if (gh_number_p (s) && l < gh_scm2double (s))
     {
       me->suicide();
       return SCM_EOL;
     }
 
-  s = me->get_elt_property ("glyph");
+  s = me->get_grob_property ("glyph");
   if (!gh_symbol_p(s))
     return SCM_EOL;
   
@@ -114,30 +110,35 @@ System_start_delimiter::brew_molecule (SCM smob)
   
   
   m.translate_axis (ext.center (), Y_AXIS);
-  return m.create_scheme ();
+  return m.smobbed_copy ();
 }
 
-/*
-  Ugh. Suck me plenty.
- */
 Molecule
-System_start_delimiter::staff_brace (Score_element*me,Real y)  
+System_start_delimiter::staff_brace (Grob*me,Real y)  
 {
-  int staff_size  = 20;                // URG.
-
-  // URG
-  Real step  = 1.0;
-  int minht  = 2 * staff_size;
-  int maxht = 7 *  minht;
-  int idx = int (((maxht - step) <? y - minht) / step);
-  idx = idx >? 0;
-
+  int lo = 0;
+  int hi = 255;
   Font_metric *fm = Font_interface::get_default_font (me);
-  
-  SCM at =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED);
+  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;
+    }
+  while (hi - lo > 1);
+
+  SCM at = gh_list (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
   at = fontify_atom (fm, at);
   
-  Box b (Interval (0,0), Interval (-y/2, y/2));
+  b = fm->get_char (lo);
+  b[X_AXIS] = Interval (0,0);
 
   return Molecule(b, at);
 }