* mf/GNUmakefile: always trace pfa fonts.

[lilypond.git] / lily / beam.cc

diff --git a/lily/beam.cc b/lily/beam.cc
index 8d5f1bb2246a5ceb937a0023220772f3c35eccf9..27e604856a219f3a69d808d595f2ab964fa3380e 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -317,7 +317,7 @@ Beam::brew_molecule (SCM grob)
 
   SCM posns = me->get_grob_property ("positions");
   Interval pos;
-  if (!ly_number_pair_p (posns))
+  if (!is_number_pair (posns))
     {
       programming_error ("No beam posns");
       pos = Interval (0,0);
@@ -326,7 +326,7 @@ Beam::brew_molecule (SCM grob)
     pos= ly_scm2interval (posns);
 
   Real dy = pos.delta ();
-  Real dydx = dy && dx ? dy/dx : 0;
+  Real dydx = (dy && dx) ? dy/dx : 0;
   
   Real thick = get_thickness (me);
   Real bdy = get_beam_translation (me);
@@ -335,7 +335,6 @@ Beam::brew_molecule (SCM grob)
   Real last_xposn = -1;
   Real last_width = -1 ;
 
-
   Real gap_length =0.0;
   SCM scm_gap = me->get_grob_property ("gap");
   if (gh_number_p (scm_gap))