From e3bd073b603167e110d3ecac4bfa3e1ca75e0106 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Sun, 28 Jan 2007 11:05:32 +0200 Subject: [PATCH] Fix merging problem --- lily/page-breaking.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc index ed11285dd0..83add92ae0 100644 --- a/lily/page-breaking.cc +++ b/lily/page-breaking.cc @@ -93,8 +93,8 @@ Page_breaking::break_into_pieces (vsize start_break, vsize end_break, Line_divis line_breaker_args (sys, chunks[i], chunks[i+1], &start, &end); vector pos = ignore_div - ? line_breaking_[sys].get_best_solution (start, end) - : line_breaking_[sys].get_solution (start, end, div[i]); + ? line_breaking_[sys].best_solution (start, end) + : line_breaking_[sys].solve (start, end, div[i]); all_[sys].pscore_->root_system ()->break_into_pieces (pos); } } -- 2.39.2