vertical spacing: Rename dimensions.

[lilypond.git] / lily / page-layout-problem.cc

diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc
index 23069add37372d4d1040923e9cab4ec83541a1f4..bf3395b2e3c82deeeb03fbb0532eb40d1a5dcd1d 100644 (file)
--- a/lily/page-layout-problem.cc
+++ b/lily/page-layout-problem.cc
@@ -57,30 +57,30 @@ Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM syst
   // below the top of the printable area.
   bottom_skyline_.set_minimum_height (-header_height_);
 
-  SCM between_system_spacing = SCM_EOL;
-  SCM between_scores_system_spacing = SCM_EOL;
-  SCM after_title_spacing = SCM_EOL;
-  SCM before_title_spacing = SCM_EOL;
-  SCM between_title_spacing = SCM_EOL;
+  SCM system_system_spacing = SCM_EOL;
+  SCM score_system_spacing = SCM_EOL;
+  SCM markup_system_spacing = SCM_EOL;
+  SCM score_markup_spacing = SCM_EOL;
+  SCM markup_markup_spacing = SCM_EOL;
 
   // top_system_spacing controls the spring from the top of the printable
   // area to the first staff. It allows the user to control the offset of
   // the first staff (as opposed to the top of the first system) from the
-  // top of the page. Similarly for bottom_system_spacing.
+  // top of the page. Similarly for last_bottom_spacing.
   SCM top_system_spacing = SCM_EOL;
-  SCM bottom_system_spacing = SCM_EOL;
+  SCM last_bottom_spacing = SCM_EOL;
   if (pb && pb->paper_)
     {
       Output_def *paper = pb->paper_;
-      between_system_spacing = paper->c_variable ("between-system-spacing");
-      between_scores_system_spacing = paper->c_variable ("between-scores-system-spacing");
-      after_title_spacing = paper->c_variable ("after-title-spacing");
-      before_title_spacing = paper->c_variable ("before-title-spacing");
-      between_title_spacing = paper->c_variable ("between-title-spacing");
-      bottom_system_spacing = paper->c_variable ("bottom-system-spacing");
+      system_system_spacing = paper->c_variable ("system-system-spacing");
+      score_system_spacing = paper->c_variable ("score-system-spacing");
+      markup_system_spacing = paper->c_variable ("markup-system-spacing");
+      score_markup_spacing = paper->c_variable ("score-markup-spacing");
+      markup_markup_spacing = paper->c_variable ("markup-markup-spacing");
+      last_bottom_spacing = paper->c_variable ("last-bottom-spacing");
       top_system_spacing = paper->c_variable ("top-system-spacing");
       if (scm_is_pair (systems) && unsmob_prob (scm_car (systems)))
-       top_system_spacing = paper->c_variable ("top-title-spacing");
+       top_system_spacing = paper->c_variable ("top-markup-spacing");
 
       // Note: the page height here does _not_ reserve space for headers and
       // footers. This is because we want to anchor the top-system-spacing
@@ -89,7 +89,7 @@ Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM syst
        + robust_scm2double (paper->c_variable ("bottom-margin"), 0);
 
       read_spacing_spec (top_system_spacing, &header_padding_, ly_symbol2scm ("padding"));
-      read_spacing_spec (bottom_system_spacing, &footer_padding_, ly_symbol2scm ("padding"));
+      read_spacing_spec (last_bottom_spacing, &footer_padding_, ly_symbol2scm ("padding"));
     }
   bool last_system_was_title = false;
 
@@ -107,13 +107,13 @@ Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM syst
              continue;
            }
 
-         SCM spec = between_system_spacing;
+         SCM spec = system_system_spacing;
          if (first)
            spec = top_system_spacing;
          else if (last_system_was_title)
-           spec = after_title_spacing;
+           spec = markup_system_spacing;
          else if (0 == Paper_column::get_rank (sys->get_bound (LEFT)))
-           spec = between_scores_system_spacing;
+           spec = score_system_spacing;
 
          Spring spring (0, 0);
          Real padding = 0.0;
@@ -126,7 +126,7 @@ Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM syst
       else if (Prob *p = unsmob_prob (scm_car (s)))
        {
          SCM spec = first ? top_system_spacing
-           : (last_system_was_title ? between_title_spacing : before_title_spacing);
+           : (last_system_was_title ? markup_markup_spacing : score_markup_spacing);
          Spring spring (0, 0);
          Real padding = 0.0;
          alter_spring_from_spacing_spec (spec, &spring);
@@ -141,8 +141,8 @@ Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM syst
 
   Spring last_spring (0, 0);
   Real last_padding = 0;
-  alter_spring_from_spacing_spec (bottom_system_spacing, &last_spring);
-  read_spacing_spec (bottom_system_spacing, &last_padding, ly_symbol2scm ("padding"));
+  alter_spring_from_spacing_spec (last_bottom_spacing, &last_spring);
+  read_spacing_spec (last_bottom_spacing, &last_padding, ly_symbol2scm ("padding"));
   last_spring.ensure_min_distance (last_padding - bottom_skyline_.max_height () + footer_height_);
   springs_.push_back (last_spring);
 
@@ -150,7 +150,7 @@ Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM syst
     {
       Real bottom_padding = 0;
 
-      // TODO: junk bottom-space now that we have bottom-system-spacing?
+      // TODO: junk bottom-space now that we have last-bottom-spacing?
       // bottom-space has the flexibility that one can do it per-system.
       // NOTE: bottom-space is misnamed since it is not stretchable space.
       if (Prob *p = elements_.back ().prob)