X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fconstrained-breaking.hh;h=8378a959e297777ed9ae612e4f85128504528b14;hb=794dcbdb52faf4292036cd1b0270a956cf4316a3;hp=9aa5862761e4a4b78c5256524696721ac369b3da;hpb=48e8b24c01bef3da55bead4e9020b8838b8be775;p=lilypond.git

diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh
index 9aa5862761..8378a959e2 100644
--- a/lily/include/constrained-breaking.hh
+++ b/lily/include/constrained-breaking.hh
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006--2007 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #ifndef CONSTRAINED_BREAKING_HH
@@ -15,6 +15,7 @@
 #include "prob.hh"
 
 struct Line_details {
+  Grob *last_column_;
   Real force_;
   Interval extent_;   /* Y-extent of the system */
 
@@ -31,8 +32,19 @@ struct Line_details {
   Real page_penalty_;
   Real turn_penalty_;
 
+  bool title_;
+
+  /* The page-breaker deals with forbidden page breaks by "compressing"
+     two Line_detailses into one. The following fields are used by the
+     page-breaker to keep track of this. If the number of fields needed
+     by the page-breaker grows, it might be a good idea to create a separate
+     class. */
+  int compressed_lines_count_;
+  int compressed_nontitle_lines_count_;
+
   Line_details ()
   {
+    last_column_ = 0;
     force_ = infinity_f;
     padding_ = 0;
     bottom_padding_ = 0;
@@ -44,10 +56,14 @@ struct Line_details {
     break_penalty_ = 0;
     page_penalty_ = 0;
     turn_penalty_ = 0;
+    title_ = false;
+    compressed_lines_count_ = 1;
+    compressed_nontitle_lines_count_ = 1;
   }
 
   Line_details (Prob *pb)
   {
+    last_column_ = 0;
     force_ = 0;
     extent_ = unsmob_stencil (pb->get_property ("stencil")) ->extent (Y_AXIS);
     padding_ = robust_scm2double (pb->get_property ("next-padding"), 0);
@@ -60,6 +76,9 @@ struct Line_details {
     break_penalty_ = 0;
     page_penalty_ = robust_scm2double (pb->get_property ("page-break-penalty"), 0);
     turn_penalty_ = robust_scm2double (pb->get_property ("page-turn-penalty"), 0);
+    title_ = to_boolean (pb->get_property ("is-title"));
+    compressed_lines_count_ = 1;
+    compressed_nontitle_lines_count_ = title_ ? 0 : 1;
   }
 };