From 9050321154ce6b0d95bd86a022b78c9c1cb34026 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:09:22 +0000
Subject: [PATCH] lilypond-0.1.54

---
 NEWS                | 21 ++++++++++++++++
 bin/make-website.in |  8 ++++---
 lily/key-grav.cc    | 58 +++++++++++++++++++++++----------------------
 3 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/NEWS b/NEWS
index 7e4397d9ce..59f27acf2d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+pl 54
+	- bf dynamic_grav
+	- bf accidentals with key change
+	- bfs with command-items in non-breakable columns.
+	- typos (thanks LM)
+
+pl 53.jcn1
+	- two new BUGs
+	- preludes-* with trills
+	- nicer trills
+	- fixed ugly slur extend bug
+	- first try at symphonic work: (start of) Coriolan
+	- fixes: los-toros
+	- test/ with some stupid tests
+	- bf, again midi-output
+	- --no-timestamps options for lily/mi2mu (to enable make check targets)
+	- removed doubles in lilypython
+	- smarter prev_version for make-patch
+
+***********
+
 pl 53
 	- bf: c4 \< c4 \< 
 	- bfs of spacing stuff
diff --git a/bin/make-website.in b/bin/make-website.in
index 7820d45ff8..e574780344 100644
--- a/bin/make-website.in
+++ b/bin/make-website.in
@@ -49,7 +49,7 @@ fullname = "unknown"
 footstr = ""
 lilyversion= ''
 
-include_path=[ 'input', 'mutopia' , 'mutopia/J.S.Bach', 
+include_path=[ 'input', 'mutopia' , 'mutopia/J.S.Bach', 'mutopia/Coriolan',
 	       'mutopia/J.S.Bach/out' ]
 
 def set_vars():
@@ -102,13 +102,15 @@ examples=["twinkle-pop",
 	  "font16",
 	  "font20",
 	  #"scales", 
-	  "rhythm", 
+	  "rhythm",
+	  "coriolan",
 	  "multi"]
 
 mutopia_examples = [ "wtk1-fugue2",
 		     "standje",
 		     "preludes-1",
 		     "preludes-2",
+		     
 		     "wtk1-prelude1",
 		     "gallina",	  
 		     "scsii-menuetto"]
@@ -214,7 +216,7 @@ def copy_files():
     
 #    my_system ("ln -s depth/out ./docxx" )
     my_system([ "cp %s/TODO ./TODO.txt" % depth,
-    "cp %s/ANNOUNCE-0.1 ./ANNOUNCE.txt" % depth,
+    "cp %s/ANNOUNCE-0.1 ./ANNOUNCE-0.1.txt" % depth,
     "cp %s/NEWS ./NEWS.txt" % depth,
     "cp %s/DEDICATION ./DEDICATION.txt" % depth]);
     my_system([ "make -C .. gifs"]);
diff --git a/lily/key-grav.cc b/lily/key-grav.cc
index 42359ae77a..60c2f2dbce 100644
--- a/lily/key-grav.cc
+++ b/lily/key-grav.cc
@@ -29,16 +29,16 @@ Key_engraver::create_key()
 {
   if (!kit_p_) 
     {
-	int c0_i=0;
+      int c0_i=0;
 
-	Staff_info inf = get_staff_info();
-	if (inf.c0_position_i_l_)
-	    c0_i = *get_staff_info().c0_position_i_l_;	
+      Staff_info inf = get_staff_info();
+      if (inf.c0_position_i_l_)
+	c0_i = *get_staff_info().c0_position_i_l_;	
 	
-	kit_p_ = new Key_item (c0_i);
-	kit_p_->break_priority_i_ = -1; // ugh
-	announce_element (Score_elem_info (kit_p_,keyreq_l_));
-  	kit_p_->read (*this);
+      kit_p_ = new Key_item (c0_i);
+      kit_p_->break_priority_i_ = -1; // ugh
+      announce_element (Score_elem_info (kit_p_,keyreq_l_));
+      kit_p_->read (*this);
     }
 }
 
@@ -47,10 +47,10 @@ Key_engraver::do_try_request (Request * req_l)
 {
   Command_req* creq_l= req_l->command();
   if (!creq_l|| !creq_l->keychange())
-	return false;
+    return false;
    
   if (keyreq_l_)
-	return false;		// TODO
+    return false;		// TODO
   keyreq_l_ = creq_l->keychange();
   read_req (keyreq_l_);
   return true;
@@ -62,13 +62,13 @@ Key_engraver::acknowledge_element (Score_elem_info info)
   Command_req * r_l = info.req_l_->command() ;
   if (r_l && r_l->clefchange()) 
     {
-	create_key();
+      create_key();
     }
   else if (info.elem_l_->is_type_b (Bar::static_name ())) 
     {
-	if (!keyreq_l_)
-	    default_key_b_ = true;
-	create_key();
+      if (!keyreq_l_)
+	default_key_b_ = true;
+      create_key();
     }
 
 }
@@ -78,11 +78,11 @@ Key_engraver::do_process_requests()
 {
   if (key_.multi_octave_b_) 
     {
-	assert (false); // TODO . 
+      assert (false); // TODO . 
     }
   else if (keyreq_l_) 
     {
-	create_key();
+      create_key();
     }
 }
 
@@ -91,9 +91,9 @@ Key_engraver::do_pre_move_processing()
 { 
   if (kit_p_) 
     {
-	kit_p_->default_b_ = default_key_b_;
-	typeset_element (kit_p_);
-	kit_p_ = 0;
+      kit_p_->default_b_ = default_key_b_;
+      typeset_element (kit_p_);
+      kit_p_ = 0;
     }
 }
 
@@ -102,19 +102,21 @@ Key_engraver::do_pre_move_processing()
 void
 Key_engraver::read_req (Key_change_req * r)
 {
+  key_.clear ();
   key_.multi_octave_b_ = r->multi_octave_b_;
   accidental_idx_arr_.clear();
+
   for (int i = 0; i < r->melodic_p_arr_.size(); i ++) 
     {
-	Melodic_req *  m_l =r->melodic_p_arr_[i];
-	int n_i =m_l->notename_i_;
-	int a_i = m_l->accidental_i_;
-	int o_i = m_l->octave_i_;
-	if (r->multi_octave_b_)
-	    key_.set (o_i, n_i, a_i);
-	else
-	    key_.set (n_i, a_i);
-	accidental_idx_arr_.push (n_i);
+      Melodic_req *  m_l =r->melodic_p_arr_[i];
+      int n_i =m_l->notename_i_;
+      int a_i = m_l->accidental_i_;
+      int o_i = m_l->octave_i_;
+      if (r->multi_octave_b_)
+	key_.set (o_i, n_i, a_i);
+      else
+	key_.set (n_i, a_i);
+      accidental_idx_arr_.push (n_i);
     }
 }
 
-- 
2.39.5