#include "item.hh"
#include "output-def.hh"
#include "paper-book.hh"
+#include "paper-column.hh"
#include "pointer-group-interface.hh"
#include "prob.hh"
#include "skyline-pair.hh"
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;
- // first_system_spacing controls the spring from the top of the printable
+ // 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 last_system_spacing.
- SCM first_system_spacing = SCM_EOL;
- SCM last_system_spacing = SCM_EOL;
+ // top of the page. Similarly for bottom_system_spacing.
+ SCM top_system_spacing = SCM_EOL;
+ SCM bottom_system_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");
- last_system_spacing = paper->c_variable ("bottom-system-spacing");
- first_system_spacing = paper->c_variable ("top-system-spacing");
+ bottom_system_spacing = paper->c_variable ("bottom-system-spacing");
+ top_system_spacing = paper->c_variable ("top-system-spacing");
if (scm_is_pair (systems) && unsmob_prob (scm_car (systems)))
- first_system_spacing = paper->c_variable ("top-title-spacing");
+ top_system_spacing = paper->c_variable ("top-title-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
page_height_ -= robust_scm2double (paper->c_variable ("top-margin"), 0)
+ robust_scm2double (paper->c_variable ("bottom-margin"), 0);
- read_spacing_spec (first_system_spacing, &header_padding_, ly_symbol2scm ("padding"));
- read_spacing_spec (last_system_spacing, &footer_padding_, ly_symbol2scm ("padding"));
+ read_spacing_spec (top_system_spacing, &header_padding_, ly_symbol2scm ("padding"));
+ read_spacing_spec (bottom_system_spacing, &footer_padding_, ly_symbol2scm ("padding"));
}
bool last_system_was_title = false;
continue;
}
- SCM spec = first ? first_system_spacing
- : (last_system_was_title ? after_title_spacing : between_system_spacing);
- Spring spring (first ? 0 : 1, 0.0);
+ SCM spec = between_system_spacing;
+ if (first)
+ spec = top_system_spacing;
+ else if (last_system_was_title)
+ spec = after_title_spacing;
+ else if (0 == Paper_column::get_rank (sys->get_bound (LEFT)))
+ spec = between_scores_system_spacing;
+
+ Spring spring (0, 0);
Real padding = 0.0;
alter_spring_from_spacing_spec (spec, &spring);
read_spacing_spec (spec, &padding, ly_symbol2scm ("padding"));
}
else if (Prob *p = unsmob_prob (scm_car (s)))
{
- SCM spec = first ? first_system_spacing
+ 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"));
Spring last_spring (0, 0);
Real last_padding = 0;
- alter_spring_from_spacing_spec (last_system_spacing, &last_spring);
- read_spacing_spec (last_system_spacing, &last_padding, ly_symbol2scm ("padding"));
+ alter_spring_from_spacing_spec (bottom_system_spacing, &last_spring);
+ read_spacing_spec (bottom_system_spacing, &last_padding, ly_symbol2scm ("padding"));
last_spring.ensure_min_distance (last_padding - bottom_skyline_.max_height () + footer_height_);
springs_.push_back (last_spring);
if (elements_.size ())
{
- Real bottom_padding;
+ Real bottom_padding = 0;
// TODO: junk bottom-space now that we have bottom-system-spacing?
// bottom-space has the flexibility that one can do it per-system.
{
Skyline_pair *sky = Skyline_pair::unsmob (prob->get_property ("vertical-skylines"));
Real minimum_distance = 0;
+ bool tight_spacing = to_boolean (prob->get_property ("tight-spacing"));
+
if (sky)
{
minimum_distance = (*sky)[UP].distance (bottom_skyline_);
bottom_skyline_.clear ();
bottom_skyline_.set_minimum_height (iv[DOWN]);
}
- minimum_distance += padding;
Spring spring_copy = spring;
- spring_copy.ensure_min_distance (minimum_distance);
+ if (tight_spacing)
+ {
+ spring_copy.set_min_distance (minimum_distance);
+ spring_copy.set_inverse_stretch_strength (0.0);
+ spring_copy.set_distance (0.0);
+ }
+ else
+ spring_copy.ensure_min_distance (minimum_distance + padding);
+
springs_.push_back (spring_copy);
elements_.push_back (Element (prob));
}
if (loose_lines.empty ())
loose_lines.push_back (last_spaceable_line);
- loose_lines.push_back (staff);
if (staff_idx)
loose_line_min_distances.push_back (min_offsets[staff_idx-1] - min_offsets[staff_idx]);
else
{
Real min_dist = 0;
- if (last_spaceable_line)
- min_dist = Axis_group_interface::minimum_distance (last_spaceable_line,
+ if (loose_lines.back ())
+ min_dist = Axis_group_interface::minimum_distance (loose_lines.back (),
staff,
Y_AXIS);
else // distance to the top margin
loose_line_min_distances.push_back (min_dist);
}
+ loose_lines.push_back (staff);
}
}
Spring spring (1.0, 0.0);
alter_spring_from_spacing_spec (spec, &spring);
spring.ensure_min_distance (min_distances[i]);
-
- if ((spec == SCM_BOOL_F && loose_lines[0] && loose_lines.back ())
- || !loose_lines[i]
- || !loose_lines[i+1])
- {
- // Insert a very flexible spring, so it doesn't have much effect.
- // TODO: set a default distance and a compress strength so that a
- // lyrics line, for example, will stay closer to the top staff
- // even in a compressed configuration.
- spring.set_inverse_stretch_strength (100000);
- spring.set_inverse_compress_strength (100000);
- }
-
spacer.add_spring (spring);
}
Real first_translation = minimum_translations[0];
Real last_spaceable_dy = 0;
Real first_spaceable_dy = 0;
- bool found_spaceable_staff;
+ bool found_spaceable_staff = false;
for (vsize i = 0; i < staves.size (); ++i)
{
return false;
}
-// Returns the spacing spec connecting BEFORE to AFTER. A return
-// value of SCM_BOOL_F means that there should be no spring (in
-// practice, this means that we use a very flexible spring).
+static SCM
+add_stretchability (SCM alist, Real stretch)
+{
+ if (!scm_is_pair (scm_sloppy_assq (ly_symbol2scm ("stretchability"), alist)))
+ return scm_acons (ly_symbol2scm ("stretchability"), scm_from_double (stretch), alist);
+
+ return alist;
+}
+
+// We want to put a large stretch between a non-spaceable line and its
+// non-affinity staff. We want to put an even larger stretch between
+// a non-spaceable line and the top/bottom of the page. That way,
+// a spacing-affinity UP line at the bottom of the page will still be
+// placed close to its staff.
+const double LARGE_STRETCH = 10e5;
+const double HUGE_STRETCH = 10e7;
+
+// Returns the spacing spec connecting BEFORE to AFTER.
SCM
Page_layout_problem::get_spacing_spec (Grob *before, Grob *after)
{
+ // If there are no spacing wishes, return a very flexible spring.
+ // This will occur, for example, if there are lyrics at the bottom of
+ // the page, in which case we don't want the spring from the lyrics to
+ // the bottom of the page to have much effect.
if (!before || !after)
- return SCM_BOOL_F;
+ return add_stretchability (SCM_EOL, HUGE_STRETCH);
if (is_spaceable (before))
{
else
{
Direction affinity = to_dir (after->get_property ("staff-affinity"));
- return (affinity == DOWN) ? SCM_BOOL_F : after->get_property ("inter-staff-spacing");
+ return (affinity == DOWN)
+ ? add_stretchability (after->get_property ("non-affinity-spacing"), LARGE_STRETCH)
+ : after->get_property ("inter-staff-spacing");
}
}
else
if (is_spaceable (after))
{
Direction affinity = to_dir (before->get_property ("staff-affinity"));
- return (affinity == UP) ? SCM_BOOL_F : before->get_property ("inter-staff-spacing");
+ return (affinity == UP)
+ ? add_stretchability (before->get_property ("non-affinity-spacing"), LARGE_STRETCH)
+ : before->get_property ("inter-staff-spacing");
}
else
{
return before->get_property ("inter-loose-line-spacing");
else if (after_affinity != DOWN)
return before->get_property ("inter-loose-line-spacing");
+ return add_stretchability (before->get_property ("non-affinity-spacing"), LARGE_STRETCH);
}
}
+
+ assert (0);
return SCM_BOOL_F;
}
projects / lilypond.git / blobdiff