lilypond-0.0.74pre

diff --git a/lily/include/p-col.hh b/lily/include/p-col.hh
index 593420cea0894a977551c27a27ac55695044a9b4..87f15841643f06f08dc4aff847b28447450194c8 100644 (file)
--- a/lily/include/p-col.hh
+++ b/lily/include/p-col.hh
@@ -47,6 +47,7 @@ public:
     Real hpos;                 // should use ptr?
 
     bool error_mark_b_;
+    bool used_b_ ;             // manual override.. 
     
     PScore * pscore_l_;
 

diff --git a/lily/p-col.cc b/lily/p-col.cc
index eb7a78ef10412f34cafa9e3c8a8029124cf7b494..7036bebee37137dfbb7eeca436d90f40c69a7e14 100644 (file)
--- a/lily/p-col.cc
+++ b/lily/p-col.cc
@@ -29,14 +29,15 @@ PCol::clean_breakable_items()
     if (!line_l_) {
        its.junk_links();
     }
-    if (prebreak_p_) prebreak_p_->clean_breakable_items();
-    if (postbreak_p_) postbreak_p_->clean_breakable_items();
+    if (prebreak_p_) 
+       prebreak_p_->clean_breakable_items();
+    if (postbreak_p_) 
+       postbreak_p_->clean_breakable_items();
 }
 
 int
 PCol::rank_i() const
 {
-    assert(rank_i_ != -1);
     return rank_i_;
 }
 
@@ -117,6 +118,7 @@ PCol::breakable_b() const
 
 PCol::PCol(PCol *parent)
 {
+    used_b_ = false;
     error_mark_b_ = false;
     daddy_l_ = parent;
     prebreak_p_=0;
@@ -143,5 +145,5 @@ PCol::add( Item *i)
 bool
 PCol::used_b()const
 {
-    return breakable_b() || its.size();
+    return breakable_b() || its.size()|| used_b_;
 }

diff --git a/lily/spanner-elem-group.cc b/lily/spanner-elem-group.cc
index 9ec544e52d0a2fbffdff792f3a88f76459c589af..f0b76a277ccad7b253bdc9d3f093ddde04441f55 100644 (file)
--- a/lily/spanner-elem-group.cc
+++ b/lily/spanner-elem-group.cc
@@ -22,6 +22,9 @@ Spanner_elem_group::do_width() const
 void
 Spanner_elem_group::do_print() const
 {
+#ifndef NPRINT
+    Spanner::do_print();
     Horizontal_vertical_group::do_print();
+#endif
 }