source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
+#include <string.h>
#include "box.hh"
#include "debug.hh"
*/
-MAKE_SCHEME_CALLBACK(Volta_spanner,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Volta_spanner,brew_molecule,1);
SCM
Volta_spanner::brew_molecule (SCM smob)
{
if (!bar_arr.size ())
return SCM_EOL;
- bool no_vertical_start = false;
- bool no_vertical_end = to_boolean (me->get_grob_property ("last-volta"));
Spanner *orig_span = dynamic_cast<Spanner*> (me->original_l_);
- if (orig_span && (orig_span->broken_into_l_arr_[0] != (Spanner*)me))
- no_vertical_start = true;
- if (orig_span && (orig_span->broken_into_l_arr_.top () != (Spanner*)me))
- no_vertical_end = true;
-#if 0
- // FIXME
- if (bar_arr.top ()->me->get_grob_property (type_str_.length_i () > 1)
- no_vertical_end = false;
-#endif
+ bool first_bracket = orig_span && (orig_span->broken_into_l_arr_[0] == (Spanner*)me);
+
+ bool last_bracket = orig_span && (orig_span->broken_into_l_arr_.top () == (Spanner*)me);
+
+ bool no_vertical_start = orig_span && !first_bracket;
+ bool no_vertical_end = orig_span && !last_bracket;
+ SCM bars = me->get_grob_property ("bars");
+ Grob * endbar = unsmob_grob (gh_car (bars));
+ SCM glyph = endbar->get_grob_property("glyph");
+ String str = ly_scm2string(glyph);
+ const char* cs = str.ch_C();
+ no_vertical_end |=
+ (strcmp(cs,":|")!=0 && strcmp(cs,"|:")!=0 && strcmp(cs,"|.")!=0
+ && strcmp(cs,":|:")!=0 && strcmp(cs,".|")!=0);
Real staff_thick = me->paper_l ()->get_var ("stafflinethickness");
Real half_space = 0.5;
+ Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
+
/*
- the volta spanner is attached to the bar-line, which is moved
- to the right. We don't need to compensate for the left edge.
+ not a start, but really broken in two
*/
- Real left = 0.0;
- Real w = dynamic_cast<Spanner*>(me)->spanner_length () - left - half_space;
+ Real left =0.;
+ if (bound->break_status_dir () == RIGHT)
+ {
+ Paper_column *pc = bound->column_l ();
+ left = pc->extent (pc, X_AXIS)[RIGHT] - bound->relative_coordinate (pc, X_AXIS);
+ }
+ else
+ {
+ /*
+ the volta spanner is attached to the bar-line, which is moved
+ to the right. We don't need to compensate for the left edge.
+ */
+ }
+
+ Real w = dynamic_cast<Spanner*> (me)->spanner_length () - left - half_space;
Real h = gh_scm2double (me->get_grob_property ("height"));
Real t = staff_thick * gh_scm2double (me->get_grob_property ("thickness"));
Box b (Interval (0, w), Interval (0, h));
Molecule mol (b, at);
- SCM text = me->get_grob_property("text");
+ SCM text = me->get_grob_property ("text");
SCM properties = gh_list (me->mutable_property_alist_, me->immutable_property_alist_,SCM_UNDEFINED);
Molecule num = Text_item::text2molecule (me, text, properties);
void
-Volta_spanner::add_bar (Grob *me, Item* b)
+Volta_spanner::add_bar (Grob *me, Item* b)
{
- Pointer_group_interface::add_element(me, "bars",b);
- Side_position::add_support (me,b);
- add_bound_item (dynamic_cast<Spanner*>(me), b);
+ Pointer_group_interface::add_element (me, "bars",b);
+ Side_position_interface::add_support (me,b);
+ add_bound_item (dynamic_cast<Spanner*> (me), b);
}
void
Volta_spanner::add_column (Grob*me, Grob* c)
{
- Side_position::add_support (me,c);
+ Side_position_interface::add_support (me,c);
}