source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "tie.hh"
-#include "spanner.hh"
+
+#include "main.hh"
+#include "bezier.hh"
+#include "directional-element-interface.hh"
+#include "font-interface.hh"
+#include "grob-array.hh"
#include "lookup.hh"
+#include "note-head.hh"
#include "output-def.hh"
-#include "rhythmic-head.hh"
-#include "bezier.hh"
#include "paper-column.hh"
-#include "warn.hh"
+#include "rhythmic-head.hh"
+#include "spanner.hh"
#include "staff-symbol-referencer.hh"
-#include "directional-element-interface.hh"
-#include "bezier.hh"
#include "stem.hh"
-#include "note-head.hh"
+#include "text-interface.hh"
#include "tie-column.hh"
-#include "grob-array.hh"
-#include "tie-formatting-problem.hh"
#include "tie-configuration.hh"
+#include "tie-formatting-problem.hh"
+#include "warn.hh"
+#include "semi-tie-column.hh"
-int
-Tie::compare (Grob *const &s1,
- Grob *const &s2)
+bool
+Tie::less (Grob *const &s1,
+ Grob *const &s2)
{
- return sign (Tie::get_position (s1) - Tie::get_position (s2));
+ return Tie::get_position (s1) < Tie::get_position (s2);
}
void
Grob *
Tie::head (Grob *me, Direction d)
{
+ if (is_direction (me->get_property ("head-direction")))
+ {
+ Direction hd = to_dir (me->get_property ("head-direction"));
+
+ return (hd == d)
+ ? unsmob_grob (me->get_object ("note-head"))
+ : 0;
+ }
+
Item *it = dynamic_cast<Spanner*> (me)->get_bound (d);
if (Note_head::has_interface (it))
return it;
{
Grob *h = head (me, d);
if (h)
- return (int) Staff_symbol_referencer::get_position (h);
+ return (int) rint (Staff_symbol_referencer::get_position (h));
}
while (flip (&d) != LEFT);
Direction
Tie::get_default_dir (Grob *me)
{
- 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)
+ Drul_array<Grob*> stems;
+ Direction d = LEFT;
+ do
+ {
+ Grob *stem = head (me, d) ? Rhythmic_head::get_stem (head (me, d)) : 0;
+ if (stem)
+ stem = Stem::is_invisible (stem) ? 0 : stem;
+
+ stems[d] = stem;
+ }
+ while (flip (&d)!= LEFT);
+
+ if (stems[LEFT] && stems[RIGHT])
{
- if (get_grob_direction (sl) == UP
- && get_grob_direction (sr) == UP)
+ if (get_grob_direction (stems[LEFT]) == UP
+ && get_grob_direction (stems[RIGHT]) == UP)
return DOWN;
}
- else if (sl || sr)
+ else if (stems[LEFT] || stems[RIGHT])
{
- Item *s = sl ? sl : sr;
+ Grob *s = stems[LEFT] ? stems[LEFT] : stems[RIGHT];
return -get_grob_direction (s);
}
-
+ else if (int p = get_position (me))
+ return Direction (sign (p));
+
return UP;
}
{
Grob *me = unsmob_grob (smob);
Grob *yparent = me->get_parent (Y_AXIS);
- if (Tie_column::has_interface (yparent)
+ if ((Tie_column::has_interface (yparent)
+ || Semi_tie_column::has_interface (yparent))
&& unsmob_grob_array (yparent->get_object ("ties"))
&& unsmob_grob_array (yparent->get_object ("ties"))->size () > 1)
{
Tie_formatting_problem problem;
problem.from_tie (me);
+ Tie_specification spec = problem.get_tie_specification (0);
+ spec.has_manual_dir_ = true;
+ spec.manual_dir_ = get_grob_direction (me);
+
+ if (me->is_live ())
+ {
+ Tie_configuration conf
+ = problem.find_optimal_tie_configuration (spec);
- // get_configuration (me, &conf, problem);
- int tie_position = (int) Tie::get_position (me);
- Tie_configuration conf
- = problem.find_optimal_tie_configuration (tie_position, get_grob_direction (me));
- set_control_points (me, problem.common_x_refpoint (),
- conf, problem.details_);
+ set_control_points (me, problem.common_x_refpoint (),
+ conf, problem.details_);
+ }
}
-
void
Tie::set_control_points (Grob *me,
Grob *common,
(void) get_grob_direction (me);
Grob *yparent = me->get_parent (Y_AXIS);
- if (Tie_column::has_interface (yparent)
+ if ((Tie_column::has_interface (yparent)
+ || Semi_tie_column::has_interface (yparent))
&& unsmob_grob_array (yparent->get_object ("ties"))
&& unsmob_grob_array (yparent->get_object ("ties"))->size () > 1)
{
(void) yparent->get_property ("positioning-done");
}
- if (!scm_is_pair (me->get_property ("control-points")))
+ if (!scm_is_pair (me->get_property_data ("control-points")))
{
set_default_control_points (me);
}
return SCM_UNSPECIFIED;
}
-
+/*
+ TODO: merge witnh Slur::print.
+ */
MAKE_SCHEME_CALLBACK (Tie, print, 1);
SCM
Tie::print (SCM smob)
SCM cp = me->get_property ("control-points");
Real staff_thick = Staff_symbol_referencer::line_thickness (me);
- Real base_thick = robust_scm2double (me->get_property ("thickness"), 1);
- Real thick = base_thick * staff_thick;
+ Real base_thick = staff_thick * robust_scm2double (me->get_property ("thickness"), 1);
+ Real line_thick = staff_thick * robust_scm2double (me->get_property ("line-thickness"), 1);
Bezier b;
int i = 0;
- for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s))
+ for (SCM s = cp; scm_is_pair (s); s = scm_cdr (s))
{
b.control_[i] = ly_scm2offset (scm_car (s));
i++;
SCM f = me->get_property ("dash-fraction");
if (scm_is_number (p) && scm_is_number (f))
a = Lookup::dashed_slur (b,
- thick,
+ line_thick,
robust_scm2double (p, 1.0),
robust_scm2double (f, 0));
else
a = Lookup::slur (b,
- get_grob_direction (me) * staff_thick,
- thick);
+ get_grob_direction (me) * base_thick,
+ line_thick);
+
+#if DEBUG_TIE_SCORING
+ SCM quant_score = me->get_property ("quant-score");
+
+ if (to_boolean (me->layout ()
+ ->lookup_variable (ly_symbol2scm ("debug-tie-scoring")))
+ && scm_is_string (quant_score))
+ {
+ string str;
+ SCM properties = Font_interface::text_font_alist_chain (me);
+
+ Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
+ (me->layout ()->self_scm (), properties,
+ quant_score));
+ tm.translate_axis (b.control_[0][Y_AXIS]*2, Y_AXIS);
+ a.add_at_edge (X_AXIS, RIGHT, tm, 1.0, 0);
+ }
+#endif
return a.smobbed_copy ();
}
ADD_INTERFACE (Tie,
"tie-interface",
- "A tie connecting two noteheads. \n\n"
+ "A horizontal curve connecting two noteheads. \n\n"
,
"dash-period "
"details "
"direction "
+ "line-thickness "
+ "quant-score "
+ "staff-position "
"thickness "
- "x-gap ");
+ );
projects / lilypond.git / blobdiff