Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / beam.cc

diff --git a/lily/beam.cc b/lily/beam.cc
index d114c69fc363f2caa5f73a5d16c1ef72988b536f..d0204833527507b2e40b0e0f0a2bf4e558b8c9ad 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -296,6 +296,10 @@ typedef map<int, vector<Beam_stem_segment> >  Position_stem_segments_map;
 vector<Beam_segment>
 Beam::get_beam_segments (Grob *me_grob, Grob **common)
 {
+  /* ugh, this has a side-effect that we need to ensure that
+     Stem #'beaming is correct */
+  (void) me_grob->get_property ("quantized-positions");
+
   Spanner *me = dynamic_cast<Spanner*> (me_grob);
 
   extract_grob_set (me, "stems", stems);
@@ -557,7 +561,7 @@ Beam::get_default_dir (Grob *me)
     {
       Grob *s = stems[i];
       Direction stem_dir = CENTER;
-      SCM stem_dir_scm = s->get_property_data (ly_symbol2scm ("direction"));
+      SCM stem_dir_scm = s->get_property_data ("direction");
       if (is_direction (stem_dir_scm))
        {
          stem_dir = to_dir (stem_dir_scm);
@@ -613,7 +617,7 @@ Beam::set_stem_directions (Grob *me, Direction d)
     {
       Grob *s = stems[i];
 
-      SCM forcedir = s->get_property_data (ly_symbol2scm ("direction"));
+      SCM forcedir = s->get_property_data ("direction");
       if (!to_dir (forcedir))
        set_grob_direction (s, d);
     }
@@ -668,7 +672,7 @@ Beam::consider_auto_knees (Grob *me)
          */
          head_extents += stem->relative_coordinate (common, Y_AXIS);
 
-         if (to_dir (stem->get_property_data (ly_symbol2scm ("direction"))))
+         if (to_dir (stem->get_property_data ("direction")))
            {
              Direction stemdir = to_dir (stem->get_property ("direction"));
              head_extents[-stemdir] = -stemdir * infinity_f;
@@ -1436,7 +1440,6 @@ Beam::get_direction_beam_count (Grob *me, Direction d)
 }
 
 ADD_INTERFACE (Beam,
-              "beam-interface",
 
               "A beam. \n\n"
               "The @code{thickness} property is the weight of beams, "