source file of the GNU LilyPond music typesetter
- (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include <math.h>
+#include "tie.hh"
+
+#include <cmath>
#include "spanner.hh"
#include "lookup.hh"
-#include "paper-def.hh"
-#include "tie.hh"
+#include "output-def.hh"
#include "rhythmic-head.hh"
#include "bezier.hh"
#include "paper-column.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "staff-symbol-referencer.hh"
#include "directional-element-interface.hh"
-#include "molecule.hh"
-#include "bezier-bow.hh"
+#include "bezier.hh"
#include "stem.hh"
#include "note-head.hh"
+#include "tie-column.hh"
/*
tie: Connect two noteheads.
void
-Tie::set_head (Grob*me,Direction d, Item * head_l)
+Tie::set_head (Grob*me,Direction d, Grob * h)
{
assert (!head (me,d));
- index_set_cell (me->get_grob_property ("heads"), d, head_l->self_scm ());
+ index_set_cell (me->get_property ("head-pair"), d, h->self_scm ());
- dynamic_cast<Spanner*> (me)->set_bound (d, head_l);
- me->add_dependency (head_l);
+ dynamic_cast<Spanner*> (me)->set_bound (d, h);
+ me->add_dependency (h);
}
void
Tie::set_interface (Grob*me)
{
- me->set_grob_property ("heads", gh_cons (SCM_EOL, SCM_EOL));
- me->set_interface (ly_symbol2scm ("tie-interface"));
+ me->set_property ("head-pair", scm_cons (SCM_EOL, SCM_EOL));
}
-bool
-Tie::has_interface (Grob*me)
-{
- return me->has_interface (ly_symbol2scm ("tie-interface"));
-}
Grob*
Tie::head (Grob*me, Direction d)
{
- SCM c = me->get_grob_property ("heads");
- c = index_cell (c, d);
+ SCM c = me->get_property ("head-pair");
- return unsmob_grob (c);
+ if (scm_is_pair (c))
+ return unsmob_grob (index_get_cell (c, d));
+ else
+ return 0;
}
Real
-Tie::position_f (Grob*me)
+Tie::get_position (Grob*me)
{
Direction d = head (me,LEFT) ? LEFT:RIGHT;
- return Staff_symbol_referencer::position_f (head (me,d));
+ return Staff_symbol_referencer::get_position (head (me,d));
}
The direction of the Tie is more complicated (See [Ross] p136 and
further).
+
+ (what about linebreaks? )
+
*/
Direction
Tie::get_default_dir (Grob*me)
{
- Item * sl = head (me,LEFT) ? Rhythmic_head::stem_l (head (me,LEFT)) :0;
- Item * sr = head (me,RIGHT) ? Rhythmic_head::stem_l (head (me,RIGHT)) :0;
-
+ Item * sl = head (me,LEFT) ? Rhythmic_head::get_stem (head (me,LEFT)) :0;
+ Item * sr = head (me,RIGHT) ? Rhythmic_head::get_stem (head (me,RIGHT)) :0;
if (sl && sr)
{
- if (Directional_element_interface::get (sl) == UP
- && Directional_element_interface::get (sr) == UP)
+ if (get_grob_direction (sl) == UP
+ && get_grob_direction (sr) == UP)
return DOWN;
}
else if (sl || sr)
{
Item *s = sl ? sl : sr;
- return - Directional_element_interface::get (s);
+ return - get_grob_direction (s);
}
}
+void
+Tie::set_direction (Grob*me)
+{
+ if (!get_grob_direction (me))
+ {
+ if (Tie_column::has_interface (me->get_parent (Y_AXIS)))
+ Tie_column::set_directions (me->get_parent (Y_AXIS));
+ else
+ set_grob_direction (me, Tie::get_default_dir (me));
+ }
+}
+
+/*
+ TODO: we should also use thickness for computing the clearance
+ between head and tie. Very thick ties will now touch the note head.
+
+ */
SCM
Tie::get_control_points (SCM smob)
{
{
programming_error ("Tie without heads.");
me->suicide ();
- return SCM_UNSPECIFIED;
+ return SCM_EOL;
}
-
- if (!Directional_element_interface::get (me))
- Directional_element_interface::set (me, Tie::get_default_dir (me));
+
+ set_direction (me);
+
+ Direction dir = get_grob_direction (me);
Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real x_gap_f = gh_scm2double (me->get_grob_property ("x-gap"));
+ Real x_gap_f = robust_scm2double (me->get_property ("x-gap"), 0);
Grob* l = me->get_bound (LEFT);
Grob* r = me->get_bound (RIGHT);
Real left_x;
/*
- this is a kludge: the tie has to be long enough to be
- visible, but should not go through key sigs.
-
- (please fixme)
+ the tie has to be long enough to be visible, but should not go
+ through key sigs. In the 1.5 series the pref.matter - note
+ distance is fixed , so this won't be a problem anymore.
*/
- Real lambda = 0.5;
+ Real lambda = 0.9;
if (Note_head::has_interface (l))
- left_x = l->extent (l, X_AXIS)[RIGHT] + x_gap_f;
+ {
+ Real where = RIGHT;
+
+ /*
+ This correction is due te the shape of the black note head.
+ */
+ if (Rhythmic_head::duration_log (l) == 2)
+ where += dir* 0.2;
+ left_x = l->extent (l, X_AXIS).linear_combination (where)
+ + x_gap_f;
+ }
else
left_x = l->extent (l, X_AXIS).linear_combination (lambda);
- 2 * x_gap_f;
}
- Direction dir = Directional_element_interface::get (me);
- SCM details = me->get_grob_property ("details");
+
+ SCM details = me->get_property ("details");
SCM lim // groetjes aan de chirurgendochter.
= scm_assq (ly_symbol2scm ("height-limit"),details);
- Real h_inf = gh_scm2double (ly_cdr (lim)) * staff_space;
- Real r_0 = gh_scm2double (ly_cdr (scm_assq (ly_symbol2scm ("ratio"),details)));
+ Real h_inf = scm_to_double (scm_cdr (lim)) * staff_space;
+ Real r_0 = scm_to_double (scm_cdr (scm_assq (ly_symbol2scm ("ratio"),details)));
Bezier b = slur_shape (width, h_inf, r_0);
*/
- Real ypos = Tie::position_f (me) * staff_space/2
- + dir * gh_scm2double (me->get_grob_property ("y-offset"));;
+ Real ypos = Tie::get_position (me) * staff_space/2
+ + dir * scm_to_double (me->get_property ("y-offset"));;
/*
Make sure we don't start on a dots
*/
- if (Note_head::has_interface (l) && Rhythmic_head::dots_l (l))
+ if (Note_head::has_interface (l) && Rhythmic_head::get_dots (l))
{
- Grob* dots = Rhythmic_head::dots_l(l);
- if(fabs (staff_space * Staff_symbol_referencer::position_f (dots) /2
+ Grob* dots = Rhythmic_head::get_dots (l);
+ if (fabs (staff_space * Staff_symbol_referencer::get_position (dots) /2
- ypos) < 0.5)
{
ypos += 0.5 * dir ;
Real diff = ry - y;
Real newy = y;
- Real clear = staff_space * gh_scm2double (me->get_grob_property ("staffline-clearance"));
+ Real clear = staff_space * scm_to_double (me->get_property ("staffline-clearance"));
- if (fabs (y) <= Staff_symbol_referencer::staff_radius (me)
+ if (fabs (y) <=
+ Staff_symbol_referencer::staff_radius (me) * staff_space + clear
&& fabs (diff) < clear)
{
Real y1 = ry + clear;
Real y2 = ry - clear;
+
+ /*
+ ugh, we shove the 0.5 out of our sleeves.
+
+ Any way. This test is to make sure that staffline
+ collision avoidance does not result in completely flat
+ ties.
+ */
+ if (fabs (y1 - ypos) < 0.5)
+ y1 = y2;
+ else if (fabs (y2 - ypos) < 0.5)
+ y2 = y1;
newy = (fabs (y1 - y) < fabs (y2 - y)) ? y1 : y2;
SCM controls = SCM_EOL;
for (int i= 4; i--;)
- controls = gh_cons (ly_offset2scm (b.control_[i]), controls);
+ controls = scm_cons (ly_offset2scm (b.control_[i]), controls);
return controls;
}
-MAKE_SCHEME_CALLBACK (Tie,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Tie,print,1);
SCM
-Tie::brew_molecule (SCM smob)
+Tie::print (SCM smob)
{
Grob*me = unsmob_grob (smob);
- SCM cp = me->get_grob_property ("control-points");
- if (cp == SCM_EOL)
+ SCM cp = me->get_property ("control-points");
+ if (!scm_is_pair (cp)) // list is more accurate
{
cp = get_control_points (smob);
- me->set_grob_property ("control-points", cp);
+ me->set_property ("control-points", cp);
}
+
+ if (!scm_is_pair (cp))
+ return Stencil ().smobbed_copy ();
- Real thick =
- gh_scm2double (me->get_grob_property ("thickness"))
- * me->paper_l ()->get_var ("stafflinethickness");
+ Real thick
+ = Staff_symbol_referencer::line_thickness (me)
+ * robust_scm2double (me->get_property ("thickness"), 1);
Bezier b;
int i = 0;
- for (SCM s= cp; s != SCM_EOL; s = ly_cdr (s))
+ for (SCM s= cp; s != SCM_EOL; s = scm_cdr (s))
{
- b.control_[i] = ly_scm2offset (ly_car (s));
+ b.control_[i] = ly_scm2offset (scm_car (s));
i++;
}
- Molecule a = Lookup::slur (b, Directional_element_interface::get (me) * thick, thick);
+ Stencil a = Lookup::slur (b, get_grob_direction (me) * thick, thick);
return a.smobbed_copy ();
}
+
+ADD_INTERFACE (Tie,"tie-interface",
+ "A tie connecting two noteheads.\n"
+ ,
+ "y-offset staffline-clearance control-points head-pair details thickness x-gap direction minimum-length");
projects / lilypond.git / blobdiff