On 7 January 2011 20:33, Neil Puttock <n.putt...@gmail.com> wrote:
> On 7 January 2011 20:27, Benkő Pál <benko....@gmail.com> wrote:
>
>> it may be related to Joe's recent patch 777066 about page
>> breaking. I can't compile my larger scores, it stops at the
>> same message and memory usage goes to the skies. I wanted
>> to investigate it a bit more, but if anybody beats me...
>
> I'm looking at it at the moment. :)
This seems to work (at least, the regtests are OK and it doesn't
appear to break the interaction between page-count and
systems-per-page):
diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index e6a5740..af41363 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -712,7 +712,7 @@ Page_breaking::system_count_bounds
(vector<Break_position> const &chunks,
assert (chunks.size () >= 2);
Line_division ret;
- ret.resize (chunks.size () - 1, 0);
+ ret.resize (chunks.size () - 1, 1);
for (vsize i = 0; i + 1 < chunks.size (); i++)
{
@@ -812,7 +812,7 @@ Page_breaking::set_to_ideal_line_configuration
(vsize start, vsize end)
div.push_back (line_breaking_[sys].best_solution (start, end).size
());
}
else
- div.push_back (0);
+ div.push_back (1);
system_count_ += div.back ();
}
@@ -849,7 +849,7 @@ Page_breaking::cache_line_details (vsize
configuration_index)
}
else
{
- assert (div[i] == 0);
+ assert (div[i] == 1);
uncompressed_line_details_.push_back (system_specs_[sys].prob_
? Line_details
(system_specs_[sys].prob_, book_->paper_)
: Line_details ());
I don't know why, though. :)
Cheers,
Neil
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
