/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 2000--2012 Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
{
public:
DECLARE_SCHEME_CALLBACK (print, (SCM));
+ DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
DECLARE_SCHEME_CALLBACK (calc_left_bound_info, (SCM));
DECLARE_SCHEME_CALLBACK (calc_left_bound_info_and_text, (SCM));
DECLARE_SCHEME_CALLBACK (calc_right_bound_info, (SCM));
? ly_symbol2scm ("left-broken")
: ly_symbol2scm ("right-broken"), bound_details, SCM_EOL);
- for (SCM s = scm_reverse (extra); scm_is_pair (s); s = scm_cdr (s))
- details = scm_cons (scm_car (s), details);
+ details = scm_append (scm_list_2 (extra, details));
}
if (details == SCM_BOOL_F)
return details;
}
+MAKE_SCHEME_CALLBACK (Line_spanner, calc_cross_staff, 1);
+SCM
+Line_spanner::calc_cross_staff (SCM smob)
+{
+ Spanner *me = unsmob_spanner (smob);
+ if (!me)
+ return SCM_BOOL_F;
+
+ if (to_boolean (me->get_bound (LEFT)->get_property ("non-musical"))
+ || to_boolean (me->get_bound (RIGHT)->get_property ("non-musical")))
+ return SCM_BOOL_F;
+
+ return scm_from_bool (Staff_symbol_referencer::get_staff_symbol (me->get_bound (LEFT))
+ != Staff_symbol_referencer::get_staff_symbol (me->get_bound (RIGHT)));
+}
+
MAKE_SCHEME_CALLBACK (Line_spanner, calc_right_bound_info, 1);
SCM
Line_spanner::calc_right_bound_info (SCM smob)