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>
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);
{
Interval v = unsmob_grob (gh_car (s))->extent (common, Y_AXIS);
- if (!v.empty_b ())
+ if (!v.is_empty ())
count ++;
}
}
-MAKE_SCHEME_CALLBACK (System_start_delimiter,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (System_start_delimiter,print,1);
SCM
-System_start_delimiter::brew_molecule (SCM smob)
+System_start_delimiter::print (SCM smob)
{
Grob * me = unsmob_grob (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;
{
int cmp = (lo + hi) / 2;
b = fm->get_indexed_char (cmp);
- if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y)
+ if (b[Y_AXIS].is_empty () || b[Y_AXIS].length () > y)
hi = cmp;
else
lo = cmp;