source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
#include "beam.hh"
#include "box.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "font-interface.hh"
#include "molecule.hh"
#include "paper-def.hh"
static Grob*
get_x_bound_grob (Grob *g, Direction my_dir)
{
- if (Note_column::stem_l (g)
+ if (Note_column::get_stem (g)
&& Note_column::dir (g) == my_dir)
{
- g = Note_column::stem_l (g);
+ g = Note_column::get_stem (g);
}
return g;
}
Grob*
-Tuplet_bracket::parallel_beam (Grob *me, Link_array<Grob> cols, bool *equally_long)
+Tuplet_bracket::parallel_beam (Grob *me, Link_array<Grob> const &cols, bool *equally_long)
{
/*
ugh: code dup.
*/
- Grob *s1 = Note_column::stem_l (cols[0]);
- Grob *s2 = Note_column::stem_l (cols.top());
+ Grob *s1 = Note_column::get_stem (cols[0]);
+ Grob *s2 = Note_column::get_stem (cols.top());
- Grob*b1 = s1 ? Stem::beam_l (s1) : 0;
- Grob*b2 = s2 ? Stem::beam_l (s2) : 0;
+ Grob*b1 = s1 ? Stem::get_beam (s1) : 0;
+ Grob*b2 = s2 ? Stem::get_beam (s2) : 0;
Spanner*sp = dynamic_cast<Spanner*> (me);
Link_array<Grob> beam_stems = Pointer_group_interface__extract_grobs
(b1, (Grob*)0, "stems");
+ if (beam_stems.size() == 0)
+ {
+ programming_error ("Beam under tuplet bracket has no stems!");
+ *equally_long = 0;
+ return 0;
+ }
*equally_long = (beam_stems[0] == s1 && beam_stems.top() == s2);
return b1;
{
Grob *me= unsmob_grob (smob);
Molecule mol;
- Link_array<Grob> column_arr=
+ Link_array<Grob> columns=
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
- if (!column_arr.size ())
+ if (!columns.size ())
return mol.smobbed_copy ();
bool equally_long = false;
- Grob * par_beam = parallel_beam (me, column_arr, &equally_long);
+ Grob * par_beam = parallel_beam (me, columns, &equally_long);
Spanner*sp = dynamic_cast<Spanner*> (me);
else if (numb == ly_symbol2scm ("if-no-beam"))
number_visibility = !par_beam;
- Grob * commonx = column_arr[0]->common_refpoint (column_arr.top (),X_AXIS);
+ Grob * commonx = columns[0]->common_refpoint (columns.top (),X_AXIS);
+
+ /*
+ Tuplet brackets are normally not broken, but we shouldn't crash if
+ they are.
+ */
+ commonx = commonx->common_refpoint (sp->get_bound(LEFT), X_AXIS);
+ commonx = commonx->common_refpoint (sp->get_bound(RIGHT), X_AXIS);
+
Direction dir = Directional_element_interface::get (me);
- Grob * lgr = get_x_bound_grob (column_arr[0], dir);
- Grob * rgr = get_x_bound_grob (column_arr.top(), dir);
+ Grob * lgr = get_x_bound_grob (columns[0], dir);
+ Grob * rgr = get_x_bound_grob (columns.top(), dir);
Real x0 = lgr->extent (commonx,X_AXIS)[LEFT];
Real x1 = rgr->extent (commonx,X_AXIS)[RIGHT];
if (bracket_visibility)
{
- Real lt = me->paper_l ()->get_var ("linethickness");
+ Real lt = me->get_paper ()->get_var ("linethickness");
SCM thick = me->get_grob_property ("thickness");
if (gh_number_p (thick))
lt *= gh_scm2double (thick);
SCM gap = me->get_grob_property ("gap");
-
- Real prot_size = 0.7; // magic.
-
+ SCM ew = me->get_grob_property ("edge-widen");
+ SCM eh = me->get_grob_property ("edge-height");
+ SCM sp = me->get_grob_property ("shorten-pair");
+
+ Direction d = LEFT;
+ Drul_array<Real> height, width, shorten;
+ do {
+ width[d] = height[d] = shorten[d] = 0.0;
+ if ( ly_number_pair_p (ew) )
+ width[d] += gh_scm2double (index_get_cell (ew, d));
+ if ( ly_number_pair_p (eh) )
+ height[d] += gh_scm2double (index_get_cell (eh, d)) * - dir;
+ if ( ly_number_pair_p (sp) )
+ shorten[d] += gh_scm2double (index_get_cell (sp, d));
+ }
+ while (flip (&d) != LEFT);
+
Molecule brack = make_bracket (Y_AXIS,
- w, ry-ly, lt,
- -prot_size*dir, -prot_size*dir,
+ w, ry - ly, lt,
+ height,
gh_scm2double (gap),
- 0.0, 0.0);
+ width,
+ shorten);
mol.add_molecule (brack);
}
-
+
mol.translate_axis (ly, Y_AXIS);
mol.translate_axis (x0 - sp->get_bound (LEFT)->relative_coordinate (commonx,X_AXIS),X_AXIS);
return mol.smobbed_copy ();
*/
Molecule
Tuplet_bracket::make_bracket (Axis protusion_axis,
- Real dx, Real dy, Real thick, Real lprotrusion,
- Real rprotrusion, Real gap, Real left_widen,
- Real right_widen)
+ Real dx, Real dy, Real thick, Drul_array<Real> height,
+ Real gap,
+ Drul_array<Real> widen,
+ Drul_array<Real> shorten)
{
Real len = Offset (dx,dy).length ();
- Real gapx = dx* (gap / len);
- Real gapy = dy* (gap / len);
+ Real gapx = dx * (gap / len);
+ Real gapy = dy * (gap / len);
+ Drul_array<Real> shortx, shorty;
+ Direction d = LEFT;
+ do {
+ shortx[d] = dx * (shorten[d] / len);
+ shorty[d] = dy * (shorten[d] / len);
+ }
+ while (flip (&d) != LEFT);
Axis other = other_axis (protusion_axis);
-
- Molecule l1 = Lookup::line (thick, Offset(0,0),
+
+ Molecule l1 = Lookup::line (thick, Offset(shortx[LEFT], shorty[LEFT]),
Offset ( (dx - gapx)/2, (dy - gapy)/2 ));
+
Molecule l2 = Lookup::line (thick, Offset((dx + gapx) / 2,(dy + gapy) / 2),
-
- Offset (dx,dy));
+ Offset (dx - shortx[RIGHT], dy - shorty[RIGHT]));
Offset protusion;
- protusion[other] = left_widen;
- protusion[protusion_axis] = lprotrusion;
-
- Molecule p1 = Lookup::line (thick, Offset(0,0), protusion);
-
- protusion[other] = right_widen;
- protusion[protusion_axis] = rprotrusion;
- Molecule p2 = Lookup::line (thick, Offset(dx,dy),Offset(dx,dy) + protusion);
-
+ protusion[other] = -widen[LEFT];
+ protusion[protusion_axis] = height[LEFT];
+ Molecule p1 = Lookup::line (thick,
+ Offset(shortx[LEFT], shorty[LEFT]),
+ Offset(shortx[LEFT], shorty[LEFT]) + protusion);
+ protusion[other] = widen[RIGHT];
+ protusion[protusion_axis] = height[RIGHT];
+ Molecule p2 = Lookup::line (thick,
+ Offset(dx - shortx[RIGHT], dy - shorty[RIGHT]),
+ Offset(dx - shortx[RIGHT], dy - shorty[RIGHT]) + protusion);
Molecule m;
m.add_molecule (p1);
void
Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy)
{
- Link_array<Grob> column_arr=
+ Link_array<Grob> columns=
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
- Grob * commony = me->common_refpoint (me->get_grob_property ("note-columns"), Y_AXIS);
- Grob * commonx = me->common_refpoint (me->get_grob_property ("note-columns"), X_AXIS);
+ SCM cols = me->get_grob_property ("note-columns");
+ Grob * commony = common_refpoint_of_list (cols, me, Y_AXIS);
+ Grob * commonx = common_refpoint_of_list (cols, me, X_AXIS);
Direction dir = Directional_element_interface::get (me);
Use outer non-rest columns to determine slope
*/
int l = 0;
- while (l <column_arr.size () && Note_column::rest_b (column_arr[l]))
+ while (l <columns.size () && Note_column::rest_b (columns[l]))
l ++;
- int r = column_arr.size ()- 1;
- while (r >= l && Note_column::rest_b (column_arr[r]))
+ int r = columns.size ()- 1;
+ while (r >= l && Note_column::rest_b (columns[r]))
r--;
if (l < r)
{
- *dy = column_arr[r]->extent (commony, Y_AXIS) [dir]
- - column_arr[l]->extent (commony, Y_AXIS) [dir] ;
+ *dy = columns[r]->extent (commony, Y_AXIS) [dir]
+ - columns[l]->extent (commony, Y_AXIS) [dir] ;
}
else
* dy = 0;
*offset = - dir * infinity_f;
- if (!column_arr.size ())
+ if (!columns.size ())
return;
- Grob * lgr = get_x_bound_grob (column_arr[0], dir);
- Grob * rgr = get_x_bound_grob (column_arr.top(), dir);
+ Grob * lgr = get_x_bound_grob (columns[0], dir);
+ Grob * rgr = get_x_bound_grob (columns.top(), dir);
Real x0 = lgr->extent (commonx,X_AXIS)[LEFT];
Real x1 = rgr->extent (commonx,X_AXIS)[RIGHT];
/*
Slope.
*/
- Real factor = column_arr.size () > 1 ? 1/ (x1 - x0) : 1.0;
+ Real factor = columns.size () > 1 ? 1/ (x1 - x0) : 1.0;
- for (int i = 0; i < column_arr.size (); i++)
+ for (int i = 0; i < columns.size (); i++)
{
- Real notey = column_arr[i]->extent (commony, Y_AXIS)[dir]
+ Real notey = columns[i]->extent (commony, Y_AXIS)[dir]
- me->relative_coordinate (commony, Y_AXIS);
-
- Real x = column_arr[i]->relative_coordinate (commonx, X_AXIS) - x0;
+
+ Real x = columns[i]->relative_coordinate (commonx, X_AXIS) - x0;
Real tuplety = *dy * x * factor;
if (notey * dir > (*offset + tuplety) * dir)
/*
horizontal brackets should not collide with staff lines.
+
*/
- if (*dy == 0)
+ Real ss= Staff_symbol_referencer::staff_space (me);
+ if (*dy == 0 && fabs (*offset) < ss * Staff_symbol_referencer::staff_radius (me))
{
// quantize, then do collision check.
- Real ss= Staff_symbol_referencer::staff_space (me);
*offset *= 2 / ss;
*offset = rint (*offset);
void
Tuplet_bracket::calc_dy (Grob*me,Real * dy)
{
- Link_array<Grob> column_arr=
+ Link_array<Grob> columns=
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
/*
ugh. refps.
*/
Direction d = Directional_element_interface::get (me);
- *dy = column_arr.top ()->extent (column_arr.top (), Y_AXIS) [d]
- - column_arr[0]->extent (column_arr[0], Y_AXIS) [d];
+ *dy = columns.top ()->extent (columns.top (), Y_AXIS) [d]
+ - columns[0]->extent (columns[0], Y_AXIS) [d];
}
Tuplet_bracket::before_line_breaking (SCM smob)
{
Grob *me = unsmob_grob (smob);
- Link_array<Grob> column_arr=
+ Link_array<Grob> columns=
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
- for (int i = column_arr.size(); i--;)
+ for (int i = columns.size(); i--;)
{
- Grob * s =Note_column::stem_l (column_arr[i]);
- Grob * b = s ? Stem::beam_l (s): 0;
+ Grob * s =Note_column::get_stem (columns[i]);
+ Grob * b = s ? Stem::get_beam (s): 0;
if (b)
me->add_dependency (b);
}
Tuplet_bracket::after_line_breaking (SCM smob)
{
Grob * me = unsmob_grob (smob);
- Link_array<Grob> column_arr=
+ Link_array<Grob> columns=
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
- if (!column_arr.size ())
+ if (!columns.size ())
{
me->suicide ();
return SCM_UNSPECIFIED;
}
bool equally_long = false;
- Grob * par_beam = parallel_beam (me, column_arr, &equally_long);
+ Grob * par_beam = parallel_beam (me, columns, &equally_long);
+ /*
+ We follow the beam only if there is one, and we are next to it.
+ */
Real dy, offset;
- if (!par_beam)
+ if (!par_beam
+ || Directional_element_interface::get (par_beam) != dir)
{
calc_position_and_height (me,&offset,&dy);
}
}
-bool
-Tuplet_bracket::has_interface (Grob*me)
-{
- return me->has_interface (ly_symbol2scm ("tuplet-bracket-interface"));
-}
ADD_INTERFACE (Tuplet_bracket,"tuplet-bracket-interface",
"A bracket with a number in the middle, used for tuplets.",
- "note-columns padding gap left-position right-position bracket-visibility number-visibility thickness direction");
+ "note-columns edge-widen edge-height shorten-pair padding gap left-position right-position bracket-visibility number-visibility thickness direction");