2003 -> 2004

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

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 0292655e0f7866302bd3e535a68b95aee6817ce1..b28aad5cf7a9c340cd6f18645f035000fadfff61 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <math.h>
@@ -62,9 +62,10 @@ Will not fix it since I'm not sure.
 Molecule
 System_start_delimiter::simple_bar (Grob*me,Real h) 
 {
-  Real w = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness")) *
-    gh_scm2double (me->get_grob_property ("thickness"));
-  return Lookup::filledbox (Box (Interval (0,w), Interval (-h/2, h/2)));
+  Real lt =me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness")) ;
+  Real w = lt * robust_scm2double (me->get_grob_property ("thickness"), 1);
+  return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)),
+                                  lt);
 }
 
 MAKE_SCHEME_CALLBACK (System_start_delimiter,after_line_breaking,1);
@@ -74,13 +75,29 @@ System_start_delimiter::after_line_breaking (SCM smob)
 {
   Grob * me = unsmob_grob (smob);
   SCM   gl = me->get_grob_property ("glyph");
-
-  if (scm_ilength (me->get_grob_property ("elements")) <=  1
-      && gh_equal_p (gl,scm_makfrom0str ("bar-line")))
+  if (gh_equal_p (gl,scm_makfrom0str ("bar-line")))
     {
-      me->suicide ();
+      int count = 0;
+
+      /*
+       Get all coordinates, to trigger Hara kiri. 
+      */
+      SCM elts = me->get_grob_property ("elements");
+      Grob *common = common_refpoint_of_list (elts, me, Y_AXIS);
+      for (SCM s = elts; gh_pair_p (s); s = gh_cdr (s))
+       {
+         Interval v = unsmob_grob (gh_car (s))->extent (common, Y_AXIS);
+
+         if (!v.is_empty ())
+           count ++;
+       }
+  
+  
+      if (count <=  1)
+       {
+         me->suicide ();
+       }
     }
-
   return SCM_UNSPECIFIED;
 }
 
@@ -95,15 +112,14 @@ System_start_delimiter::brew_molecule (SCM smob)
   if (!gh_string_p (s))
     return SCM_EOL;
   SCM gsym = scm_string_to_symbol (s) ;
-  SCM c = me->get_grob_property ("collapse-height");
   
   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)));
   Real l = ext.length () / staff_space;
   
-  if (ext.empty_b ()
-      || (gh_number_p (c) && l <= gh_scm2double (c)))
+  if (ext.is_empty ()
+      || (robust_scm2double (me->get_grob_property ("collapse-height"), 0.0) >= l))
     {
       me->suicide ();
       return SCM_EOL;
@@ -136,7 +152,7 @@ System_start_delimiter::staff_brace (Grob*me, Real y)
   SCM sz = gh_cons (ly_symbol2scm ("font-relative-size"), ly_symbol2scm ("*"));
   
   SCM alist = scm_list_n (fam, sz, SCM_UNDEFINED);
-  fm = Font_interface::get_font (me, scm_list_n (alist, SCM_UNDEFINED));
+  fm = select_font (me->get_paper (), scm_list_n (alist, SCM_UNDEFINED));
   
 
   int lo = 0;
@@ -148,15 +164,15 @@ System_start_delimiter::staff_brace (Grob*me, Real y)
   do
     {
       int cmp = (lo + hi) / 2;
-      b = fm->get_char (cmp);
-      if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y)
+      b = fm->get_indexed_char (cmp);
+      if (b[Y_AXIS].is_empty () || b[Y_AXIS].length () > y)
        hi = cmp;
       else
        lo = cmp;
     }
   while (hi - lo > 1);
       
-  Molecule m (fm->get_char_molecule (lo));
+  Molecule m (fm->get_indexed_char_molecule (lo)); // ugh.  ascii?
   b=m.extent_box();
   b[X_AXIS] = Interval (0,0);