#include "directional-element-interface.hh"
#include "note-head.hh"
#include "stem.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "paper-def.hh"
#include "rhythmic-head.hh"
#include "font-interface.hh"
#include "dot-column.hh"
void
-Stem::set_beaming (Grob*me ,int i, Direction d)
+Stem::set_beaming (Grob*me, int beam_count, Direction d)
{
SCM pair = me->get_grob_property ("beaming");
if (!gh_pair_p (pair))
{
- pair = gh_cons (gh_int2scm (-1),gh_int2scm (-1));
- me-> set_grob_property ("beaming", pair);
+ pair = gh_cons (SCM_EOL, SCM_EOL);
+ me->set_grob_property ("beaming", pair);
}
- index_set_cell (pair, d, gh_int2scm (i));
-}
-int
-Stem::beam_count (Grob*me,Direction d)
-{
- SCM p=me->get_grob_property ("beaming");
- if (gh_pair_p (p))
- return gh_scm2int (index_cell (p,d));
- else
- return -1;
+ SCM l = index_get_cell (pair, d);
+ for( int i = 0; i< beam_count; i++)
+ {
+ l = gh_cons (gh_int2scm (i), l);
+ }
+ index_set_cell (pair, d, l);
}
+
Interval
Stem::head_positions (Grob*me)
{
Real
Stem::get_default_stem_end_position (Grob*me)
{
+ SCM up_to_staff = me->get_grob_property ("up-to-staff");
+ if (to_boolean(up_to_staff))
+ {
+ int line_count = Staff_symbol_referencer::line_count (me);
+
+ Direction dir = get_direction (me);
+
+ return dir* (line_count + 3.5);
+ }
+
bool grace_b = to_boolean (me->get_grob_property ("grace"));
SCM s;
Array<Real> a;
else
{
s = me->get_grob_property ("lengths");
- for (SCM q = s; q != SCM_EOL; q = ly_cdr (q))
- a.push (gh_scm2double (ly_car (q)));
-
- // stem uses half-spaces
- length_f = a[ ((duration_log (me) - 2) >? 0) <? (a.size () - 1)] * 2;
+ length_f = 3.5;
+
+ if (gh_pair_p (s))
+ {
+ length_f = 2* gh_scm2double (robust_list_ref (duration_log(me) -2, s));
+ }
}
- a.clear ();
- s = me->get_grob_property ("stem-shorten");
- for (SCM q = s; gh_pair_p (q); q = ly_cdr (q))
- a.push (gh_scm2double (ly_car (q)));
-
-
- // stem uses half-spaces
-
- // fixme: use scm_list_n_ref () iso. array[]
- Real shorten_f = a[ ((duration_log (me) - 2) >? 0) <? (a.size () - 1)] * 2;
+ Real shorten_f = 0.0;
+
+ SCM sshorten = me->get_grob_property ("stem-shorten");
+ if (gh_pair_p (sshorten))
+ {
+ shorten_f = 2* gh_scm2double (robust_list_ref ((duration_log (me) - 2) >? 0, sshorten));
+ }
/* On boundary: shorten only half */
if (abs (chord_start_y (me)) == 0.5)
/*
TODO: make the stem start a direction ?
-
*/
+
+
+
if (to_boolean (me->get_grob_property ("avoid-note-head")))
{
- y1 = Staff_symbol_referencer::position_f (last_head (me));
+ Grob * lh = last_head (me);
+ if (!lh)
+ return SCM_EOL;
+ y1 = Staff_symbol_referencer::position_f (lh);
}
else
{
- y1 = Staff_symbol_referencer::position_f (first_head (me));
+ Grob * lh = first_head (me);
+ if (!lh)
+ return SCM_EOL;
+ y1 = Staff_symbol_referencer::position_f (lh);
}
Real y2 = stem_end_position (me);
return unsmob_grob (b);
}
-
// ugh still very long.
Stem_info
Stem::calc_stem_info (Grob*me)
{
+ SCM up_to_staff = me->get_grob_property ("up-to-staff");
+ if (gh_scm2bool(up_to_staff)) {
+
+ // Up-to-staff : the stem end out of the staff.
+
+ /*
+ FIXME: duplicate code.
+ */
+ int line_count = Staff_symbol_referencer::line_count (me);
+
+ Stem_info si ;
+
+ Direction dir = get_direction (me);
+
+ si.ideal_y_ = dir* (line_count + 1.5);
+ si.dir_ = dir;
+ si.shortest_y_ = si.ideal_y_;
+
+ return si;
+ }
+
SCM scm_info = me->get_grob_property ("stem-info");
if (gh_pair_p (scm_info ))
Real half_space = staff_space / 2;
Grob * beam = beam_l (me);
- int multiplicity = Beam::get_multiplicity (beam);
- Real interbeam_f = Beam::get_interbeam (beam);
-
+ int beam_count = beam_multiplicity(me).length()+1;
+ Real beam_translation= Beam::get_beam_translation (beam);
Real thick = gh_scm2double (beam->get_grob_property ("thickness"));
-
- Real ideal_y = chord_start_y (me);
+ Real note_start = chord_start_y (me);
/* from here on, calculate as if dir == UP */
- ideal_y *= mydir;
+ note_start *= mydir;
SCM grace_prop = me->get_grob_property ("grace");
bool grace_b = to_boolean (grace_prop);
-
- Array<Real> a;
- SCM s;
-
- s = me->get_grob_property ("beamed-minimum-lengths");
- a.clear ();
- for (SCM q = s; q != SCM_EOL; q = ly_cdr (q))
- a.push (gh_scm2double (ly_car (q)));
-
-
- Real minimum_length = a[multiplicity <? (a.size () - 1)] * staff_space;
- s = me->get_grob_property ("beamed-lengths");
+ SCM bml = robust_list_ref ( beam_count ,
+ me->get_grob_property ("beamed-minimum-lengths"));
- a.clear ();
- for (SCM q = s; q != SCM_EOL; q = ly_cdr (q))
- a.push (gh_scm2double (ly_car (q)));
+ Real minimum_length = gh_scm2double(bml)*staff_space;
+ SCM bl = robust_list_ref ( beam_count ,
+ me->get_grob_property ("beamed-lengths"));
+ Real stem_length = gh_scm2double(bl) * staff_space;
- Real stem_length = a[multiplicity <? (a.size () - 1)] * staff_space;
- Direction first_dir = Directional_element_interface::get
- (Beam::first_visible_stem (beam));
-
- // FIXME, hairy. see beam::calc_stem_y, for knees it's not trival
- // to calculate where secondary, ternary beams will go.
- if (multiplicity && first_dir == mydir)
- ideal_y += thick + (multiplicity - 1) * interbeam_f;
-
- Real shortest_y = ideal_y;
+ /*
+ stem goes to center of beam, hence 0.5
+ */
+ Real beam_lengthen = beam_translation* (beam_count - 1)
+ + ((beam_count > 0) ? thick : 0) - 0.5 * thick;
- ideal_y += stem_length;
- shortest_y += minimum_length;
+ Real shortest_y = note_start + minimum_length + beam_lengthen;
+ Real ideal_y = stem_length + note_start + beam_lengthen;
/*
lowest beam of (UP) beam must never be lower than second staffline
staffline
lowest beam of (UP) beam must never be lower than second staffline
*/
- shortest_y =
- shortest_y >? 0
- >? (- 2 * half_space - thick
- + (multiplicity > 0) * thick
- + interbeam_f * (multiplicity - 1));
+ ideal_y =
+ ideal_y >? 0
+ >? (- 2 * half_space - thick + beam_lengthen);
}
- ideal_y = ideal_y >? shortest_y;
-
- s = beam->get_grob_property ("shorten");
+ // ideal_y = ideal_y >? shortest_y;
+ SCM s = beam->get_grob_property ("shorten");
if (gh_number_p (s))
ideal_y -= gh_scm2double (s);
- Grob *common = me->common_refpoint (beam, Y_AXIS);
- Real interstaff_f = mydir *
- (me->relative_coordinate (common, Y_AXIS)
- - beam->relative_coordinate (common, Y_AXIS));
- ideal_y += interstaff_f;
- shortest_y += interstaff_f;
-
ideal_y *= mydir;
shortest_y *= mydir;
return si;
}
+
+// move to stem?
+Slice
+Stem::beam_multiplicity (Grob *stem)
+{
+ SCM beaming= stem->get_grob_property ("beaming");
+ Slice l = int_list_to_slice (gh_car (beaming));
+ Slice r = int_list_to_slice (gh_cdr (beaming));
+ l.unite (r);
+
+ return l;
+}
+
+
ADD_INTERFACE (Stem,"stem-interface",
"A stem",
- "avoid-note-head adjust-if-on-staffline thickness stem-info beamed-lengths beamed-minimum-lengths lengths beam stem-shorten duration-log beaming neutral-direction stem-end-position support-head note-heads direction length style no-stem-extend flag-style dir-forced");
+ "up-to-staff avoid-note-head adjust-if-on-staffline thickness stem-info beamed-lengths beamed-minimum-lengths lengths beam stem-shorten duration-log beaming neutral-direction stem-end-position support-head note-heads direction length style no-stem-extend flag-style dir-forced");
+
projects / lilypond.git / blobdiff