source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
*/
+
#include "beam.hh"
#include "box.hh"
#include "debug.hh"
#include "note-column.hh"
#include "dimensions.hh"
#include "group-interface.hh"
-
+#include "directional-element-interface.hh"
Tuplet_spanner::Tuplet_spanner ()
{
- /*
- -> GUILE
- */
- parallel_beam_b_ = false;
set_elt_property ("beams", SCM_EOL);
- set_elt_property ("columns", SCM_EOL);
+ set_elt_property ("columns", SCM_EOL);
+
+ // ugh.
+ set_elt_property ("delta-y", gh_int2scm (0));
}
/*
TODO.
*/
-Molecule*
-Tuplet_spanner::do_brew_molecule_p () const
+Molecule
+Tuplet_spanner::do_brew_molecule () const
{
- Molecule* mol_p = new Molecule;
+ Molecule mol;
// Default behaviour: number always, bracket when no beam!
- bool bracket_visibility = !parallel_beam_b_;
+ bool par_beam = to_boolean (get_elt_property ("parallel-beam"));
+ bool bracket_visibility = !par_beam;
bool number_visibility = true;
- SCM visibility_sym =get_elt_property ("tuplet-visibility");
- if (visibility_sym != SCM_UNDEFINED)
+
+ SCM bracket = get_elt_property ("tuplet-bracket-visibility");
+ if (gh_boolean_p (bracket))
{
- /*
- ARG. Fixme.
- */
-
- /* Property values:
- 0 show nothing
- 1 show number
- 2 show (number and bracket)-if-no-beam
- 3 show number, and bracket-if-no-beam
- 4 show number, and bracket
- */
- int value = gh_scm2int ((visibility_sym));
- bracket_visibility = (value == 4 || (value > 1 && !parallel_beam_b_));
- number_visibility = (value > 2 || value == 1 ||
- (value == 2 && !parallel_beam_b_));
+ bracket_visibility = gh_scm2bool (bracket);
}
+ else if (bracket == ly_symbol2scm ("if-no-beam"))
+ bracket_visibility = !par_beam;
+
+ SCM numb = get_elt_property ("tuplet-number-visibility");
+ if (gh_boolean_p (numb))
+ {
+ number_visibility = gh_scm2bool (numb);
+ }
+ else if (bracket == ly_symbol2scm ("if-no-beam"))
+ number_visibility = !par_beam;
if (gh_pair_p (get_elt_property ("columns")))
{
Real ncw = column_arr.top ()->extent(X_AXIS).length ();
Real w = spanner_length () + ncw;
- Molecule num (lookup_l ()->text ("italic",
- number_str_, paper_l ()));
- num.align_to (X_AXIS, CENTER);
- num.translate_axis (w/2, X_AXIS);
- Real interline = paper_l ()->get_var ("interline");
- Real dy = column_arr.top ()->extent (Y_AXIS) [get_direction ()]
- - column_arr[0]->extent (Y_AXIS) [get_direction ()];
- num.align_to (Y_AXIS, CENTER);
- num.translate_axis (get_direction () * interline, Y_AXIS);
+
+
+ Real staff_space = paper_l ()->get_var ("interline");
+ Direction dir = directional_element (this).get ();
+ Real dy = gh_scm2double (get_elt_property ("delta-y"));
+ SCM number = get_elt_property ("text");
+ if (gh_string_p (number) && number_visibility)
+ {
+ Molecule
+ num (lookup_l ()->text ("italic",
+ ly_scm2string (number), paper_l ()));
+ num.align_to (X_AXIS, CENTER);
+ num.translate_axis (w/2, X_AXIS);
+ num.align_to (Y_AXIS, CENTER);
+ num.translate_axis (dir * staff_space, Y_AXIS);
- num.translate_axis (dy/2, Y_AXIS);
-
+ num.translate_axis (dy/2, Y_AXIS);
+
+ mol.add_molecule (num);
+ }
+
Real thick = paper_l ()->get_var ("tuplet_thick");
if (bracket_visibility)
{
Real gap = paper_l () -> get_var ("tuplet_spanner_gap");
-
- mol_p->add_molecule (lookup_l ()->tuplet_bracket (dy, w, thick, gap, interline, get_direction ()));
- }
+ Real height = staff_space;
+ SCM at =gh_list(ly_symbol2scm ("tuplet"),
+ gh_double2scm (height),
+ gh_double2scm (gap),
+ gh_double2scm (w),
+ gh_double2scm (dy),
+ gh_double2scm (thick),
+ gh_int2scm (dir),
+ SCM_UNDEFINED);
- if (number_visibility)
- {
- mol_p->add_molecule (num);
+ Box b;
+ mol.add_molecule (Molecule (b, at));
}
- mol_p->translate_axis (get_direction () * interline, Y_AXIS);
+
+ //mol.translate_axis (dir * staff_space, Y_AXIS);
}
- return mol_p;
+ return mol;
}
void
Link_array<Note_column> column_arr=
Group_interface__extract_elements (this, (Note_column*)0, "columns");
- set_bounds (LEFT, column_arr[0]);
- set_bounds (RIGHT, column_arr.top ());
+ set_bound (LEFT, column_arr[0]);
+ set_bound (RIGHT, column_arr.top ());
}
}
+
+
+
+/*
+ use first -> last note for slope, and then correct for disturbing
+ notes in between. */
+void
+Tuplet_spanner::calc_position_and_height (Real *offset, Real * dy) const
+{
+ Link_array<Note_column> column_arr=
+ Group_interface__extract_elements (this, (Note_column*)0, "columns");
+
+
+ Score_element * common = common_refpoint (get_elt_property ("columns"), Y_AXIS);
+
+ Direction d = directional_element (this).get ();
+
+ /*
+ Use outer non-rest columns to determine slope
+ */
+ int l = 0;
+ while (l <column_arr.size() && column_arr[l]->rest_b())
+ l ++;
+
+ int r = column_arr.size ()- 1;
+ while (r >= l && column_arr[r]->rest_b())
+ r--;
+
+ if (l < r)
+ {
+ *dy = column_arr[r]->extent (Y_AXIS) [d] + column_arr[r]->relative_coordinate (common, Y_AXIS)
+ - column_arr[l]->extent (Y_AXIS) [d] - column_arr[l]->relative_coordinate (common, Y_AXIS);
+ }
+ else
+ * dy = 0;
+
+
+ *offset = - d * infinity_f;
+
+ if (!column_arr.size ())
+ return;
+
+ Real x0 = column_arr[0]->relative_coordinate (0, X_AXIS);
+ Real x1 = column_arr.top ()->relative_coordinate (0, X_AXIS);
+ Real factor = column_arr.size () > 1 ? 1/(x1 - x0) : 1.0;
+
+ for (int i = 0; i < column_arr.size (); i++)
+ {
+ Real notey = column_arr[i]->extent (Y_AXIS)[d] +
+ column_arr[i]->relative_coordinate (common, Y_AXIS)
+ ;
+ Real x = column_arr[i]->relative_coordinate (0, X_AXIS) - x0;
+ Real tuplety = *dy * x * factor;
+
+ if (notey * d > (*offset + tuplety) * d)
+ *offset = notey - tuplety;
+ }
+}
+
+/*
+ use first -> last note for slope,
+*/
void
-Tuplet_spanner::do_post_processing ()
+Tuplet_spanner::calc_dy (Real * dy) const
+{
+ Link_array<Note_column> column_arr=
+ Group_interface__extract_elements (this, (Note_column*)0, "columns");
+
+
+ Direction d = directional_element (this).get ();
+ *dy = column_arr.top ()->extent (Y_AXIS) [d]
+ - column_arr[0]->extent (Y_AXIS) [d];
+}
+
+void
+Tuplet_spanner::after_line_breaking ()
{
Link_array<Note_column> column_arr=
Group_interface__extract_elements (this, (Note_column*)0, "columns");
-
- if (column_arr.size())
- translate_axis (column_arr[0]->extent (Y_AXIS)[get_direction ()], Y_AXIS);
+ if (!column_arr.size ())
+ {
+ set_elt_property ("transparent", SCM_BOOL_T);
+ set_extent_callback (0, X_AXIS);
+ set_extent_callback (0, Y_AXIS);
+ }
+
+ Direction d = directional_element (this).get ();
+ if (!d)
+ {
+ d = get_default_dir ();
+ directional_element (this).set (d);
+
+ }
+ Real dy, offset;
+
+ calc_position_and_height (&offset,&dy);
+
+ set_elt_property ("delta-y", gh_double2scm (dy));
+ translate_axis (offset, Y_AXIS);
if (scm_ilength (get_elt_property ("beams")) == 1)
{
Score_element *b = unsmob_element (gh_car (bs));
Beam * beam_l = dynamic_cast<Beam*> (b);
if (!broken_b ()
- && spanned_drul_[LEFT]->column_l () == beam_l->spanned_drul_[LEFT]->column_l ()
- && spanned_drul_[RIGHT]->column_l () == beam_l->spanned_drul_[RIGHT]->column_l ())
- parallel_beam_b_ = true;
+ && get_bound (LEFT)->column_l () == beam_l->get_bound (LEFT)->column_l ()
+ && get_bound (RIGHT)->column_l () == beam_l->get_bound (RIGHT)->column_l ())
+ set_elt_property ("parallel-beam", SCM_BOOL_T);
}
}
{
Direction d = UP;
SCM dir_sym =get_elt_property ("dir-forced");
- if (gh_number_p (dir_sym))
+ if (isdir_b (dir_sym))
{
- d= (Direction) gh_scm2int (dir_sym);
+ d= to_dir (dir_sym);
if (d != CENTER)
return d;
}
+ d = UP ;
for (SCM s = get_elt_property ("columns"); gh_pair_p (s); s = gh_cdr (s))
{
Score_element * sc = unsmob_element (gh_car (s));
projects / lilypond.git / blobdiff