From: Joe Neeman Date: Mon, 19 Oct 2009 17:56:48 +0000 (-0700) Subject: Simplify in-code defaults for strechable space. X-Git-Tag: release/2.13.6-1~6 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8443618b68a5efee8cc7cdf0552e3609361d81fd;p=lilypond.git Simplify in-code defaults for strechable space. --- diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc index fe87727d5e..29025ba796 100644 --- a/lily/page-layout-problem.cc +++ b/lily/page-layout-problem.cc @@ -105,7 +105,7 @@ Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM syst else if (0 == Paper_column::get_rank (sys->get_bound (LEFT))) spec = between_scores_system_spacing; - Spring spring (first ? 0 : 1, 0.0); + Spring spring (0, 0); Real padding = 0.0; alter_spring_from_spacing_spec (spec, &spring); read_spacing_spec (spec, &padding, ly_symbol2scm ("padding")); @@ -117,7 +117,7 @@ Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM syst { SCM spec = first ? top_system_spacing : (last_system_was_title ? between_title_spacing : before_title_spacing); - Spring spring (first ? 0 : 1, 0.0); + Spring spring (0, 0); Real padding = 0.0; alter_spring_from_spacing_spec (spec, &spring); read_spacing_spec (spec, &padding, ly_symbol2scm ("padding")); diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly index 3e14781ab1..0e71cdac04 100644 --- a/ly/paper-defaults-init.ly +++ b/ly/paper-defaults-init.ly @@ -44,7 +44,7 @@ before-title-spacing = #'((space . 5) (padding . 0.5)) between-title-spacing = #'((space . 1) (padding . 0.5)) top-system-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0)) - top-title-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0)) + top-title-spacing = #'((space . 0) (padding . 1) (minimum-distance . 0)) bottom-system-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0) (stretchability . 5)) ragged-bottom = ##f