/*
- volta-bracket.cc -- implement Volta_bracket_interface
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
- (c) 1997--2006 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include <cstring>
Item *bound = dynamic_cast<Spanner *> (me)->get_bound (LEFT);
/*
- not a start, but really broken in two
+ If the volta bracket appears after a line-break, make
+ it start after the prefatory matter.
*/
Real left = 0.;
if (bound->break_status_dir () == RIGHT)
{
Paper_column *pc = bound->get_column ();
- left = pc->extent (pc, X_AXIS)[RIGHT]
- - bound->relative_coordinate (pc, X_AXIS);
+ left = pc->break_align_width (pc, ly_symbol2scm ("break-alignment"))[RIGHT]
+ // For some reason, break_align_width is relative to
+ // the x-parent of the column.
+ - bound->relative_coordinate (pc->get_parent (X_AXIS), X_AXIS);
}
else
{
*/
}
+ 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;
num.align_to (Y_AXIS, UP);
num.translate_axis (-0.5, Y_AXIS);
total.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
- - 1.0, 0);
+ - 1.0);
}
total.translate_axis (left, X_AXIS);
}
-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 ());
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;
- SCM glyph = endbar ? endbar->get_property ("glyph") : SCM_EOL;
+ Grob *endbar = bars.size () ? bars.back () : 0;
+ SCM glyph = endbar ? endbar->get_property ("glyph-name") : SCM_EOL;
- String str;
+ string str;
if (scm_is_string (glyph))
str = ly_scm2string (glyph);
else
&& str != "|:"
&& str != "|."
&& str != ":|:"
+ && str != ":|.|:"
+ && str != ":|.:"
&& str != ".|");
if (no_vertical_end || no_vertical_start)
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
Volta_bracket_interface::add_bar (Grob *me, Item *b)
{
Pointer_group_interface::add_grob (me, ly_symbol2scm ("bars"), b);
- Side_position_interface::add_support (me, b);
add_bound_item (dynamic_cast<Spanner *> (me), b);
}
-void
-Volta_bracket_interface::add_column (Grob *me, Grob *c)
-{
- Side_position_interface::add_support (me, c);
-}
-
-ADD_INTERFACE (Volta_bracket_interface, "volta-bracket-interface",
- "Volta bracket with number",
+ADD_INTERFACE (Volta_bracket_interface,
+ "Volta bracket with number.",
/* properties */
"bars "
"thickness "
- "height");
+ "height "
+ );