From: fred <fred>
Date: Sun, 24 Mar 2002 19:39:11 +0000 (+0000)
Subject: lilypond-0.0.51
X-Git-Tag: release/1.5.59~4964
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dc5e66a15126619aa9cc1f607306b9360e3c522f;p=lilypond.git

lilypond-0.0.51
---

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index f0aaaf9aa3..86797c682c 100644
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -25,8 +25,8 @@ melodie = \melodic {
 	g g|	f f|	e e| 	d d|	g g|	f f|	e e| 	d d|
  	%%% var 1
 	  c r8 c8		% r8 means an 8th rest.
-		  (|		% \start a slur
-				% NOTE: the slur\start should be directly after the note
+		  (|		% start a slur
+				% NOTE: the slurstart should be directly after the note
 			) 	% end a slur.
 			  g r8 g8 (|	) a r8 a8 (|	) g r4 
 	  f r8 f8 (|	) e4 r8 e8 (	|) d4 r8 d8 (|	) c4 r4 
diff --git a/lily/dynamic-reg.cc b/lily/dynamic-reg.cc
index 4088a3be70..59de609437 100644
--- a/lily/dynamic-reg.cc
+++ b/lily/dynamic-reg.cc
@@ -14,6 +14,7 @@
 #include "paper-def.hh"
 #include "score-column.hh"
 #include "staff-sym.hh"
+#include "note-column.hh"
 
 Dynamic_register::Dynamic_register()
 {
@@ -133,3 +134,14 @@ Dynamic_register::~Dynamic_register()
     }
     delete cresc_p_;
 }
+void
+Dynamic_register::acknowledge_element(Staff_elem_info i)
+{
+    if (i.elem_l_->name() == Note_column::static_name()) {
+	if (dynamic_p_) dynamic_p_->add_support(i.elem_l_);
+	if (to_end_cresc_p_)
+	    to_end_cresc_p_->add_support(i.elem_l_);
+	if (cresc_p_) 
+	    cresc_p_->add_support(i.elem_l_);
+    }
+}
diff --git a/lily/include/dynamic-reg.hh b/lily/include/dynamic-reg.hh
index 8b39f4fe11..b0f8b1a437 100644
--- a/lily/include/dynamic-reg.hh
+++ b/lily/include/dynamic-reg.hh
@@ -25,6 +25,7 @@ public:
     ~Dynamic_register();
     NAME_MEMBERS(Dynamic_register);
 protected:
+    virtual void acknowledge_element(Staff_elem_info);
     virtual bool try_request(Request *req_l);
     virtual void process_requests();
     virtual void pre_move_processing();
diff --git a/lily/include/text-reg.hh b/lily/include/text-reg.hh
index 59317e5bcd..db668dd44f 100644
--- a/lily/include/text-reg.hh
+++ b/lily/include/text-reg.hh
@@ -9,17 +9,20 @@
 #define TEXTREG_HH
 #include "register.hh"
 
-struct Text_register : Request_register{
+class Text_register : public Request_register{
     Text_item * text_p_;
     Text_req * text_req_l_;
     int dir_i_;
     /* *************** */
+protected:
     virtual void set_feature(Features );
-    Text_register();
     virtual bool try_request(Request*);
     virtual void process_requests();
     virtual void pre_move_processing();
     virtual void post_move_processing();
+    virtual void acknowledge_element(Staff_elem_info);
+public:
+    Text_register();
     NAME_MEMBERS(Text_register);
 };
 
diff --git a/lily/text-reg.cc b/lily/text-reg.cc
index 6c86fad828..c502781a1d 100644
--- a/lily/text-reg.cc
+++ b/lily/text-reg.cc
@@ -3,7 +3,7 @@
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
-
+#include "note-column.hh"
 #include "musical-request.hh"
 #include "text-reg.hh"
 #include "text-item.hh"
@@ -28,7 +28,13 @@ Text_register::try_request(Request*req_l)
     text_req_l_ = req_l->text();
     return true;
 }
-
+void
+Text_register::acknowledge_element(Staff_elem_info i)
+{
+    if (text_p_ && i.elem_l_->name() == Note_column::static_name()) {
+	text_p_->add_support(i.elem_l_);
+    }
+}
 void
 Text_register::process_requests()
 {