X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpage-layout-problem.cc;h=07c99586ee29c4715d21f1db56ad89255b9dfbc1;hb=faedf68d175302e2f52de307368677e934112cc1;hp=3aebfd4aac138bd51a524119dd3f3578bd08bd15;hpb=d0a03bdae24b589df21f9b78788bbd00aeeba779;p=lilypond.git diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc index 3aebfd4aac..07c99586ee 100644 --- a/lily/page-layout-problem.cc +++ b/lily/page-layout-problem.cc @@ -32,6 +32,98 @@ #include "prob.hh" #include "skyline-pair.hh" #include "system.hh" +#include "text-interface.hh" + +/* + Returns a stencil for the footnote of each system. This stencil may + itself be comprised of several footnotes. +*/ + +SCM +Page_layout_problem::get_footnotes_from_lines (SCM lines, Real padding) +{ + SCM footnotes = SCM_EOL; + // ugh...code dup from the Page_layout_problem constructor + for (SCM s = lines; scm_is_pair (s); s = scm_cdr (s)) + { + if (Grob *g = unsmob_grob (scm_car (s))) + { + System *sys = dynamic_cast (g); + if (!sys) + { + programming_error ("got a grob for footnotes that wasn't a System"); + continue; + } + footnotes = scm_cons (sys->make_footnote_stencil (padding).smobbed_copy (), footnotes); + } + else if (Prob *p = unsmob_prob (scm_car (s))) + { + SCM stencils = p->get_property ("footnotes"); + if (stencils == SCM_EOL) + continue; + Stencil footnote_stencil; + + for (SCM st = stencils; scm_is_pair (st); st = scm_cdr (st)) + footnote_stencil.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (scm_car (st)), padding); + footnotes = scm_cons (footnote_stencil.smobbed_copy (), footnotes); + } + } + + if (!scm_is_pair (footnotes)) + return SCM_EOL; + + return scm_reverse (footnotes); +} + +Stencil* +Page_layout_problem::get_footnote_separator_stencil (Output_def *paper) +{ + SCM props = scm_call_1 (ly_lily_module_constant ("layout-extract-page-properties"), + paper->self_scm ()); + + SCM markup = paper->c_variable ("footnote-separator-markup"); + + if (!Text_interface::is_markup (markup)) + return NULL; + + SCM footnote_stencil = Text_interface::interpret_markup (paper->self_scm (), + props, markup); + + Stencil *footnote_separator = unsmob_stencil (footnote_stencil); + + return footnote_separator; +} + +void +Page_layout_problem::add_footnotes_to_footer (SCM footnotes, Stencil *foot, Paper_book *pb) +{ + bool footnotes_found = false; + Real footnote_padding = robust_scm2double (pb->paper_->c_variable ("footnote-padding"), 0.0); + Real footnote_footer_padding = robust_scm2double (pb->paper_->c_variable ("footnote-footer-padding"), 0.0); + + footnotes = scm_reverse (footnotes); + + for (SCM s = footnotes; scm_is_pair (s); s = scm_cdr (s)) + { + Stencil *stencil = unsmob_stencil (scm_car (s)); + + if (!stencil) + continue; + + if (!stencil->is_empty ()) + { + foot->add_at_edge (Y_AXIS, UP, *stencil, (!footnotes_found ? footnote_footer_padding : footnote_padding)); + footnotes_found = true; + } + } + + if (footnotes_found) + { + Stencil *separator = get_footnote_separator_stencil (pb->paper_); + if (separator) + foot->add_at_edge (Y_AXIS, UP, *separator, footnote_padding); + } +} Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM systems) : bottom_skyline_ (DOWN) @@ -47,7 +139,13 @@ Page_layout_problem::Page_layout_problem (Paper_book *pb, SCM page_scm, SCM syst { Stencil *head = unsmob_stencil (page->get_property ("head-stencil")); Stencil *foot = unsmob_stencil (page->get_property ("foot-stencil")); - + + Real footnote_padding = 0.0; + if (pb && pb->paper_) + footnote_padding = robust_scm2double (pb->paper_->c_variable ("footnote-padding"), 0.0); + SCM footnotes = get_footnotes_from_lines (systems, footnote_padding); + add_footnotes_to_footer (footnotes, foot, pb); + header_height_ = head ? head->extent (Y_AXIS).length () : 0; footer_height_ = foot ? foot->extent (Y_AXIS).length () : 0; page_height_ = robust_scm2double (page->get_property ("paper-height"), 100); @@ -214,7 +312,7 @@ Page_layout_problem::append_system (System *sys, Spring const& spring, Real inde springs_.push_back (spring_copy); bottom_skyline_ = down_skyline; - elements_.push_back (Element (elts, minimum_offsets)); + elements_.push_back (Element (elts, minimum_offsets, padding)); // Add the springs for the VerticalAxisGroups in this system. @@ -242,7 +340,7 @@ Page_layout_problem::append_system (System *sys, Spring const& spring, Real inde alter_spring_from_spacing_spec (spec, &spring); springs_.push_back (spring); - Real min_distance = (found_spaceable_staff ? minimum_offsets[last_spaceable_staff] : 0) - minimum_offsets[i]; + Real min_distance = (found_spaceable_staff ? minimum_offsets_with_min_dist[last_spaceable_staff] : 0) - minimum_offsets_with_min_dist[i]; springs_.back ().ensure_min_distance (min_distance); if (scm_is_pair (manual_dists)) @@ -300,7 +398,7 @@ Page_layout_problem::append_prob (Prob *prob, Spring const& spring, Real padding spring_copy.ensure_min_distance (minimum_distance + padding); springs_.push_back (spring_copy); - elements_.push_back (Element (prob)); + elements_.push_back (Element (prob, padding)); } void @@ -364,7 +462,8 @@ Page_layout_problem::find_system_offsets () if (loose_lines.size ()) { Interval loose_extent = loose_lines.back ()->extent (loose_lines.back (), Y_AXIS); - Real min_distance = -loose_extent[DOWN] + prob_extent[UP]; // TODO: include padding/minimum-distance + Real min_distance = (-loose_extent[DOWN] + prob_extent[UP] + + elements_[i].padding); loose_line_min_distances.push_back (min_distance); loose_lines.push_back (0); @@ -397,7 +496,6 @@ Page_layout_problem::find_system_offsets () Real system_position = first_staff_position + first_staff_min_translation; // Position the staves within this system. - Real translation = 0; vector const& min_offsets = elements_[i].min_offsets; bool found_spaceable_staff = false; for (vsize staff_idx = 0; staff_idx < elements_[i].staves.size (); ++staff_idx) @@ -408,26 +506,27 @@ Page_layout_problem::find_system_offsets () if (is_spaceable (staff)) { // this is relative to the system: negative numbers are down. - translation = system_position - solution_[spring_idx]; - spring_idx++; + staff->translate_axis (system_position - solution_[spring_idx], Y_AXIS); // Lay out any non-spaceable lines between this line and // the last one. if (loose_lines.size ()) { - loose_line_min_distances.push_back (min_offsets[staff_idx-1] - min_offsets[staff_idx]); + if (staff_idx) + loose_line_min_distances.push_back (min_offsets[staff_idx-1] - min_offsets[staff_idx]); + else + loose_line_min_distances.push_back (elements_[i].padding - min_offsets[staff_idx]); loose_lines.push_back (staff); distribute_loose_lines (loose_lines, loose_line_min_distances, - last_spaceable_line_translation, translation - system_position); + last_spaceable_line_translation, -solution_[spring_idx]); loose_lines.clear (); loose_line_min_distances.clear (); } last_spaceable_line = staff; - last_spaceable_line_translation = -solution_[spring_idx - 1]; - - staff->translate_axis (translation, Y_AXIS); + last_spaceable_line_translation = -solution_[spring_idx]; found_spaceable_staff = true; + spring_idx++; } else { @@ -441,18 +540,20 @@ Page_layout_problem::find_system_offsets () // using a scheme similar to the one in set_column_rods. loose_line_min_distances.push_back (min_offsets[staff_idx-1] - min_offsets[staff_idx]); else - { + { // this is the first line in a system Real min_dist = 0; if (loose_lines.back ()) - min_dist = Axis_group_interface::minimum_distance (loose_lines.back (), - staff, - Y_AXIS); + // distance to the final line in the preceding system, + // including 'system-system-spacing 'padding + min_dist = (Axis_group_interface::minimum_distance (loose_lines.back (), + staff, + Y_AXIS) + + elements_[i].padding); else if (!last_title_extent.is_empty ()) - { // distance to the preceding title - // TODO: add options for controlling the space between a loose line - // and a title/markup preceding it. - min_dist = staff->extent (staff, Y_AXIS)[UP] - last_title_extent[DOWN]; - } + // distance to the preceding title, + // including 'markup-system-spacing 'padding + min_dist = (staff->extent (staff, Y_AXIS)[UP] - last_title_extent[DOWN] + + elements_[i].padding); else // distance to the top margin min_dist = header_padding_ + header_height_ + staff->extent (staff, Y_AXIS)[UP]; @@ -674,12 +775,7 @@ Page_layout_problem::get_fixed_spacing (Grob *before, Grob *after, int spaceable return robust_scm2double (cached, 0.0); } - SCM spec = Page_layout_problem::get_spacing_spec (before, after, pure, start, end); Real ret = -infinity_f; - Real stretchability = 0; - if (Page_layout_problem::read_spacing_spec (spec, &stretchability, ly_symbol2scm ("stretchability")) - && stretchability == 0) - Page_layout_problem::read_spacing_spec (spec, &ret, ly_symbol2scm ("basic-distance")); // If we're pure, then paper-columns have not had their systems set, // and so elts[i]->get_system () is unreliable. @@ -760,10 +856,12 @@ Page_layout_problem::get_spacing_spec (Grob *before, Grob *after, bool pure, int { Direction before_affinity = to_dir (before->get_maybe_pure_property ("staff-affinity", pure, start, end)); Direction after_affinity = to_dir (after->get_maybe_pure_property ("staff-affinity", pure, start, end)); - if (after_affinity > before_affinity) + static bool warned = false; + if (after_affinity > before_affinity + && !warned && !pure) { warning (_ ("staff-affinities should only decrease")); - after_affinity = before_affinity; + warned = true; } if (before_affinity != UP) return before->get_maybe_pure_property ("nonstaff-nonstaff-spacing", pure, start, end); @@ -791,10 +889,7 @@ Page_layout_problem::alter_spring_from_spacing_spec (SCM spec, Spring* spring) spring->set_default_strength (); if (read_spacing_spec (spec, &stretch, ly_symbol2scm ("stretchability"))) - { - spring->set_inverse_stretch_strength (stretch); - spring->set_inverse_compress_strength (stretch); - } + spring->set_inverse_stretch_strength (stretch); } vector