X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-layout-problem.cc;h=8acef86cd53412b040ed4479cf17be0587db3ede;hb=2be50a355fc735ee7dedb6b8964888bb3d6934af;hp=0fd9a92aa75dbfe2822924fd89e17ea36c05f5dc;hpb=6121051718cc848b2899ee33a0a27e7edd038526;p=lilypond.git diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc index 0fd9a92aa7..8acef86cd5 100644 --- a/lily/page-layout-problem.cc +++ b/lily/page-layout-problem.cc @@ -27,6 +27,7 @@ #include "output-def.hh" #include "paper-book.hh" #include "paper-column.hh" +#include "paper-score.hh" #include "pointer-group-interface.hh" #include "prob.hh" #include "skyline-pair.hh" @@ -117,10 +118,11 @@ Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM syst Spring spring (0, 0); Real padding = 0.0; + Real indent = line_dimensions_int (sys->paper_score ()->layout (), sys->get_rank ())[LEFT]; alter_spring_from_spacing_spec (spec, &spring); read_spacing_spec (spec, &padding, ly_symbol2scm ("padding")); - append_system (sys, spring, padding); + append_system (sys, spring, indent, padding); last_system_was_title = false; } else if (Prob *p = unsmob_prob (scm_car (s))) @@ -180,7 +182,7 @@ Page_layout_problem::set_footer_height (Real height) } void -Page_layout_problem::append_system (System *sys, Spring const& spring, Real padding) +Page_layout_problem::append_system (System *sys, Spring const& spring, Real indent, Real padding) { Grob *align = sys->get_vertical_alignment (); if (!align) @@ -195,6 +197,8 @@ Page_layout_problem::append_system (System *sys, Spring const& spring, Real padd Skyline up_skyline (UP); Skyline down_skyline (DOWN); build_system_skyline (elts, minimum_offsets, &up_skyline, &down_skyline); + up_skyline.shift (indent); + down_skyline.shift (indent); Real minimum_distance = up_skyline.distance (bottom_skyline_) + padding;