Fix min_page_count in page-turn-breaking.

[lilypond.git] / lily / page-breaking.cc

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index 543665f97bb4d53b7ff3e74940b796b75190602d..f3b1f84de3a066dcf8156465a96944c8961be50f 100644 (file)
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -109,8 +109,12 @@ compress_lines (const vector<Line_details> &orig)
          if (!orig[i].tight_spacing_)
            padding = orig[i].title_ ? old.title_padding_ : old.padding_;
 
+         // FIXME: double check these. Doesn't foo.piggyback (bar) mean
+         // that foo goes on top?
+         // TODO: break out a Line_details::piggyback from here?
          compressed.shape_ = old.shape_.piggyback (orig[i].shape_, padding);
-         compressed.first_refpoint_offset_ += compressed.shape_.rest_[UP] - old.shape_.rest_[UP];
+         compressed.refpoint_extent_[UP] = old.refpoint_extent_[UP];
+         compressed.refpoint_extent_[DOWN] += compressed.shape_.rest_[UP] - old.shape_.rest_[UP];
          compressed.space_ += old.space_;
          compressed.inverse_hooke_ += old.inverse_hooke_;
 
@@ -889,34 +893,40 @@ Page_breaking::compute_line_heights ()
   Real prev_hanging = 0;
   Real prev_hanging_begin = 0;
   Real prev_hanging_rest = 0;
+
+  // refpoint_hanging is the y coordinate of the origin of this system.
+  // It may not be the same as refpoint_extent[UP], which is the
+  // refpoint of the first spaceable staff in this system.
   Real prev_refpoint_hanging = 0;
   for (vsize i = 0; i < cached_line_details_.size (); i++)
     {
-      Line_shape shape = cached_line_details_[i].shape_;
+      Line_details& cur = cached_line_details_[i];
+      Line_shape shape = cur.shape_;
       Real a = shape.begin_[UP];
       Real b = shape.rest_[UP];
-      bool title = cached_line_details_[i].title_;
+      bool title = cur.title_;
       Real refpoint_hanging = max (prev_hanging_begin + a, prev_hanging_rest + b);
 
       if (i > 0)
        {
          Real padding = 0;
-         if (!cached_line_details_[i].tight_spacing_)
+         Line_details const& prev = cached_line_details_[i-1];
+         if (!cur.tight_spacing_)
            padding = title
-             ? cached_line_details_[i-1].title_padding_
-             : cached_line_details_[i-1].padding_;
+             ? prev.title_padding_
+             : prev.padding_;
          Real min_dist = title
-           ? cached_line_details_[i-1].title_min_distance_
-           : cached_line_details_[i-1].min_distance_;
+           ? prev.title_min_distance_
+           : prev.min_distance_;
          refpoint_hanging = max (refpoint_hanging + padding,
-                                 prev_refpoint_hanging + min_dist
-                                 + cached_line_details_[i].first_refpoint_offset_);
+                                 prev_refpoint_hanging - prev.refpoint_extent_[DOWN]
+                                 + cur.refpoint_extent_[UP] + min_dist);
        }
 
       Real hanging_begin = refpoint_hanging - shape.begin_[DOWN];
       Real hanging_rest = refpoint_hanging - shape.rest_[DOWN];
       Real hanging = max (hanging_begin, hanging_rest);
-      cached_line_details_[i].tallness_ = hanging - prev_hanging;
+      cur.tallness_ = hanging - prev_hanging;
       prev_hanging = hanging;
       prev_hanging_begin = hanging_begin;
       prev_hanging_rest = hanging_rest;
@@ -989,18 +999,21 @@ Page_breaking::min_page_count (vsize configuration, vsize first_page_num)
      calculations that treated it as a non-last page were ok.
   */
 
-  cur_page_height = page_height (first_page_num + ret - 1, true);
-  cur_page_height -= min_whitespace_at_top_of_page (cached_line_details_[page_starter]);
-  cur_page_height -= min_whitespace_at_bottom_of_page (cached_line_details_.back ());
-
-  Real cur_height = cur_rod_height + ((ragged_last () || ragged ()) ? cur_spring_height : 0);
-  if (!too_few_lines (line_count - cached_line_details_.back ().compressed_nontitle_lines_count_)
-      && cur_height > cur_page_height
-      /* don't increase the page count if the last page had only one system */
-      && cur_rod_height > cached_line_details_.back ().full_height ())
-    ret++;
+  if (is_last ())
+    {
+      cur_page_height = page_height (first_page_num + ret - 1, true);
+      cur_page_height -= min_whitespace_at_top_of_page (cached_line_details_[page_starter]);
+      cur_page_height -= min_whitespace_at_bottom_of_page (cached_line_details_.back ());
+
+      Real cur_height = cur_rod_height + ((ragged_last () || ragged ()) ? cur_spring_height : 0);
+      if (!too_few_lines (line_count - cached_line_details_.back ().compressed_nontitle_lines_count_)
+         && cur_height > cur_page_height
+         /* don't increase the page count if the last page had only one system */
+         && cur_rod_height > cached_line_details_.back ().full_height ())
+       ret++;
+      assert (ret <= cached_line_details_.size ());
+    }
 
-  assert (ret <= cached_line_details_.size ());
   return ret;
 }
 
@@ -1453,7 +1466,7 @@ Page_breaking::min_whitespace_at_top_of_page (Line_details const &line) const
 {
   SCM first_system_spacing = book_->paper_->c_variable ("top-system-spacing");
   if (line.title_)
-    first_system_spacing = book_->paper_->c_variable ("top-title-spacing");
+    first_system_spacing = book_->paper_->c_variable ("top-markup-spacing");
 
   Real min_distance = -infinity_f;
   Real padding = 0;
@@ -1473,7 +1486,7 @@ Page_breaking::min_whitespace_at_top_of_page (Line_details const &line) const
 Real
 Page_breaking::min_whitespace_at_bottom_of_page (Line_details const &line) const
 {
-  SCM last_system_spacing = book_->paper_->c_variable ("bottom-system-spacing");
+  SCM last_system_spacing = book_->paper_->c_variable ("last-bottom-spacing");
   Real min_distance = -infinity_f;
   Real padding = 0;