Merge branch 'page-break-fix'

Conflicts:

	lily/page-breaking.cc

diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc
index 728e726a5e3e476e540018d7a9041a0b1bbb964b..34ff7f1b184cb519b418c2b44f53417599a31b4d 100644 (file)
--- a/lily/optimal-page-breaking.cc
+++ b/lily/optimal-page-breaking.cc
@@ -52,7 +52,7 @@ Optimal_page_breaking::solve ()
   vsize ideal_sys_count = best.system_count ();
   vsize min_sys_count = ideal_sys_count - best.systems_per_page_.back ();
   
-  if (page_count > 1)
+  if (page_count > 1 && best.systems_per_page_[page_count - 2] > 1)
     min_sys_count -= best.systems_per_page_[page_count - 2];
 
   if (page_count == 1)

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index c4a2cf488182072f68242a21f109f30fca0a60dc..709ee52cb3eb433a9d9ead01143f12e49a07d9f2 100644 (file)
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -763,7 +763,7 @@ Page_breaking::finalize_spacing_result (vsize configuration, Page_spacing_result
 {
   if (res.force_.empty ())
     return res;
-  
+
   cache_line_details (configuration);
   res.systems_per_page_ = uncompress_solution (res.systems_per_page_, cached_line_details_);