lilypond-0.0.52

diff --git a/lib/warn.cc b/lib/warn.cc
index 51907b6a3b04fb1cc1106398cb584c92878ede69..9fdf7219a137d4ab4e1ca6dd3f0af9cf97f47cf3 100644 (file)
--- 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 01a860911dfdab40baac7ff46846d4664feb6c2d..ddcbdae2f5d803529c9f1cd6068cc08ea3f51b0d 100644 (file)
--- 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 d76baf235d677a94c6ba241efe9f714baf6b62f8..e5e839fc28e197aab672cee6b0dc359a362d984b 100644 (file)
--- 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);