Fix 1112.

[lilypond.git] / lily / include / constrained-breaking.hh

diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh
index ff848537490f29c8365a5d79ad43116ec35197bd..c461859f7c92e6a549ddeb5d8bc8bb4602f1dab8 100644 (file)
--- a/lily/include/constrained-breaking.hh
+++ b/lily/include/constrained-breaking.hh
@@ -49,6 +49,8 @@ struct Line_details {
   Real padding_;  /* compulsory space after this system (if we're not
                     last on a page) */
   Real title_padding_;
+  Real min_distance_;
+  Real title_min_distance_;
   Real bottom_padding_;
   Real space_;    /* spring length */
   Real inverse_hooke_;
@@ -71,6 +73,8 @@ struct Line_details {
   int compressed_nontitle_lines_count_;
   bool last_markup_line_;
   bool first_markup_line_;
+  bool tight_spacing_;
+  Real first_refpoint_offset_;
 
   Line_details ()
   {
@@ -79,8 +83,11 @@ struct Line_details {
     padding_ = 0;
     title_padding_ = 0;
     bottom_padding_ = 0;
+    min_distance_ = 0;
+    title_min_distance_ = 0;
     space_ = 0;
     inverse_hooke_ = 1;
+    tight_spacing_ = false;
     break_permission_ = ly_symbol2scm ("allow");
     page_permission_ = ly_symbol2scm ("allow");
     turn_permission_ = ly_symbol2scm ("allow");
@@ -93,6 +100,7 @@ struct Line_details {
     last_markup_line_ = false;
     first_markup_line_ = false;
     tallness_ = 0;
+    first_refpoint_offset_ = 0;
   }
 
   Line_details (Prob *pb, Output_def *paper);
@@ -148,9 +156,14 @@ private:
   vsize systems_;
   bool ragged_right_;
   bool ragged_last_;
+
+  Real between_system_min_distance_;
+  Real between_system_padding_;
   Real between_system_space_;
+  Real between_scores_system_min_distance_;
+  Real between_scores_system_padding_;
+  Real before_title_min_distance_;
   Real before_title_padding_;
-  Real between_system_padding_;
 
   /* the (i,j)th entry is the configuration for breaking between
     columns i and j */