/*
- plet-spanner.cc -- implement Tuplet_bracket
+ tuplet-bracket.cc -- implement Tuplet_bracket
source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+ Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
/*
#include "box.hh"
#include "warn.hh"
#include "font-interface.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "stencil.hh"
+#include "output-def.hh"
#include "text-item.hh"
#include "tuplet-bracket.hh"
#include "stem.hh"
ugh: code dup.
*/
Grob *s1 = Note_column::get_stem (cols[0]);
- Grob *s2 = Note_column::get_stem (cols.top());
+ Grob *s2 = Note_column::get_stem (cols.top ());
Grob*b1 = s1 ? Stem::get_beam (s1) : 0;
Grob*b2 = s2 ? Stem::get_beam (s2) : 0;
Spanner*sp = dynamic_cast<Spanner*> (me);
*equally_long= false;
- if (! (b1 && (b1 == b2) && !sp->broken_b()))
+ if (! (b1 && (b1 == b2) && !sp->is_broken ()))
return 0;
Link_array<Grob> beam_stems = Pointer_group_interface__extract_grobs
(b1, (Grob*)0, "stems");
- if (beam_stems.size() == 0)
+ 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);
+ *equally_long = (beam_stems[0] == s1 && beam_stems.top () == s2);
return b1;
}
follow beam precisely for determining tuplet number location.
*/
-MAKE_SCHEME_CALLBACK (Tuplet_bracket,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Tuplet_bracket,print,1);
SCM
-Tuplet_bracket::brew_molecule (SCM smob)
+Tuplet_bracket::print (SCM smob)
{
Grob *me= unsmob_grob (smob);
- Molecule mol;
+ Stencil mol;
Link_array<Grob> columns=
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
{
- SCM lp = me->get_grob_property ("left-position");
- SCM rp = me->get_grob_property ("right-position");
+ SCM lp = me->get_property ("left-position");
+ SCM rp = me->get_property ("right-position");
- if (!gh_number_p (rp) || !gh_number_p (lp))
+ if (!scm_is_number (rp) || !scm_is_number (lp))
after_line_breaking (smob);
}
- Real ly = robust_scm2double (me->get_grob_property ("left-position"), 0);
- Real ry = robust_scm2double (me->get_grob_property ("right-position"), 0);
+ Real ly = robust_scm2double (me->get_property ("left-position"), 0);
+ Real ry = robust_scm2double (me->get_property ("right-position"), 0);
bool equally_long = false;
Grob * par_beam = parallel_beam (me, columns, &equally_long);
/*
Fixme: the type of this prop is sucky.
*/
- SCM bracket = me->get_grob_property ("bracket-visibility");
- if (gh_boolean_p (bracket))
+ SCM bracket = me->get_property ("bracket-visibility");
+ if (scm_is_bool (bracket))
{
- bracket_visibility = gh_scm2bool (bracket);
+ bracket_visibility = ly_scm2bool (bracket);
}
else if (bracket == ly_symbol2scm ("if-no-beam"))
bracket_visibility = !par_beam;
- SCM numb = me->get_grob_property ("number-visibility");
- if (gh_boolean_p (numb))
+ SCM numb = me->get_property ("number-visibility");
+ if (scm_is_bool (numb))
{
- number_visibility = gh_scm2bool (numb);
+ number_visibility = ly_scm2bool (numb);
}
else if (numb == ly_symbol2scm ("if-no-beam"))
number_visibility = !par_beam;
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);
+ commonx = commonx->common_refpoint (sp->get_bound (LEFT), X_AXIS);
+ commonx = commonx->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
Direction dir = get_grob_direction (me);
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];
-
+ Grob * rgr = get_x_bound_grob (columns.top (), dir);
+
+ Real x0 = robust_relative_extent (lgr, commonx, X_AXIS)[LEFT];
+ Real x1 = robust_relative_extent (rgr, commonx, X_AXIS)[RIGHT];
Real w = x1 -x0;
- SCM number = me->get_grob_property ("text");
+ SCM number = me->get_property ("text");
- Paper_def *pap = me->get_paper ();
- if (gh_string_p (number) && number_visibility)
+ Output_def *pap = me->get_paper ();
+ Stencil num;
+ if (scm_is_string (number) && number_visibility)
{
- SCM properties = Font_interface::font_alist_chain (me);
- SCM snum = Text_item::interpret_markup (pap->self_scm (), properties, number);
- Molecule num = *unsmob_molecule (snum);
+ SCM properties = Font_interface::text_font_alist_chain (me);
+ SCM snum = Text_interface::interpret_markup (pap->self_scm (), properties, number);
+ num = *unsmob_stencil (snum);
num.align_to (X_AXIS, CENTER);
num.translate_axis (w/2, X_AXIS);
num.align_to (Y_AXIS, CENTER);
num.translate_axis ((ry-ly)/2, Y_AXIS);
- mol.add_molecule (num);
+ mol.add_stencil (num);
}
if (bracket_visibility)
{
- SCM gap = me->get_grob_property ("gap");
+ Real ss = Staff_symbol_referencer::staff_space (me);
+ Real gap=0.;
+
+ if (!num.extent (X_AXIS).is_empty ())
+ gap = num.extent (X_AXIS).length () + 1.0;
- SCM fl = me->get_grob_property ("bracket-flare");
- SCM eh = me->get_grob_property ("edge-height");
- SCM sp = me->get_grob_property ("shorten-pair");
+ SCM fl = me->get_property ("bracket-flare");
+ SCM eh = me->get_property ("edge-height");
+ SCM sp = me->get_property ("shorten-pair");
Direction d = LEFT;
Drul_array<Real> height, flare, shorten;
do {
flare[d] = height[d] = shorten[d] = 0.0;
if (is_number_pair (fl))
- flare[d] += gh_scm2double (index_get_cell (fl, d));
+ flare[d] += ss * scm_to_double (index_get_cell (fl, d));
if (is_number_pair (eh))
- height[d] += gh_scm2double (index_get_cell (eh, d)) * - dir;
+ height[d] += - dir * ss *scm_to_double (index_get_cell (eh, d));
if (is_number_pair (sp))
- shorten[d] += gh_scm2double (index_get_cell (sp, d));
+ shorten[d] += ss *scm_to_double (index_get_cell (sp, d));
}
while (flip (&d) != LEFT);
- Molecule brack = make_bracket (me, Y_AXIS,
+ Stencil brack = make_bracket (me, Y_AXIS,
Offset (w, ry - ly),
height,
- gh_scm2double (gap),
- flare,
- shorten);
- mol.add_molecule (brack);
+ /*
+ 0.1 = more space at right due to italics
+ TODO: use italic correction of font.
+ */
+ Interval (-0.5, 0.5) * gap + 0.1,
+ flare, shorten);
+ mol.add_stencil (brack);
}
mol.translate_axis (ly, Y_AXIS);
TODO: this will fail for very short (shorter than the flare)
brackets.
*/
-Molecule
+Stencil
Tuplet_bracket::make_bracket (Grob *me, // for line properties.
Axis protusion_axis,
Offset dz,
Drul_array<Real> height,
- Real gap,
+ Interval gap,
Drul_array<Real> flare,
Drul_array<Real> shorten)
{
- Drul_array<Offset> corners (Offset(0,0), dz);
+ Drul_array<Offset> corners (Offset (0,0), dz);
Real length = dz.length ();
Drul_array<Offset> gap_corners;
Direction d = LEFT;
do {
straight_corners[d] += - d * shorten[d] /length * dz;
- gap_corners[d] = (dz * 0.5) + d * gap / length * dz;
+ } while (flip (&d) != LEFT);
+
+
+ if (gap.is_empty())
+ gap = Interval (0,0);
+ do {
+ gap_corners[d] = (dz * 0.5) + gap[d] / length * dz;
} while (flip (&d) != LEFT);
Drul_array<Offset> flare_corners = straight_corners;
straight_corners[d][bracket_axis] += - d * flare[d];
} while (flip (&d) != LEFT);
- Molecule m;
+ Stencil m;
do {
- m.add_molecule (Line_interface::line (me, straight_corners[d],
- gap_corners[d]));
+ m.add_stencil (Line_interface::line (me, straight_corners[d],
+ gap_corners[d]));
- m.add_molecule (Line_interface::line (me, straight_corners[d],
- flare_corners[d]));
+ m.add_stencil (Line_interface::line (me, straight_corners[d],
+ flare_corners[d]));
} while (flip (&d) != LEFT);
return m;
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
- SCM cols = me->get_grob_property ("note-columns");
+ SCM cols = me->get_property ("note-columns");
Grob * commony = common_refpoint_of_list (cols, me, Y_AXIS);
Grob * commonx = common_refpoint_of_list (cols, me, X_AXIS);
Interval staff;
-
if (Grob * st = Staff_symbol_referencer::get_staff_symbol (me))
staff = st->extent (commony, Y_AXIS);
Use outer non-rest columns to determine slope
*/
int l = 0;
- while (l <columns.size () && Note_column::rest_b (columns[l]))
+ while (l <columns.size () && Note_column::has_rests (columns[l]))
l ++;
int r = columns.size ()- 1;
- while (r >= l && Note_column::rest_b (columns[r]))
+ while (r >= l && Note_column::has_rests (columns[r]))
r--;
if (l < r)
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];
-
+ Grob * rgr = get_x_bound_grob (columns.top (), dir);
+ Real x0 = robust_relative_extent (lgr, commonx, X_AXIS)[LEFT];
+ Real x1 = robust_relative_extent (rgr, commonx, X_AXIS)[RIGHT];
/*
Slope.
}
// padding
- *offset += gh_scm2double (me->get_grob_property ("padding")) *dir;
+ *offset += scm_to_double (me->get_property ("padding")) *dir;
/*
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
- for (int i = columns.size(); i--;)
+ for (int i = columns.size (); i--;)
{
Grob * s =Note_column::get_stem (columns[i]);
Grob * b = s ? Stem::get_beam (s): 0;
if (b)
me->add_dependency (b);
}
- return SCM_UNDEFINED;
+ return SCM_UNSPECIFIED;
}
MAKE_SCHEME_CALLBACK (Tuplet_bracket,after_line_breaking,1);
me->suicide ();
return SCM_UNSPECIFIED;
}
- if (dynamic_cast<Spanner*> (me)->broken_b ())
+ if (dynamic_cast<Spanner*> (me)->is_broken ())
{
me->warning (_("Killing tuplet bracket across linebreak."));
- me->suicide();
+ me->suicide ();
return SCM_UNSPECIFIED;
}
}
else
{
- SCM ps = par_beam->get_grob_property ("positions");
+ SCM ps = par_beam->get_property ("positions");
- Real lp = gh_scm2double (gh_car (ps));
- Real rp = gh_scm2double (gh_cdr (ps));
+ Real lp = scm_to_double (ly_car (ps));
+ Real rp = scm_to_double (ly_cdr (ps));
/*
duh. magic.
*/
- offset = lp + dir * (0.5 + gh_scm2double (me->get_grob_property ("padding")));
+ offset = lp + dir * (0.5 + scm_to_double (me->get_property ("padding")));
dy = rp- lp;
}
- SCM lp = me->get_grob_property ("left-position");
- SCM rp = me->get_grob_property ("right-position");
+ SCM lp = me->get_property ("left-position");
+ SCM rp = me->get_property ("right-position");
- if (gh_number_p (lp) && !gh_number_p (rp))
+ if (scm_is_number (lp) && !scm_is_number (rp))
{
- rp = gh_double2scm (gh_scm2double (lp) + dy);
+ rp = scm_make_real (scm_to_double (lp) + dy);
}
- else if (gh_number_p (rp) && !gh_number_p (lp))
+ else if (scm_is_number (rp) && !scm_is_number (lp))
{
- lp = gh_double2scm (gh_scm2double (rp) - dy);
+ lp = scm_make_real (scm_to_double (rp) - dy);
}
- else if (!gh_number_p (rp) && !gh_number_p (lp))
+ else if (!scm_is_number (rp) && !scm_is_number (lp))
{
- lp = gh_double2scm (offset);
- rp = gh_double2scm (offset +dy);
+ lp = scm_make_real (offset);
+ rp = scm_make_real (offset +dy);
}
- me->set_grob_property ("left-position", lp);
- me->set_grob_property ("right-position", rp);
+ me->set_property ("left-position", lp);
+ me->set_property ("right-position", rp);
return SCM_UNSPECIFIED;
}
/*
- similar to slur.
+ similar to beam ?
*/
Direction
Tuplet_bracket::get_default_dir (Grob*me)
{
- Direction d = UP;
- for (SCM s = me->get_grob_property ("note-columns"); gh_pair_p (s); s = ly_cdr (s))
+ Drul_array<int> dirs (0,0);
+ for (SCM s = me->get_property ("note-columns"); ly_c_pair_p (s); s = ly_cdr (s))
{
Grob * nc = unsmob_grob (ly_car (s));
- if (Note_column::dir (nc) < 0)
- {
- d = DOWN;
- break;
- }
+ Direction d = Note_column::dir (nc);
+ if (d)
+ dirs[d]++;
}
- return d;
+
+ return dirs[UP] >= dirs[DOWN] ? UP : DOWN;
}
void
ADD_INTERFACE (Tuplet_bracket,"tuplet-bracket-interface",
"A bracket with a number in the middle, used for tuplets.",
- "note-columns bracket-flare edge-height shorten-pair padding gap left-position right-position bracket-visibility number-visibility thickness direction");
+ "note-columns bracket-flare edge-height shorten-pair padding left-position right-position bracket-visibility number-visibility thickness direction");
projects / lilypond.git / blobdiff