From: Joe Neeman <joeneeman@gmail.com>
Date: Sun, 28 Jan 2007 09:05:32 +0000 (+0200)
Subject: Fix merging problem
X-Git-Tag: release/2.11.15-1~9^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e3bd073b603167e110d3ecac4bfa3e1ca75e0106;p=lilypond.git

Fix merging problem
---

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<Column_x_positions> 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);
 	}
     }