From ed7735411e9eabffd97dcb3b570a4f1bf0c3c57a Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:46:44 +0000
Subject: [PATCH] lilypond-0.0.71pre

---
 Documentation/lilyliterature.pod |  2 +-
 input/collisions.ly              |  2 +-
 input/scsii-menuetto.ly          |  6 ++---
 lily/key-reg.cc                  | 46 +++++++++++++++-----------------
 4 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/Documentation/lilyliterature.pod b/Documentation/lilyliterature.pod
index e92cb72a9a..bb56b4a911 100644
--- a/Documentation/lilyliterature.pod
+++ b/Documentation/lilyliterature.pod
@@ -133,7 +133,7 @@ ISBN 3-9000 035-96-2.
 some of the conventions and difficulties in printing music]
 
 The University of Colorado Music Engraving page.
-http://obenamots.cc.colorado.edu/cgi-bin/Musicpress/engraving.html
+http://obenamots.cc.colorado.edu/Musicpress/engraving.html
 
 More on GNU Music: http://dept-info.labri.u-bordeaux.fr/~strandh/Gsharp
 
diff --git a/input/collisions.ly b/input/collisions.ly
index 5edeb80f23..de6805fed9 100644
--- a/input/collisions.ly
+++ b/input/collisions.ly
@@ -3,7 +3,7 @@
  filename: collisions.ly
  title:
  description:  random counterpoint to test collisions
- composer(s): HWN,JCN
+ composer(s): 
  entered-by: HWN,JCN
  copyright: public domain
 
diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
index 769a032cc7..1af7644ba5 100644
--- a/input/scsii-menuetto.ly
+++ b/input/scsii-menuetto.ly
@@ -1,11 +1,11 @@
 %{MudelaHeader
 
  filename: scsii-menuetto.ly
- title:Solo Cello Suites,
- description: Suite II part V, Menuetto I
+ title: Solo Cello Suites, Suite II part V, Menuetto I
+ description: Cello suite transcribed for Viola
  composers: Johann Sebastian Bach (1685-1750)
  entered-by: JCN
- copyright: 
+ copyright: public domain
 
  Tested Features:breaking algorithm, chords, multivoice, accents
 
diff --git a/lily/key-reg.cc b/lily/key-reg.cc
index 4effed1fee..70dea983e9 100644
--- a/lily/key-reg.cc
+++ b/lily/key-reg.cc
@@ -20,9 +20,22 @@
 
 Key_register::Key_register()
 {
+    kit_p_ = 0;
     do_post_move_processing();
 }
 
+void
+Key_register::create_key()
+{
+    if (!kit_p_) {
+	int c0_i= *get_staff_info().c0_position_i_l_;	
+	
+	kit_p_ = new Key_item(c0_i);
+	announce_element(Score_elem_info(kit_p_,keyreq_l_));
+    	kit_p_->read(*this);
+    }
+}
+
 bool
 Key_register::do_try_request(Request * req_l)
 {
@@ -33,7 +46,6 @@ Key_register::do_try_request(Request * req_l)
     if (keyreq_l_)
 	return false;		// TODO
     keyreq_l_ = creq_l->keychange();
-    change_key_b_ = true;
     read_req(keyreq_l_);
     return true;
 }
@@ -41,23 +53,13 @@ Key_register::do_try_request(Request * req_l)
 void
 Key_register::acknowledge_element(Score_elem_info info)
 {
-    int c0_i= *get_staff_info().c0_position_i_l_;	
-	 Command_req * r_l = info.req_l_->command() ;
+    Command_req * r_l = info.req_l_->command() ;
     if (r_l && r_l->clefchange()) {
-
-	 if (!kit_p_) {
-	    kit_p_ = new Key_item(c0_i);
-	    announce_element(Score_elem_info(kit_p_,0));
-	 }
-	 change_key_b_ = true;
-    }
-    
-    if (info.elem_l_->name() == Bar::static_name()) {
-	default_key_b_ = true;
-	 if (!kit_p_) {
-	    kit_p_ = new Key_item(c0_i);
-	    announce_element(Score_elem_info(kit_p_,0));
-	 }
+	create_key();
+    } else if (info.elem_l_->name() == Bar::static_name()) {
+	if ( !keyreq_l_)
+	    default_key_b_ = true;
+	create_key();
     }
 
 }
@@ -65,14 +67,10 @@ Key_register::acknowledge_element(Score_elem_info info)
 void
 Key_register::do_process_requests()
 {
-    int c0_i= *get_staff_info().c0_position_i_l_;
-
     if (key_.multi_octave_b_)
 	assert(false); // TODO . 
     else if (keyreq_l_) {
-	kit_p_ = new Key_item(c0_i);
-	kit_p_->read(*this);
-	announce_element(Score_elem_info(kit_p_, keyreq_l_));
+	create_key();
     }
 }
 
@@ -80,6 +78,7 @@ void
 Key_register::do_pre_move_processing()
 { 
     if (kit_p_) {
+	kit_p_->default_b_ = default_key_b_;
 	typeset_breakable_item( kit_p_);
 	kit_p_ = 0;
     }
@@ -110,9 +109,8 @@ Key_register::do_post_move_processing()
 {
     keyreq_l_ = 0;
     default_key_b_ = false;
-    kit_p_ = 0;
-    change_key_b_ = false;
 }
+
 IMPLEMENT_STATIC_NAME(Key_register);
 IMPLEMENT_IS_TYPE_B1(Key_register,Request_register);
 ADD_THIS_REGISTER(Key_register);
-- 
2.39.5