void
-Stem::set_beaming (Grob*me ,int i, Direction d )
+Stem::set_beaming (Grob*me ,int i, Direction d)
{
SCM pair = me->get_grob_property ("beaming");
Drul_array<Grob*> e (extremal_heads (me));
return Interval (Staff_symbol_referencer::position_f (e[DOWN]),
- Staff_symbol_referencer::position_f ( e[UP]));
+ Staff_symbol_referencer::position_f (e[UP]));
}
Real
Stem::chord_start_f (Grob*me)
{
- return head_positions(me)[get_direction (me)]
+ return head_positions (me)[get_direction (me)]
* Staff_symbol_referencer::staff_space (me)/2.0;
}
// todo: margins
Direction d= get_direction (me);
- if (d && d * head_positions(me)[get_direction (me)] >= se*d)
+ if (d && d * head_positions (me)[get_direction (me)] >= se*d)
warning (_ ("Weird stem size; check for narrow beams"));
me->set_grob_property ("stem-end-position", gh_double2scm (se));
Grob * n = unsmob_grob (gh_car (s));
- int p = int(Staff_symbol_referencer::position_f (n));
+ int p = int (Staff_symbol_referencer::position_f (n));
Direction d = LEFT;
do {
bool
Stem::invisible_b (Grob*me)
{
- return !(heads_i (me) && Rhythmic_head::balltype_i (support_head (me)) >= 1);
+ return ! (heads_i (me) && Rhythmic_head::balltype_i (support_head (me)) >= 1);
}
int
Stem::get_center_distance (Grob*me, Direction d)
{
int staff_center = 0;
- int distance = (int) (d*(head_positions(me)[d] - staff_center));
+ int distance = (int) (d* (head_positions (me)[d] - staff_center));
return distance >? 0;
}
if (sign (dd - du))
return Direction (sign (dd -du));
- return to_dir (me->get_grob_property ("default-neutral-direction"));
+ return to_dir (me->get_grob_property ("neutral-direction"));
}
Real
Array<Real> a;
Real length_f = 0.;
- SCM scm_len = me->get_grob_property("length");
+ SCM scm_len = me->get_grob_property ("length");
if (gh_number_p (scm_len))
{
length_f = gh_scm2double (scm_len);
}
else
{
- s = me->get_grob_property("lengths");
+ s = me->get_grob_property ("lengths");
for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
a.push (gh_scm2double (gh_car (q)));
// stem uses half-spaces
- length_f = a[((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
+ length_f = a[ ((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
}
// stem uses half-spaces
// fixme: use gh_list_ref () iso. array[]
- Real shorten_f = a[((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
+ Real shorten_f = a[ ((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
/* URGURGURG
'set-default-stemlen' sets direction too
stems in unnatural (forced) direction should be shortened,
according to [Roush & Gourlay]
*/
- if (((int)chord_start_f (me))
+ if (( (int)chord_start_f (me))
&& (get_direction (me) != get_default_dir (me)))
length_f -= shorten_f;
- Real st = head_positions(me)[dir] + dir * length_f;
+ Real st = head_positions (me)[dir] + dir * length_f;
bool no_extend_b = to_boolean (me->get_grob_property ("no-stem-extend"));
if (!grace_b && !no_extend_b && dir * st < 0) // junkme?
Stem::flag_i (Grob*me)
{
SCM s = me->get_grob_property ("duration-log");
- return (gh_number_p (s)) ? gh_scm2int (s) : 2;
+ return (gh_number_p (s)) ? gh_scm2int (s) : 2;
}
void
}
}
-MAKE_SCHEME_CALLBACK(Stem,before_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Stem,before_line_breaking,1);
SCM
Stem::before_line_breaking (SCM smob)
{
if (invisible_b (me))
{
me->remove_grob_property ("molecule-callback");
- // suicide();
+ // suicide ();
}
set_spacing_hints (me);
{
Axis a = (Axis)gh_scm2int (ax);
Grob * me = unsmob_grob (smob);
- assert ( a == Y_AXIS);
+ assert (a == Y_AXIS);
SCM mol = me->get_uncached_molecule ();
Interval iv;
{
String style;
SCM st = me->get_grob_property ("flag-style");
- if ( gh_string_p (st))
+ if (gh_string_p (st))
{
style = ly_scm2string (st);
}
Molecule m = Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) +
to_str (flag_i (me)));
if (!style.empty_b ())
- m.add_molecule(Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) + style));
+ m.add_molecule (Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) + style));
return m;
}
-MAKE_SCHEME_CALLBACK(Stem,dim_callback,2);
+MAKE_SCHEME_CALLBACK (Stem,dim_callback,2);
SCM
Stem::dim_callback (SCM e, SCM ax)
{
{
r = flag (se).extent (X_AXIS);
}
- return ly_interval2scm ( r);
+ return ly_interval2scm (r);
}
+
-
-MAKE_SCHEME_CALLBACK(Stem,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Stem,brew_molecule,1);
SCM
Stem::brew_molecule (SCM smob)
Real y1 = Staff_symbol_referencer::position_f (first_head (me));
Real y2 = stem_end_position (me);
- Interval stem_y(y1,y2);
+ Interval stem_y (y1,y2);
stem_y.unite (Interval (y2,y1));
Real dy = Staff_symbol_referencer::staff_space (me)/2.0;
- Real head_wid = 0;
-
- Real angle =0.0;
+
if (Grob *hed = support_head (me))
{
- head_wid = hed->extent (hed,X_AXIS).length ();
+ Interval head_height = hed->extent (hed,Y_AXIS);
+ Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS);
- angle = gh_scm2double (hed->get_grob_property ("attachment-angle"));
+ y_attach = head_height.linear_combination (y_attach);
+ stem_y[Direction (-d)] += d * 2*y_attach;
}
- stem_y[Direction(-d)] += d * head_wid * tan(angle)/(2*dy);
+
if (!invisible_b (me))
{
if (!beam_l (me) && abs (flag_i (me)) > 2)
{
Molecule fl = flag (me);
- fl.translate_axis(stem_y[d]*dy, Y_AXIS);
+ fl.translate_axis (stem_y[d]*dy, Y_AXIS);
mol.add_molecule (fl);
}
/*
move the stem to right of the notehead if it is up.
*/
-MAKE_SCHEME_CALLBACK(Stem,off_callback,2);
+MAKE_SCHEME_CALLBACK (Stem,off_callback,2);
SCM
-Stem::off_callback (SCM element_smob, SCM )
+Stem::off_callback (SCM element_smob, SCM)
{
Grob *me = unsmob_grob (element_smob);
Real r=0;
if (Grob * f = first_head (me))
{
- Interval head_wid(0, f->extent (f,X_AXIS).length ());
+ Interval head_wid = f->extent (f,X_AXIS);
+
+ Real attach =
+ Note_head::stem_attachment_coordinate(f, X_AXIS);
- if (to_boolean (me->get_grob_property ("stem-centered")))
- return gh_double2scm ( head_wid.center ());
-
- Real rule_thick = gh_scm2double (me->get_grob_property ("thickness")) * me->paper_l ()->get_var ("stafflinethickness");
Direction d = get_direction (me);
- r = head_wid[d] - d * rule_thick * 0.5;
+
+ Real real_attach = head_wid.linear_combination (d * attach);
+
+ r = real_attach;
+
+ /*
+ If not centered: correct for stem thickness.
+ */
+ if (attach)
+ {
+ Real rule_thick
+ = gh_scm2double (me->get_grob_property ("thickness"))
+ * me->paper_l ()->get_var ("stafflinethickness");
+
+
+ r += - d * rule_thick * 0.5;
+ }
}
return gh_double2scm (r);
}
Array<Real> a;
SCM s;
- s = me->get_grob_property("beamed-minimum-lengths");
+ s = me->get_grob_property ("beamed-minimum-lengths");
a.clear ();
for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
a.push (gh_scm2double (gh_car (q)));
Real minimum_length = a[multiplicity <? (a.size () - 1)] * staff_space;
s = me->get_grob_property ("beamed-lengths");
- a.clear();
+ a.clear ();
for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
a.push (gh_scm2double (gh_car (q)));
Grob *common = me->common_refpoint (beam, Y_AXIS);
Real interstaff_f = beam_dir *
- (me->relative_coordinate (common, Y_AXIS)
+ (me->relative_coordinate (common, Y_AXIS)
- beam->relative_coordinate (common, Y_AXIS));
info.idealy_f_ += interstaff_f;
projects / lilypond.git / blobdiff