(accidental): NL

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index def3e6a66ba9d895ec1f72496fee4b22296e4690..7e3a898dd34f89ccbcaef675a50d7dbd67f7ce6d 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -118,7 +118,7 @@ Beam_engraver::set_melisma (bool ml)
 {
   SCM b = get_property ("autoBeaming");
   if (!to_boolean (b))
-    context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+    context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F);
 }
 
 void
@@ -149,7 +149,6 @@ Beam_engraver::process_music ()
 
       /* urg, must copy to Auto_beam_engraver too */
     }
-
 }
 
 void
@@ -246,7 +245,7 @@ Beam_engraver::acknowledge_grob (Grob_info info)
            }
 
          last_stem_added_at_ = now;
-         int durlog = unsmob_duration (m->get_property ("duration"))-> duration_log ();
+         int durlog = unsmob_duration (m->get_property ("duration"))->duration_log ();
          if (durlog <= 2)
            {
              m->origin ()->warning (_ ("stem doesn't fit in beam"));
@@ -262,13 +261,12 @@ Beam_engraver::acknowledge_grob (Grob_info info)
                              scm_int2num (durlog));
          Moment stem_location = now - beam_start_mom_ + beam_start_location_;
          beam_info_->add_stem (stem_location,
-                               (durlog- 2) >? 0);
+                               max (durlog- 2, 0));
          Beam::add_stem (beam_, stem);
        }
     }
 }
 
-
 ADD_TRANSLATOR (Beam_engraver,
                /* descr */ "Handles Beam events by engraving Beams.    If omitted, then notes will be "
                "printed with flags instead of beams.",