Prevent accidentals and articulations from moving over leftmost NonMusicalPaperColumns.

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index 8a755afaa5aec63946003a19017be335f0c39b80..7ef1b938426113110d16ce92fa07c94de5a4a1dd 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -160,7 +160,6 @@ Stem::set_stem_positions (Grob *me, Real se)
 
   me->set_property ("stem-begin-position", scm_from_double (height[-d] * 2 / staff_space));
   me->set_property ("length", scm_from_double (height.length () * 2 / staff_space));
-  (void) me->extent (me, Y_AXIS);
 }
 
 /* Note head that determines hshift for upstems
@@ -850,7 +849,10 @@ Stem::offset_callback (SCM smob)
       Real r = real_attach;
 
       /* If not centered: correct for stem thickness.  */
-      if (attach)
+      string style = robust_symbol2string (f->get_property ("style"), "default");
+      if (attach && style != "mensural"
+                 && style != "neomensural"
+                 && style != "petrucci")
         {
           Real rule_thick = thickness (me);
           r += -d * rule_thick * 0.5;
@@ -985,7 +987,7 @@ Stem::calc_stem_info (SCM smob)
 
   Also, not for knees.  Seems to be a good thing. */
   bool no_extend = to_boolean (me->get_property ("no-stem-extend"));
-  bool is_knee = to_boolean (beam->get_property ("knee"));
+  bool is_knee = Beam::is_knee (beam);
   if (!no_extend && !is_knee)
     {
       /* Highest beam of (UP) beam must never be lower than middle
@@ -1093,6 +1095,7 @@ ADD_INTERFACE (Stem,
                "length "
                "length-fraction "
                "max-beam-connect "
+               "melody-spanner "
                "neutral-direction "
                "no-stem-extend "
                "note-heads "