Fix 1477: Add (ly:expect-warning msg args) to suppress expected warnings

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index 8a755afaa5aec63946003a19017be335f0c39b80..f6bedcfd95461992e1e2498b34b055c8e1c0a0fb 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,11 @@ Stem::offset_callback (SCM smob)
       Real r = real_attach;
 
       /* If not centered: correct for stem thickness.  */
-      if (attach)
+      extract_grob_set (me, "note-heads", heads);
+      SCM style = heads[0]->get_property ("style");
+      if (attach && !scm_is_eq (style, ly_symbol2scm ("mensural"))
+                 && !scm_is_eq (style, ly_symbol2scm ("neomensural"))
+                 && !scm_is_eq (style, ly_symbol2scm ("petrucci")))
         {
           Real rule_thick = thickness (me);
           r += -d * rule_thick * 0.5;
@@ -985,7 +988,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