Re: Avoid repeats of 'staff-affinity' warning; change text. (issue4278058)

[k-ohara5a5a]

Reviewers: Trevor Daniels, Colin Campbell,

Message:
On 2011/03/19 23:37:50, Colin Campbell wrote:
> error: expected ';'

Oops. I guess you can't teach an old dog to use a new editor.

Fixed, and I hope people do try it, because this method of suppressing
the repeated warnings changes the output.  Using this patch, LilyPond
uniformly changes the 'staff-affinity that was giving her trouble,
instead of just changing it when she notices trouble.
Before the patch, LilyPond

Description:
Avoid repeats of 'staff-affinity' warning; change text.

issue 1555

Please review this at http://codereview.appspot.com/4278058/

Affected files:
  M lily/page-layout-problem.cc


Index: lily/page-layout-problem.cc
diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc
index  
c9512fcca83a9d6908ae8237a048f47985a1fc98..febfa05bfb03ffda2331b6a7b04fa78557099e51  
100644
--- a/lily/page-layout-problem.cc
+++ b/lily/page-layout-problem.cc
@@ -855,8 +855,9 @@ Page_layout_problem::get_spacing_spec (Grob *before,  
Grob *after, bool pure, int
 	  Direction after_affinity = to_dir (after->get_maybe_pure_property  
("staff-affinity", pure, start, end));
          if (after_affinity > before_affinity)
            {
-             warning (_ ("staff-affinities should only decrease"));
+	      warning (_ ("adjacent non-staff lines have incompatible settings  
for vertical spacing; changing staff-affinity."));
              after_affinity = before_affinity;
+	      after->set_property ("staff-affinity", scm_from_int  
(after_affinity));
            }
          if (before_affinity != UP)
 	    return before->get_maybe_pure_property ("nonstaff-nonstaff-spacing",  
pure, start, end);