add \defaultchild to InnerStaffGroup.

[lilypond.git] / lily / chord-tremolo-engraver.cc

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 5e983fdc9413cb97f562a47933044622afc329b5..363d756537a5231d496ede5b392d6d4a82b0abc6 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -100,7 +100,7 @@ Chord_tremolo_engraver::try_music (Music *m)
       Rational total_dur = l.main_part_;
       Rational note_dur = total_dur / Rational (elt_count * Repeated_music::repeat_count (repeat_));
 
-      total_duration_flags_ = 0 >? (intlog2 (total_dur.den ()) - 2);
+      total_duration_flags_ = max (0, (intlog2 (total_dur.den ()) - 2));
 
       flags_ = intlog2 (note_dur.den ()) -2;
 
@@ -142,9 +142,9 @@ Chord_tremolo_engraver::typeset_beam ()
 void
 Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
 {
-  if (beam_ && Stem::has_interface (info.grob_))
+  if (beam_ && Stem::has_interface (info.grob ()))
     {
-      Grob *s = info.grob_;
+      Grob *s = info.grob ();
 
       if (start_mom_ == now_mom ())
        Stem::set_beaming (s, flags_, RIGHT);
@@ -170,14 +170,14 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
        }
     }
   else if (repeat_
-          && flags_ && !body_is_sequential_ && Stem::has_interface (info.grob_))
+          && flags_ && !body_is_sequential_ && Stem::has_interface (info.grob ()))
     {
       stem_tremolo_ = make_item ("StemTremolo", repeat_->self_scm ());
       stem_tremolo_->set_property ("flag-count",
                                   scm_int2num (flags_));
       stem_tremolo_->set_property ("stem",
-                                  info.grob_->self_scm ());
-      stem_tremolo_->set_parent (info.grob_, X_AXIS);
+                                  info.grob ()->self_scm ());
+      stem_tremolo_->set_parent (info.grob (), X_AXIS);
     }
 }