X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbeam-quanting.cc;h=c73f91fbc828580c3276c69a61fc1da487ec7e9f;hb=e2fd43a13df7e8ce16e7528c8d5b6cc69aba78b8;hp=ac845103ea8f56c75d608da171224756b557314e;hpb=233fb6a8b3b6e31de1841641dbbd4c4f43423151;p=lilypond.git

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index ac845103ea..c73f91fbc8 100644
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -352,7 +352,7 @@ void Beam_scoring_problem::init_instance_variables (Grob *me, Drul_array<Real> y
           for (LEFT_and_RIGHT (d))
             add_collision (b[X_AXIS][d], b[Y_AXIS], width_factor);
 
-          Grob *stem = unsmob_grob (collisions[j]->get_object ("stem"));
+          Grob *stem = Grob::unsmob (collisions[j]->get_object ("stem"));
           if (stem && Stem::has_interface (stem) && Stem::is_normal_stem (stem))
             {
               colliding_stems.insert (stem);
@@ -371,7 +371,7 @@ void Beam_scoring_problem::init_instance_variables (Grob *me, Drul_array<Real> y
                          - my_y;
 
           Real factor = parameters_.STEM_COLLISION_FACTOR;
-          if (!unsmob_grob (s->get_object ("beam")))
+          if (!Grob::unsmob (s->get_object ("beam")))
             factor = 1.0;
           add_collision (x, y, factor);
         }
@@ -651,7 +651,7 @@ Beam_scoring_problem::calc_concaveness ()
   if (scm_is_number (conc))
     return scm_to_double (conc);
 
-  if (is_knee_)
+  if (is_knee_ || is_xstaff_)
     return 0.0;
 
   Direction beam_dir = CENTER;