release: 0.0.44

[lilypond.git] / lily / walk-regs.cc

diff --git a/lily/walk-regs.cc b/lily/walk-regs.cc
index 0c408025012b2cf5380369419419e2c30ab4b0af..b258bd559d23b42ebcabe28b4eb30b1d68da02da 100644 (file)
--- a/lily/walk-regs.cc
+++ b/lily/walk-regs.cc
@@ -20,8 +20,8 @@
 #include "staff-column.hh"
 #include "voice-group-regs.hh"
 #include "voice-regs.hh"
-#include "commandrequest.hh"
-
+#include "command-request.hh"
+#include "score-walker.hh"
 
 Walker_registers::Walker_registers(Complex_walker *w)
 {
@@ -153,7 +153,7 @@ Walker_registers::try_request(Request * r)
            change_group(cr_l->groupchange(), 0, 0);
        } else 
            warning("junking request: "  + String(r->name()),
-                   r->defined_ch_c_l_);
+                   r->defined_ch_C_);
     }
     return b;
 }
@@ -162,11 +162,14 @@ Walker_registers::try_request(Request * r)
 Staff_info
 Walker_registers::get_staff_info() return inf;
 {
+    if (walk_l_->score_walk_l_)        // we get called ctors
+       inf.break_allowed_b_ = walk_l_->score_walk_l_->break_allowed_b();
     inf.c0_position_i_ = &walk_l_->c0_position_i_;
     inf.walk_l_ = walk_l_;
-    inf.time_c_l_ = &walk_l_->time_;
-    inf.rhythmic_c_l_ = walk_l_->default_grouping;
+    inf.time_C_ = &walk_l_->time_;
+    inf.rhythmic_C_ = walk_l_->default_grouping;
 }
+
 Paper_def*
 Walker_registers::paper()const
 {