From f0ab236a48c3619c99680da82f3aa8c0a20aa11c Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 22:14:58 +0000
Subject: [PATCH] lilypond-1.1.57

---
 input/test/volta.fly                 |  2 +-
 lily/break-align-item.cc             |  8 +++++---
 lily/repeat-engraver.cc              | 10 +++++++---
 lily/spacing-spanner.cc              | 13 +++++++++++--
 lily/spring-spacer.cc                |  3 +--
 midi2ly/include/midi-score-parser.hh |  2 --
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/input/test/volta.fly b/input/test/volta.fly
index 17b42bd28f..9386a43669 100644
--- a/input/test/volta.fly
+++ b/input/test/volta.fly
@@ -4,7 +4,7 @@
 c' d e f |
 \repeat semi 2 { g a b c }
 \alternative { { c b a g a g a g} { f e d c } } \break
-c, d e f |  % Assertion failure if this line is removed!!
+%c, d e f |  % Assertion failure if this line is removed!!
 \repeat semi 2 { g a b c }
 \alternative { { c b a g \break a g a g} { f e d c } } \break
 c, d e f |
diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc
index bd8e723ea3..d8e284a388 100644
--- a/lily/break-align-item.cc
+++ b/lily/break-align-item.cc
@@ -25,7 +25,11 @@
 void
 Break_align_item::do_pre_processing()
 {
-  align_dir_ = break_status_dir();
+  if (break_status_dir() == LEFT)
+    align_dir_ = LEFT;
+  else
+    align_dir_ = RIGHT;
+  
   flip (&align_dir_);
   sort_elements ();
   Real interline= paper_l ()->get_realvar (interline_scm_sym);	
@@ -38,8 +42,6 @@ Break_align_item::do_pre_processing()
 	elems.push (dynamic_cast<Score_element*> (elem_l_arr_[i]));
     }
   
-
-  
   if (!elems.size ())
     return;
 
diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc
index 9ca3649fe3..5dd89eb2f5 100644
--- a/lily/repeat-engraver.cc
+++ b/lily/repeat-engraver.cc
@@ -104,8 +104,13 @@ Repeat_engraver::queue_events ()
 	  else
 	    becel.append (new Bar_create_event (walk_mom, "stop"));
 	}
-    } 
-  create_barmoments_queue_ = becel.head_ ;
+    }
+
+  Cons<Bar_create_event> *&tail = create_barmoments_queue_
+    ? last_cons (create_barmoments_queue_)->next_
+    : create_barmoments_queue_;
+
+  tail = becel.head_ ;
   becel.head_ = 0;
 }
 
@@ -129,7 +134,6 @@ Repeat_engraver::do_process_requests ()
   /*
     Do all the events that need to be done now.
   */
-  bool stop = false;
   while (head && now_mom () == head->car_->when_)
     {
       create_barmoments_queue_ = create_barmoments_queue_->next_;
diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index fad2d6903a..646d37cd97 100644
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -67,6 +67,7 @@ Spacing_spanner::do_measure (int col1, int col2) const
 
   Array<Spring> meas_springs;
 
+  Real non_musical_space_strength = paper_l ()->get_var ("non_musical_space_strength");
   for (int i= col1; i < col2; i++)
     {
       Item * l = scol(i);
@@ -101,7 +102,7 @@ Spacing_spanner::do_measure (int col1, int col2) const
 	  else if (!lc->musical_b() && i+1 < col_count())
 	    {
 	      s.distance_f_ = default_bar_spacing (lc,rc,shortest);
-	      s.strength_f_ = 2.0;
+	      s.strength_f_ = non_musical_space_strength; // fixed after complaints by michael krause
 	    }
 	  else if (lc->musical_b())
 	    {
@@ -127,7 +128,15 @@ Spacing_spanner::do_measure (int col1, int col2) const
 
 	      s.distance_f_ += correction;
 	    }
-	  
+
+	  if (s.distance_f_ <=0)
+	    {
+	      /*
+		\bar "".  We give it 0 space, with high strength. 
+	       */
+	      s.distance_f_ = 0.0 PT;
+	      s.strength_f_ = 20.0; 
+	    }
 	  meas_springs.push (s);	
 	}
     }
diff --git a/lily/spring-spacer.cc b/lily/spring-spacer.cc
index e890602869..aee2bba8bc 100644
--- a/lily/spring-spacer.cc
+++ b/lily/spring-spacer.cc
@@ -407,8 +407,7 @@ Spring_spacer::add_column (Paper_column  *col, bool fixed, Real fixpos)
       Real d  = cr.distance_f_;
       if (fabs (d) < EPS)
 	{
-	  connect (idx, this_rank, 0.0, 10); // large strength. 
-	  programming_error ("requesting zero distance.");
+	  connect (idx, this_rank, cr.distance_f_, cr.strength_f_); // large strength. 
 	}
       else
 	connect (idx, this_rank, cr.distance_f_,
diff --git a/midi2ly/include/midi-score-parser.hh b/midi2ly/include/midi-score-parser.hh
index 02d6f18aeb..fca4fdf006 100644
--- a/midi2ly/include/midi-score-parser.hh
+++ b/midi2ly/include/midi-score-parser.hh
@@ -24,8 +24,6 @@ private:
   void open (String filename_str, Sources*);
 
   void parse_header ();
-  // why the #*&$#{%) has Link_array another behaviour than Link_list??
-  //  int find_earliest_i (Link_array<Midi_track_parser*>& tracks);
   int find_earliest_i (Link_array<Midi_track_parser>& tracks);
   Mudela_score* parse_score ();
 };	    
-- 
2.39.5