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

lilypond-0.0.52
---

diff --git a/lib/warn.cc b/lib/warn.cc
index 51907b6a3b..9fdf7219a1 100644
--- a/lib/warn.cc
+++ b/lib/warn.cc
@@ -13,7 +13,7 @@ error(String s)
 void
 warning(String m)
 {
-    cerr << "warning" <<m <<endl;
+    cerr << "warning: " <<m <<endl;
 
 }
 
diff --git a/lily/include/note-column-reg.hh b/lily/include/note-column-reg.hh
index 01a860911d..ddcbdae2f5 100644
--- a/lily/include/note-column-reg.hh
+++ b/lily/include/note-column-reg.hh
@@ -14,9 +14,12 @@
 
 class Note_column_register :public Request_register {
     Note_column *ncol_p_;
+    bool h_shift_b_;
+    int dir_i_;
     /* *************** */
     bool acceptable_elem_b(Staff_elem const*)const;
 protected:
+    virtual void set_feature(Feature);
     virtual void acknowledge_element(Staff_elem_info);
     virtual void pre_move_processing();
 
diff --git a/lily/note-column-reg.cc b/lily/note-column-reg.cc
index d76baf235d..e5e839fc28 100644
--- a/lily/note-column-reg.cc
+++ b/lily/note-column-reg.cc
@@ -44,12 +44,28 @@ void
 Note_column_register::pre_move_processing()
 {
     if (ncol_p_) {
+	if (!	ncol_p_->dir_i_ )
+	    ncol_p_->dir_i_ = dir_i_;
+	if (! ncol_p_->h_shift_b_)
+	    ncol_p_->h_shift_b_ = h_shift_b_;
 	typeset_element(ncol_p_);
 	ncol_p_ =0;
     }
 }
+
+void
+Note_column_register::set_feature(Feature i)
+{
+     if (i.type_ == "vdir")	
+	dir_i_ = i.value_;
+     if (i.type_ == "hshift")
+	 h_shift_b_ = i.value_;
+}
+
 Note_column_register::Note_column_register()
 {
+    dir_i_ =0;
+    h_shift_b_ = false;
     ncol_p_=0;
 }
 IMPLEMENT_STATIC_NAME(Note_column_register);