release: 1.3.146

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

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index f75ec5591c4dfde1fa53e6ed406d13a38689594f..5ebe1920230bd258f6ada4118faf2d088fb643ee 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <math.h>
@@ -15,23 +15,42 @@
 #include "font-interface.hh"
 #include "all-font-metrics.hh"
 #include "grob.hh"
+#include "staff-symbol-referencer.hh"
 #include "lookup.hh"
 
 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"),
                    me->get_grob_property ("arch-width"),
                    gh_double2scm (arc_height),
-                   me->get_grob_property ("bracket-width"),
                    gh_double2scm (height),
                    me->get_grob_property ("arch-thick"),
                    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.
+
+-Rune
+  
+   */
   Real h = height + 2 * arc_height;
   Box b (Interval (0, 1.5), Interval (-h/2, h/2));
   Molecule mol (b, at);
@@ -56,15 +75,15 @@ 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)
 {
-  try_collapse (unsmob_element (smob));
+  try_collapse (unsmob_grob (smob));
   return SCM_UNSPECIFIED;
 }
 
@@ -81,27 +100,33 @@ 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)
 {
-  Grob * me = unsmob_element (smob);
-  Interval ext = ly_scm2interval (Axis_group_interface::group_extent_callback (me->self_scm(), gh_int2scm (Y_AXIS)));
-  Real l = ext.length (); 
-  Molecule m;
+  Grob * me = unsmob_grob (smob);
 
-  SCM s = me->get_grob_property ("collapse-height");
-  if (gh_number_p (s) && l < gh_scm2double (s))
+  SCM s = me->get_grob_property ("glyph");
+  if (!gh_symbol_p (s))
+    return SCM_EOL;
+  
+  SCM c = me->get_grob_property ((ly_symbol2string (s) + "-collapse-height")
+                                .ch_C ());
+  
+  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)))
     {
-      me->suicide();
+      me->suicide ();
       return SCM_EOL;
     }
 
-  s = me->get_grob_property ("glyph");
-  if (!gh_symbol_p(s))
-    return SCM_EOL;
-  
+  Molecule m;
   if (s == ly_symbol2scm ("bracket"))
     m = staff_bracket (me,l);
   else if (s == ly_symbol2scm ("brace"))
@@ -109,7 +134,6 @@ System_start_delimiter::brew_molecule (SCM smob)
   else if (s == ly_symbol2scm ("bar-line"))
     m = simple_bar (me,l);
   
-  
   m.translate_axis (ext.center (), Y_AXIS);
   return m.smobbed_copy ();
 }
@@ -117,8 +141,21 @@ System_start_delimiter::brew_molecule (SCM smob)
 Molecule
 System_start_delimiter::staff_brace (Grob*me,Real y)  
 {
+
+  /*
+    FIXME:
+    * should look at afm/tfm file for dimensions.
+     (This breaks ascii-art output: it hasn't got 255 symbols)
+    
+    * more glyphs (or maybe just better sized (fixed # of staff-spaces)),
+      the size mismatches with the staffs are very ugly
+         
+   */
+
+  // ugrhn
   int lo = 0;
   int hi = 255;
+  
   Font_metric *fm = Font_interface::get_default_font (me);
   Box b;
 
@@ -128,7 +165,7 @@ System_start_delimiter::staff_brace (Grob*me,Real y)
     int cmp = (lo + hi) / 2;
 
     b = fm->get_char (cmp);
-    if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y )
+    if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y)
       hi = cmp;
     else
       lo = cmp;
@@ -141,6 +178,6 @@ System_start_delimiter::staff_brace (Grob*me,Real y)
   b = fm->get_char (lo);
   b[X_AXIS] = Interval (0,0);
 
-  return Molecule(b, at);
+  return Molecule (b, at);
 }