* VERSION: 1.5.72 released

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index 2ed0f4fb784e996f51cdd523ea4612880fac5407..b17f0a383afaec3ec435f8ef552fdcec6193c774 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -491,7 +491,7 @@ Stem::before_line_breaking (SCM smob)
     }
   else
     {
-      me->remove_grob_property ("molecule-callback");
+      me->set_grob_property ("molecule-callback", SCM_EOL);
     }
   
   return SCM_UNSPECIFIED;
@@ -815,11 +815,11 @@ Stem::calc_stem_info (Grob*me)
   SCM grace_prop = me->get_grob_property ("grace");
   
   bool grace_b = to_boolean (grace_prop);
-  SCM bml = robust_list_ref ( beam_count ,
+  SCM bml = robust_list_ref ( beam_count - 1,
                              me->get_grob_property ("beamed-minimum-lengths"));
 
   Real minimum_length = gh_scm2double(bml)*staff_space;
-  SCM bl =  robust_list_ref ( beam_count ,
+  SCM bl =  robust_list_ref ( beam_count - 1,
                              me->get_grob_property ("beamed-lengths"));
   Real stem_length =  gh_scm2double(bl) * staff_space;
 
@@ -828,7 +828,7 @@ Stem::calc_stem_info (Grob*me)
     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;
+    + 0.5 * thick;
 
   Real shortest_y = note_start + minimum_length + beam_lengthen;
   Real ideal_y = stem_length + note_start + beam_lengthen;
@@ -896,6 +896,6 @@ Stem::beam_multiplicity (Grob *stem)
 
 ADD_INTERFACE (Stem,"stem-interface",
   "A stem",
-  "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");
+  "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");