* Documentation/topdocs/{AUTHORS.texi,INSTALL.texi,README.texi}:

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

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 22931c8ecf4d40fd31b487cd858afc1ed297b145..4aeebc586a74437cb19134e810808aaa32b542f7 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -96,13 +96,13 @@ Spacing_engraver::finalize ()
 void
 Spacing_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_spacing::has_interface (i.grob_) || Staff_spacing::has_interface (i.grob_))
+  if (Note_spacing::has_interface (i.grob ()) || Staff_spacing::has_interface (i.grob ()))
     {
-      Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob_);
+      Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ());
     }
 
-  if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))
-      || i.grob_->internal_has_interface (ly_symbol2scm ("multi-measure-event")))
+  if (i.grob ()->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))
+      || i.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-event")))
     return;
 
   /*
@@ -131,7 +131,7 @@ Spacing_engraver::stop_translation_timestep ()
       if (mus)
        {
          Moment m = mus->get_length ();
-         shortest_playing = shortest_playing <? m;
+         shortest_playing = min (shortest_playing, m);
        }
     }
   Moment starter;
@@ -142,13 +142,13 @@ Spacing_engraver::stop_translation_timestep ()
       Moment m = now_durations_[i].info_.music_cause ()->get_length ();
       if (m.to_bool ())
        {
-         starter = starter <? m;
+         starter = min (starter, m);
          playing_durations_.insert (now_durations_[i]);
        }
     }
   now_durations_.clear ();
 
-  shortest_playing = shortest_playing <? starter;
+  shortest_playing = min (shortest_playing, starter);
 
   Paper_column *sc
     = dynamic_cast<Paper_column *> (unsmob_grob (get_property ("currentMusicalColumn")));