* ly/engraver-init.ly (AncientRemoveEmptyStaffContext): remove

override of Beam::position-callbacks. Why would grace beams not be
quantized? Fixes: weird-stem-size-grace. Backportme.

* lily/accidental-engraver.cc (number_accidentals_from_sig):
bugfix, 2nd try. Backportme.

diff --git a/ChangeLog b/ChangeLog
index 4c12f7c9f9f68602b694a448044950820be46993..53ff4ebc7909ae60fcea35eb58e7dfd6dca83fcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
 2004-06-06  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * ly/engraver-init.ly (AncientRemoveEmptyStaffContext): remove
+       override of Beam::position-callbacks. Why would grace beams not be
+       quantized? Fixes: weird-stem-size-grace. Backportme.
+
        * lily/new-lyric-combine-music-iterator.cc (find_voice): issue
-       warning only once.
+       warning only once. Backportme.
 
        * lily/accidental-engraver.cc (number_accidentals_from_sig):
-       bugfix, 2nd try.
+       bugfix, 2nd try. Backportme.
 
        * ly/vlaams.ly: new file. (Thanks Hendrik Maryns)
 

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 175e7e21d3cbb895219b417169da8f9cd99f3397..2503e2338de126675b5be1a70889b0279fd753ef 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -141,7 +141,7 @@ Accidental_engraver::initialize ()
 */
 static int
 number_accidentals_from_sig (bool *different,
-                            SCM sig, Pitch *pitch, int curbarnum, SCM lazyness, 
+                            SCM sig, Pitch *pitch, int curbarnum, SCM laziness, 
                             bool ignore_octave)
 {
   int n = pitch->get_notename ();
@@ -158,13 +158,13 @@ number_accidentals_from_sig (bool *different,
       if (ly_c_pair_p (prev_local))
        {
          if (ly_c_pair_p (ly_cdr (prev_local))
-             && ly_c_number_p (lazyness)
+             && ly_c_number_p (laziness)
              )
            {
              int barnum = ly_scm2int (ly_cddr (prev_local));
 
              prev_local = scm_cons (ly_car (prev_local), ly_cadr (prev_local));
-             if (curbarnum <= barnum + ly_scm2int (lazyness))
+             if (curbarnum <= barnum + ly_scm2int (laziness))
                prev_alt = prev_local;
            }
        }
@@ -213,7 +213,7 @@ number_accidentals (bool *different,
       if (ly_c_pair_p (rule))
        {
          SCM type = ly_car (rule);
-         SCM lazyness = ly_cdr (rule);
+         SCM laziness = ly_cdr (rule);
          SCM localsig = origin->get_property ("localKeySignature");
          
          bool same_octave_b = 
@@ -225,7 +225,7 @@ number_accidentals (bool *different,
            {
              bool d = false;
              int n = number_accidentals_from_sig
-               (&d, localsig, pitch, curbarnum, lazyness, any_octave_b);
+               (&d, localsig, pitch, curbarnum, laziness, any_octave_b);
              *different = *different || d;
              number = max (number, n);     
            }

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 77a781b010b4fc9b302857b47624b8512b6938a0..0b2a4479028ada041961dd98beaac68d79413eed 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -547,9 +547,6 @@ AncientRemoveEmptyStaffContext = \context {
        (Voice Beam space-function ,(lambda (beam mult)
                                     (* 0.8 (Beam::space_function
                                             beam mult))))
-       (Voice Beam position-callbacks (,Beam::least_squares
-                                       ,Beam::check_concave
-                                       ,Beam::slope_damping))
        (Voice Accidental font-size -4)
        (Voice Slur direction -1)
     )