lilypond-book: Textwidth detection with included file (issue 3136).

[lilypond.git] / lily / beam-engraver.cc

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 455239d5ed247b587fd9fe46e467fa60f8604a32..00b9081b3e34889ed1d6cf26323b7d6efe3e3e2a 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -30,6 +30,7 @@
 #include "spanner.hh"
 #include "stream-event.hh"
 #include "stem.hh"
+#include "unpure-pure-container.hh"
 #include "warn.hh"
 
 #include "translator.icc"
@@ -243,7 +244,10 @@ Beam_engraver::acknowledge_rest (Grob_info info)
   if (beam_
       && !scm_is_number (info.grob ()->get_property_data ("staff-position")))
     chain_offset_callback (info.grob (),
-                           Beam::rest_collision_callback_proc, Y_AXIS);
+                           ly_make_unpure_pure_container
+                             (Beam::rest_collision_callback_proc,
+                              Beam::pure_rest_collision_callback_proc),
+                           Y_AXIS);
 }
 
 void
@@ -291,7 +295,8 @@ Beam_engraver::acknowledge_stem (Grob_info info)
   beam_info_->add_stem (stem_location,
                         max (durlog - 2, 0),
                         Stem::is_invisible (stem),
-                        stem_duration->factor ());
+                        stem_duration->factor (),
+                        (stem->get_property ("tuplet-start") == SCM_BOOL_T));
   Beam::add_stem (beam_, stem);
 }