Release: bump version.

[lilypond.git] / lily / page-layout-problem.cc

diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc
index fa0689bf8f285738af61a02f3654a12ad12fed66..c9512fcca83a9d6908ae8237a048f47985a1fc98 100644 (file)
--- a/lily/page-layout-problem.cc
+++ b/lily/page-layout-problem.cc
@@ -34,11 +34,16 @@
 #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
+  // 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)))
@@ -74,7 +79,7 @@ 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 ());
+                          paper->self_scm ());
 
   SCM markup = paper->c_variable ("footnote-separator-markup");
 
@@ -92,23 +97,25 @@ Page_layout_problem::get_footnote_separator_stencil (Output_def *paper)
 void
 Page_layout_problem::add_footnotes_to_footer (SCM footnotes, Stencil *foot, Paper_book *pb)
 {
-  bool are_footnotes = false;
+  bool footnotes_found = false;
   Real footnote_padding = robust_scm2double (pb->paper_->c_variable ("footnote-padding"), 0.0);
   
   footnotes = scm_reverse (footnotes);
   for (SCM s = footnotes; scm_is_pair (s); s = scm_cdr (s))
     {
-      if (scm_car (s) == SCM_EOL)
-        continue;
       Stencil *stencil = unsmob_stencil (scm_car (s));
-      if (stencil->extent (Y_AXIS).length() > 0.0)
+
+      if (!stencil)
+        continue;
+
+      if (!stencil->is_empty ())
         {
           foot->add_at_edge (Y_AXIS, UP, *stencil, footnote_padding);
-          are_footnotes = true;
+          footnotes_found = true;
         }
     }
   
-  if (are_footnotes)
+  if (footnotes_found)
     {
       Stencil *separator = get_footnote_separator_stencil (pb->paper_);
       if (separator)
@@ -408,10 +415,10 @@ Page_layout_problem::solve_rod_spring_problem (bool ragged)
       Real overflow = spacer.configuration_length (spacer.force ())
                      - page_height_;
       if (ragged && overflow < 1e-6)
-       warning (_ ("couldn't fit music on page: ragged-spacing was requested, but page was compressed"));
+       warning (_ ("cannot fit music on page: ragged-spacing was requested, but page was compressed"));
       else
        {
-         warning (_f ("couldn't fit music on page: overflow is %f",
+         warning (_f ("cannot fit music on page: overflow is %f",
                       overflow));
          warning (_ ("compressing music to fit"));
          vsize space_count = solution_.size ();