From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 18 Jun 2004 23:20:26 +0000 (+0000)
Subject: (compound_barline): backport ||: fix.
X-Git-Tag: release/2.2.3~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a7f48125c13bfd9a2f155fa78ad27d3ed8aefa5b;p=lilypond.git

(compound_barline): backport ||: fix.
---

diff --git a/ChangeLog b/ChangeLog
index b9e9bdee2b..e6f65b5ce5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-06-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* lily/bar-line.cc (compound_barline): backport ||: fix.
+
+2004-06-12  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* ly/engraver-init.ly (AncientRemoveEmptyStaffContext): remove
+	override for Beam::position-callbacks in grace.  Fixes:
+	weird-stem-size-grace
+
+2004-06-11  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* lily/accidental-engraver.cc (number_accidentals_from_sig):
+	backport additional fixes.
+
 2004-06-07  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
 	* scripts/lilypond-book.py (latex_filter_cmd): Use a temporary
diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 3f01958370..7ee21578db 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -124,7 +124,7 @@ Accidental_engraver::initialize ()
 */
 static int
 number_accidentals_from_sig (bool *different,
-			     SCM sig, Pitch *pitch, SCM scurbarnum, SCM lazyness, 
+			     SCM sig, Pitch *pitch, SCM scurbarnum, SCM laziness, 
 			     bool ignore_octave)
 {
   int curbarnum = gh_scm2int (scurbarnum);
@@ -132,56 +132,45 @@ number_accidentals_from_sig (bool *different,
   int n = pitch->get_notename ();
   int o = pitch->get_octave ();
   int a = pitch->get_alteration ();
-  int accbarnum = -1;
 
-  SCM prevs[3];
-  int bar_nums[3] = {-1,-1,-1};
-  int prev_idx = 0;
-  
+  SCM prev_alt = SCM_BOOL_F;
+
   if (!ignore_octave)
     {
-      prevs[prev_idx] = scm_assoc (scm_cons (scm_int2num (o), scm_int2num (n)), sig);
-
-      if (gh_pair_p (prevs[prev_idx]))
-	prev_idx++;
-    }
-  
-  prevs[prev_idx] = scm_assoc (scm_int2num (n), sig);
-  if (gh_pair_p (prevs[prev_idx]))
-    prev_idx++;
+      SCM prev_local
+	= scm_assoc (scm_cons (scm_int2num (o), scm_int2num (n)), sig);
 
-  for (int i= 0; i < prev_idx; i++)
-    {
-      if (gh_pair_p (prevs[i])
-	  && gh_pair_p (gh_cdr (prevs[i])))
+      if (gh_pair_p (prev_local))
 	{
-	  bar_nums[i]  = gh_scm2int (gh_cddr (prevs[i]));
-	  prevs[i] = scm_cons (gh_car (prevs[i]), gh_cadr (prevs[i]));
-	}
-    }
-  
+	  if (gh_pair_p (ly_cdr (prev_local))
+	      && gh_number_p (laziness)
+	      )
+	    {
+	      int barnum = gh_scm2int (ly_cddr (prev_local));
 
-  SCM prev_acc = scm_int2num (0);
-  for (int i= 0; i < prev_idx; i++)
-    {
-      if (accbarnum < 0
-	  || (gh_number_p (lazyness)
-	      && curbarnum > accbarnum + gh_scm2int (lazyness)))
-	{
-	  prev_acc = gh_cdr (prevs[i]);
-	  break;
+	      prev_local = scm_cons (ly_car (prev_local), ly_cadr (prev_local));
+	      if (curbarnum <= barnum + gh_scm2int (laziness))
+		prev_alt = prev_local;
+	    }
 	}
     }
 
+  if (prev_alt == SCM_BOOL_F)
+    prev_alt = scm_assoc (scm_int2num (n), sig);
+
+
+  prev_alt =  (prev_alt == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev_alt); 
+    
   /*
     UGH. prev_acc can be #t in case of ties. What is this for?
     
    */
-  int p = gh_number_p (prev_acc) ? gh_scm2int (prev_acc) : 0;
+  int p = gh_number_p (prev_alt) ? gh_scm2int (prev_alt) : 0;
+
 
 
   int num;
-  if (a == p && gh_number_p (prev_acc))
+  if (a == p && gh_number_p (prev_alt))
     num = 0;
   else if ( (abs (a)<abs (p) || p*a<0) && a != 0 )
     num = 2;
diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index f7f1d7808c..7767447a5c 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -71,6 +71,9 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
   colon.translate_axis (-dist/2,Y_AXIS);
 
   Stencil m;
+  if (str == "||:")
+    str = "|:";
+  
   
   if (str == "")
     {
diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index d6d6268b30..4c914d4e90 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -106,6 +106,7 @@ get_voice_to_lyrics (Context *lyrics)
 
   return voice;
 }
+
 Grob *
 get_current_note_head (Context * voice)
 {
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 7b0d7b99b0..49245a2fbe 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -553,9 +553,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)
     )