From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 6 Jun 2004 21:24:28 +0000 (+0000)
Subject: * ly/engraver-init.ly (AncientRemoveEmptyStaffContext): remove
X-Git-Tag: release/2.3.4~31
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=885f77cb89cf1cf8a26f0bb71ce1e14b15ae154b;p=lilypond.git

* 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 4c12f7c9f9..53ff4ebc79 100644
--- 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 175e7e21d3..2503e2338d 100644
--- 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 77a781b010..0b2a447902 100644
--- 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)
     )