X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcompletion-note-heads-engraver.cc;h=8a9ac0fbef04082cbdc63de762f0ef902e391fb4;hb=30a7c603fa9977c1a4a68868475d465e8f7132ca;hp=11b0e185fefe02c51c3ae518e5f29d70c4f476c4;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index 11b0e185fe..8a9ac0fbef 100644
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -89,7 +89,7 @@ Completion_heads_engraver::try_music (Music *m)
 	  musiclen.grace_part_ = musiclen.main_part_;
 	  musiclen.main_part_ = Rational (0, 1);
 	}
-      note_end_mom_ = note_end_mom_ >? (now + musiclen);
+      note_end_mom_ = max (note_end_mom_, (now + musiclen));
       do_nothing_until_ = Rational (0, 0);
 
       return true;
@@ -112,7 +112,7 @@ Completion_heads_engraver::next_barline_moment ()
   Moment *l = unsmob_moment (get_property ("measureLength"));
   if (!e || !l)
     {
-      programming_error ("No timing props set?");
+      programming_error ("no timing props set?");
       return Moment (1, 1);
     }