Use a `define-builtin-markup-command' macro for builtin markups, which

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index 4d42bdb171c61ed52a4c58ad041f992eae80c281..3ca397976b06c890094fdc2673deefc9fbc50833 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -245,10 +245,7 @@ System::add_column (Paper_column *p)
       ga = unsmob_grob_array (scm_ga);
     }
 
-  p->rank_
-    = ga->size ()
-    ? Paper_column::get_rank (ga->array ().back ()) + 1
-    : 0;
+  p->rank_ = ga->size ();
 
   ga->add (p);
   Axis_group_interface::add_element (this, p);
@@ -532,9 +529,10 @@ System::build_skylines ()
        boxes.push_back (Box (xiv, yiv));
     }
 
-  /* todo: make skyline slope configurable? */
-  skylines_[UP] = Skyline (boxes, 2, X_AXIS, UP);
-  skylines_[DOWN] = Skyline (boxes, 2, X_AXIS, DOWN);
+  SCM horizon_padding_scm = get_property ("skyline-horizontal-padding");
+  Real horizon_padding = robust_scm2double (horizon_padding_scm, 0);
+  skylines_[UP] = Skyline (boxes, horizon_padding, X_AXIS, UP);
+  skylines_[DOWN] = Skyline (boxes, horizon_padding, X_AXIS, DOWN);
 }
 
 
@@ -548,4 +546,5 @@ ADD_INTERFACE (System,
               "pure-Y-extent "
               "spaceable-staves "
               "skyline-distance "
+              "skyline-horizontal-padding "
               )