patch::: 1.5.41.jcn3

	(score_forbidden_quants): Second and third beam quant stuff.
---
Generated by janneke@gnu.org,
From = lilypond-1.5.41.jcn2, To = lilypond-1.5.41.jcn3

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.41.jcn3.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/ChangeLog b/ChangeLog
index 6e406bea03fa95a5f22d835566512ee0d2562a8c..d7cbe72887fde9c573edce96acbe7c66b7d5c9d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
---- ../lilypond-1.5.41.jcn1/ChangeLog  Sat Mar 16 16:04:22 2002
+--- ../lilypond-1.5.41.jcn2/ChangeLog  Sun Mar 17 01:40:33 2002
+++ b/ChangeLog Sun Mar 17 16:14:23 2002
+@@ -1,6 +1,7 @@
+ 2002-03-17  Jan Nieuwenhuizen  <janneke@gnu.org>
+ 
+       * lily/beam.cc (score_stem_lengths): new quanting stuff
+       (score_forbidden_quants): Second and third beam quant stuff.
+ 
+ 2002-03-16  Jan Nieuwenhuizen  <janneke@gnu.org>
+ --- ../lilypond-1.5.41.jcn1/ChangeLog Sat Mar 16 16:04:22 2002
 ++ b/ChangeLog Sun Mar 17 01:40:33 2002
 @@ -1,3 +1,7 @@
 2002-03-17  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/VERSION b/VERSION
index dd48c063935ac52df0e433d8448a7acd69c2cc53..af8bc5f65b3fa90173761a5097a3206624bb2123 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=41
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/beam.cc b/lily/beam.cc
index df22bb957a8ccf36c104892b7030b177257a9d1c..246c64d313fda1cc9070be6fb2cc03e18f248caf 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -11,8 +11,6 @@
 /*
   [TODO]
 
-  * different left/right quanting: slope, multiplicity
-  
   * Fix TODO
   
   * Junk stem_info.
@@ -46,8 +44,8 @@
 
 
 
-Real
-shrink_extra_weight(Real x)
+static Real
+shrink_extra_weight (Real x)
 {
   return fabs(x) * ((x < 0) ? 1.5 : 1.0);
 }
@@ -337,18 +335,22 @@ Beam::new_quanting (SCM smob)
   Real yl = gh_scm2double (gh_car(s));
   Real yr = gh_scm2double (gh_cdr(s));
 
-  Real thick = gh_scm2double (me->get_grob_property ("thickness"));
-  //    Staff_symbol_referencer::staff_space (me);
-  Real sthick = me->paper_l()->get_var ("stafflinethickness");
-    //  * Staff_symbol_referencer::staff_space (me);
-
-  Real quants [] = {0.0, thick/2 - sthick / 2, 0.5, 1.0 - thick/2 + sthick/2};
+  Real ss = Staff_symbol_referencer::staff_space (me);
+  Real thickness = gh_scm2double (me->get_grob_property ("thickness")) / ss;
+  Real slt = me->paper_l()->get_var ("stafflinethickness") / ss;
+  
+  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;
   Array<Real> quantsr;
 
   const int REGION_SIZE = 3;
-  
+  // -> result indexes between 70 and 575
   for (int i  = -REGION_SIZE ; i < REGION_SIZE; i++)
     for (int j = 0; j < num_quants; j++)
       {
@@ -376,7 +378,9 @@ Beam::new_quanting (SCM smob)
       SCM f = gh_car (s);
       for (int i = qscores.size(); i--;)
        {
-         if (qscores[i].demerits < 1000)
+         // best scores < 30;
+         // if (qscores[i].demerits < 1000)
+         if (qscores[i].demerits < 100)
            {
              SCM score = gh_call3 (f,
                                    me->self_scm(),
@@ -404,7 +408,9 @@ Beam::new_quanting (SCM smob)
                         gh_cons (gh_double2scm (qscores[best_idx].yl),
                                  gh_double2scm (qscores[best_idx].yr))
                         );
-  me->set_grob_property ("quant-score",gh_double2scm (qscores[best_idx].demerits));
+  me->set_grob_property ("quant-score",
+                        gh_double2scm (qscores[best_idx].demerits));
+  me->set_grob_property ("best-idx", gh_int2scm (best_idx));
 
   return SCM_UNSPECIFIED;
 }
@@ -470,8 +476,9 @@ Beam::score_stem_lengths (SCM smob, SCM syl, SCM syr)
 
   return gh_double2scm (demerit_score);
 }
-Real
-my_modf(Real x)
+
+static Real
+my_modf (Real x)
 {
   return x - floor(x);
 }
@@ -485,11 +492,12 @@ Beam::score_forbidden_quants (SCM smob, SCM syl, SCM syr)
   Grob*me = unsmob_grob(smob);
   Real yl = gh_scm2double (syl);
   Real yr = gh_scm2double (syr);
+  Real dy = yr - yl;
   Real rad = Staff_symbol_referencer::staff_radius (me);
   Real dem = 0.0;
-  if (fabs (yl) <  2*rad && fabs( my_modf(yl) - 0.5) < 1e-3)
+  if (fabs (yl) < rad && fabs( my_modf(yl) - 0.5) < 1e-3)
     dem += 1000;
-  if (fabs (yr) <  2*rad && fabs( my_modf(yr) - 0.5) < 1e-3)
+  if (fabs (yr) < rad && fabs( my_modf(yr) - 0.5) < 1e-3)
     dem += 1000;
 
 
@@ -499,7 +507,8 @@ Beam::score_forbidden_quants (SCM smob, SCM syl, SCM syr)
     {
       Real slt = me->paper_l()->get_var("stafflinethickness");
       Real ss = Staff_symbol_referencer::staff_space(me);
-      Real thickness = gh_scm2double (me->get_grob_property ("thickness")) * ss;
+      Real thickness = gh_scm2double (me->get_grob_property ("thickness"))
+       * ss;
 
       Real beam_space= (2*ss + slt  - 3 *thickness) / 2.0;
       if (multiplicity >= 4)
@@ -507,13 +516,66 @@ Beam::score_forbidden_quants (SCM smob, SCM syl, SCM syr)
          beam_space = (3*ss + slt - 4 * thickness) /3.0;
        }
 
-      Direction d = Directional_element_interface::get (me);
-      yl += d * (beam_space + thickness);
-      yr += d * (beam_space + thickness);
-      if (fabs (yl) <  rad && fabs( my_modf(yl) - 0.5) < 0.1)
+      Real straddle = 0.0;
+      Real sit = (thickness - slt) / 2;
+      Real inter = 0.5;
+      Real hang = 1.0 - (thickness - slt) / 2;
+      
+      Direction dir = Directional_element_interface::get (me);
+      if (fabs (yl - dir * (beam_space + thickness)) < rad
+         && fabs (my_modf (yl) - inter) < 1e-3)
        dem += 15;
-      if (fabs (yr) <  rad && fabs( my_modf(yr) - 0.5) < 0.1)
+      if (fabs (yr - dir * (beam_space + thickness)) < rad
+         && fabs (my_modf (yr) - inter) < 1e-3)
        dem += 15;
+
+      // hmm, without Interval/Drul_array, you get ~ 4x same code...
+      if (fabs (yl - dir * (beam_space + thickness)) < rad + inter)
+       {
+         if (dir == UP && dy <= 1e-3
+             && fabs (my_modf (yl) - sit) < 1e-3)
+           dem += 15;
+         
+         if (dir == DOWN && dy >= 1e-3
+             && fabs (my_modf (yl) - hang) < 1e-3)
+           dem += 15;
+       }
+
+      if (fabs (yr - dir * (beam_space + thickness)) < rad + inter)
+       {
+         if (dir == UP && dy >= 1e-3
+             && fabs (my_modf (yr) - sit) < 1e-3)
+           dem += 15;
+         
+         if (dir == DOWN && dy <= 1e-3
+             && fabs (my_modf (yr) - hang) < 1e-3)
+           dem += 15;
+       }
+
+      if (multiplicity >= 3)
+       {
+         if (fabs (yl - 2 * dir * (beam_space + thickness)) < rad + inter)
+           {
+             if (dir == UP && dy <= 1e-3
+                 && fabs (my_modf (yl) - straddle) < 1e-3)
+               dem += 15;
+             
+             if (dir == DOWN && dy >= 1e-3
+                 && fabs (my_modf (yl) - straddle) < 1e-3)
+               dem += 15;
+       }
+         
+         if (fabs (yr - 2 * dir * (beam_space + thickness)) < rad + inter)
+           {
+             if (dir == UP && dy >= 1e-3
+                 && fabs (my_modf (yr) - straddle) < 1e-3)
+               dem += 15;
+             
+             if (dir == DOWN && dy <= 1e-3
+                 && fabs (my_modf (yr) - straddle) < 1e-3)
+               dem += 15;
+           }
+       }
     }
   
   return gh_double2scm ( dem);
@@ -1241,9 +1303,14 @@ Beam::brew_molecule (SCM smob)
        should be switchable for those who want to twiddle with the
        parameters.
       */
-      SCM dem = me->get_grob_property ("quant-score");
-      Real s = gh_scm2double (dem);
-      String str = to_str (s);
+      String str;
+      if (1)
+       {
+         str += to_str (gh_scm2int  (me->get_grob_property ("best-idx")));
+         str += ":";
+       }
+      str += to_str (gh_scm2double (me->get_grob_property ("quant-score")),
+                    "%.2f");
 
       SCM properties = Font_interface::font_alist_chain (me);