* configure.in: Test for and accept lmodern if EC fonts not found.

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

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index 0cdba71128ae172d091809500d56e5e6f47cbfdf..2075eb76d31ecd5ac4c21e9cf2ddfe971fa7d9e7 100644 (file)
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -12,10 +12,9 @@
 
 
 
-#include <math.h>
+#include <cmath>
 
 #include "warn.hh"
-#include "grob.hh"
 #include "staff-symbol-referencer.hh"
 #include "beam.hh"
 #include "stem.hh"
@@ -38,7 +37,6 @@ const int DAMPING_DIRECTION_PENALTY = 800;
 const int MUSICAL_DIRECTION_FACTOR = 400;
 const int IDEAL_SLOPE_FACTOR = 10;
 const Real ROUND_TO_ZERO_SLOPE = 0.02;
-const int ROUND_TO_ZERO_POINTS = 4;
 
 static Real
 shrink_extra_weight (Real x, Real fac)
@@ -71,7 +69,8 @@ struct Quant_score
 
 */
 
-int best_quant_score_idx (Array<Quant_score>  const & qscores)
+int
+best_quant_score_idx (Array<Quant_score>  const & qscores)
 {
   Real best = 1e6;
   int best_idx = -1;
@@ -84,6 +83,13 @@ int best_quant_score_idx (Array<Quant_score>  const & qscores)
        }
     }
 
+  if (best_idx < 0)
+    {
+      programming_error ("Huh? No best beam quant score?");
+      best_idx = 0;
+    }
+  
+    
   return best_idx;
 }
   
@@ -94,8 +100,8 @@ Beam::quanting (SCM smob)
   Grob *me = unsmob_grob (smob);
 
   SCM s = me->get_property ("positions");
-  Real yl = ly_scm2double (ly_car (s));
-  Real yr = ly_scm2double (ly_cdr (s));
+  Real yl = scm_to_double (scm_car (s));
+  Real yr = scm_to_double (scm_cdr (s));
 
 
   /*
@@ -107,14 +113,14 @@ Beam::quanting (SCM smob)
   Real thickness = Beam::get_thickness (me) / ss ;
   Real slt = Staff_symbol_referencer::line_thickness (me) / ss;
 
-  SCM sdy = me->get_property ("least-squares-dy");
-  Real dy_mus = ly_c_number_p (sdy) ? ly_scm2double (sdy) : 0.0;
-  
+  Real dy_mus = robust_scm2double (me->get_property ("least-squares-dy"), 0);
   Real straddle = 0.0;
   Real sit = (thickness - slt) / 2;
   Real inter = 0.5;
   Real hang = 1.0 - (thickness - slt) / 2;
   Real quants [] = {straddle, sit, inter, hang };
+
+
   
   int num_quants = int (sizeof (quants)/sizeof (Real));
   Array<Real> quantsl;
@@ -276,11 +282,10 @@ Beam::quanting (SCM smob)
 
   int best_idx = best_quant_score_idx (qscores);
 
-
 #if DEBUG_QUANTING
   SCM inspect_quants = me->get_property ("inspect-quants");
-  if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))
-      && ly_c_pair_p (inspect_quants))
+  if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))
+      && scm_is_pair (inspect_quants))
     {
       Drul_array<Real> ins = ly_scm2interval (inspect_quants);
 
@@ -305,7 +310,7 @@ Beam::quanting (SCM smob)
                    ly_interval2scm (Drul_array<Real> (qscores[best_idx].yl,
                                                       qscores[best_idx].yr)));
 #if DEBUG_QUANTING
-  if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))))
+  if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))))
     {
       qscores[best_idx].score_card_ += to_string ("i%d", best_idx);
       
@@ -408,23 +413,10 @@ Beam::score_slopes_dy (Real yl, Real yr,
    dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy), 1.5)
      * slope_penalty;
 
-#if 0
-   /*
-     almost zero slopes look like errors in horizontal beams. 
-    */
-   /*
-     This causes too much problems, because horizontal depends on
-     horizontal spacing details.  These errors should be dealt with
-     through concaveness. --hwn.
-    */
-   if (fabs (dy) > 1e-3
-       && fabs (dy / dx) < ROUND_TO_ZERO_SLOPE)
-     dem += ROUND_TO_ZERO_POINTS;
-#endif
-   
    return dem;
 }
 
+
 static Real
 my_modf (Real x)
 {
@@ -454,6 +446,7 @@ Beam::score_forbidden_quants (Real yl, Real yr,
   Direction d = LEFT;
   Real dem = 0.0;
   
+
   do
     {
       for (int j = 1; j <= beam_counts[d]; j++)
@@ -465,8 +458,8 @@ Beam::score_forbidden_quants (Real yl, Real yr,
            borderline cases. If we do 2.0, then the upper outer line
            will be in the gap of the (2,sit) quant, leading to a
            false demerit.
-          */
-         Real gap1 =  y[d] - stem_dir * ((j-1) * beam_translation + thickness / 2 - slt/2.2 );
+         */
+         Real gap1 = y[d] - stem_dir * ((j-1) * beam_translation + thickness / 2 - slt/2.2 );
          Real gap2 = y[d] - stem_dir * (j * beam_translation - thickness / 2 + slt/2.2);
 
          Interval gap;
@@ -476,7 +469,18 @@ Beam::score_forbidden_quants (Real yl, Real yr,
          for (Real k = - radius ;
               k <= radius + BEAM_EPS; k += 1.0) 
            if (gap.contains (k))
-             dem += extra_demerit;
+             {
+               Real dist = fabs (gap[UP]-k) <? fabs (gap[DOWN] - k);
+
+               /*
+                 this parameter is tuned to grace-stem-length.ly
+               */
+               Real fixed_demerit = 0.4;
+               
+               dem += extra_demerit
+                 * (fixed_demerit +
+                    (1-fixed_demerit) * (dist / gap.length())* 2);
+             }
        }
     }
   while ((flip (&d))!= LEFT);