source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <cstring>
Volta_bracket_interface::print (SCM smob)
{
Spanner *me = unsmob_spanner (smob);
-
- /*
- UGH UGH dependency tracking.
- */
- SCM proc = me->get_property ("after-line-breaking-callback");
- if (ly_is_procedure (proc))
- {
- me->set_property ("after-line-breaking-callback", SCM_EOL);
- scm_call_1 (proc, me->self_scm ());
- }
-
- Spanner *orig_span = dynamic_cast<Spanner *> (me->original_);
+ Spanner *orig_span = dynamic_cast<Spanner *> (me->original ());
bool broken_first_bracket = orig_span && (orig_span->broken_intos_[0]
== (Spanner *)me);
-
-
- Output_def *layout = me->get_layout ();
+ Output_def *layout = me->layout ();
Real half_space = 0.5;
Item *bound = dynamic_cast<Spanner *> (me)->get_bound (LEFT);
*/
}
+ modify_edge_height (me);
+ if (!me->is_live ())
+ return SCM_EOL;
+
Drul_array<Real> edge_height = robust_scm2interval (me->get_property ("edge-height"),
Interval (1.0, 1.0));
Drul_array<Real> flare = robust_scm2interval (me->get_property ("bracket-flare"),
Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
Interval (0, 0));
+
+
scale_drul (&edge_height, - Real (get_grob_direction (me)));
Interval empty;
}
-MAKE_SCHEME_CALLBACK(Volta_bracket_interface,after_line_breaking, 1);
-SCM
-Volta_bracket_interface::after_line_breaking (SCM smob)
+void
+Volta_bracket_interface::modify_edge_height (Spanner *me)
{
- Spanner *me = unsmob_spanner (smob);
- Spanner *orig_span = dynamic_cast<Spanner *> (me->original_);
+ Spanner *orig_span = dynamic_cast<Spanner *> (me->original ());
bool broken_first_bracket = orig_span && (orig_span->broken_intos_[0] == (Spanner *)me);
-
- bool broken_last_bracket = orig_span && (orig_span->broken_intos_.top () == (Spanner *)me);
-
+ bool broken_last_bracket = orig_span && (orig_span->broken_intos_.back () == (Spanner *)me);
bool no_vertical_start = orig_span && !broken_first_bracket;
bool no_vertical_end = orig_span && !broken_last_bracket;
extract_grob_set (me, "bars", bars);
- Grob *endbar = bars.size () ? bars.top () : 0;
+ Grob *endbar = bars.size () ? bars.back () : 0;
SCM glyph = endbar ? endbar->get_property ("glyph") : SCM_EOL;
- String str;
+ string str;
if (scm_is_string (glyph))
str = ly_scm2string (glyph);
else
me->set_property ("edge-height", ly_interval2scm (edge_height));
}
-
- return SCM_UNSPECIFIED;
+
+ if (broken_last_bracket && no_vertical_end && no_vertical_start
+ && !broken_first_bracket)
+ me->suicide ();
}
void
Side_position_interface::add_support (me, c);
}
-ADD_INTERFACE (Volta_bracket_interface, "volta-bracket-interface",
+ADD_INTERFACE (Volta_bracket_interface,
"Volta bracket with number",
- "bars thickness height");
+
+ /* properties */
+ "bars "
+ "thickness "
+ "height");