lilypond-0.0.52

diff --git a/lily/note.cc b/lily/note.cc
index 0dc31417e42ddc50beec2181f778b07311a055fb..248a25e60ec3f6e2d96b1025baada82e0b665e3a 100644 (file)
--- a/lily/note.cc
+++ b/lily/note.cc
@@ -71,10 +71,19 @@ Request*
 get_stemdir_req(int d)
 {
     Group_feature_req * gfreq_p = new Group_feature_req;
-    gfreq_p->stemdir_i_ =d; 
+    gfreq_p->type_str_ = "vdir";
+    gfreq_p->value_str_ = String(d);
     return gfreq_p;
 }
-
+Request*
+get_hshift_req(int i)
+{
+   Group_feature_req * gfreq_p = new Group_feature_req;
+    gfreq_p->type_str_ = "hshift";
+    gfreq_p->value_str_ = String(i);
+    return gfreq_p;
+}
+    
 Request*
 get_grouping_req(Array<int> i_arr)
 {

diff --git a/lily/stem-beam-reg.cc b/lily/stem-beam-reg.cc
index 50131835dae5b6b59f4aa1643f5f452fabf89eab..51e4a42ebe4df586714f5e70b1c8bc3d40102562 100644 (file)
--- a/lily/stem-beam-reg.cc
+++ b/lily/stem-beam-reg.cc
@@ -19,9 +19,10 @@
 Stem_beam_register::Stem_beam_register()
 {
     post_move_processing();
+
     current_grouping = 0;
     beam_p_ = 0;
-    set_feature(Features::dir(0));
+    default_dir_i_ =0;
     start_req_l_ = 0;
 }
 
@@ -151,9 +152,10 @@ Stem_beam_register::~Stem_beam_register()
 }
 
 void
-Stem_beam_register::set_feature(Features i)
+Stem_beam_register::set_feature(Feature i)
 {
-    default_dir_i_ = i.direction_i_;
+    if (i.type_ == "vdir")     
+       default_dir_i_ = i.value_;
 }
 
 IMPLEMENT_STATIC_NAME(Stem_beam_register);

diff --git a/lily/voice-group-regs.cc b/lily/voice-group-regs.cc
index 476b204a53c73920be2b4363c94620d57e313b53..37328ae1ad14e65ce9a80883567cc0af7961bea9 100644 (file)
--- a/lily/voice-group-regs.cc
+++ b/lily/voice-group-regs.cc
@@ -35,13 +35,16 @@ Voice_group_registers::try_request(Request*r_l)
 {
     for (int i=0; i < voice_regs_l_.size(); i++) {     
        if (voice_regs_l_[i]->voice_l_ == r_l->voice_l())
-           goto gotcha;
+           goto gotcha;        // yeah, yeah, I know
     }
     return false;
 gotcha:
     Command_req* c_l = r_l->command();
     if (c_l&& c_l->groupfeature()) {
-       set_feature(Features::dir(c_l->groupfeature()->stemdir_i_));
+       Feature f;
+       f.type_ = c_l->groupfeature()->type_str_;
+       f.value_ = c_l->groupfeature()->value_str_;
+       set_feature(f);
        return true;
     }
     return Register_group_register::try_request(r_l);