Run grand-replace (issue 3765)

[lilypond.git] / lily / break-alignment-interface.cc

diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc
index a471a7ba9fab543184b0108fe5e05abd23b0a03c..79f215623f8617dd1a98dd59804033e0f03af29b 100644 (file)
--- a/lily/break-alignment-interface.cc
+++ b/lily/break-alignment-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
 #include "output-def.hh"
 #include "paper-column.hh"
 #include "pointer-group-interface.hh"
-#include "self-alignment-interface.hh"
 #include "side-position-interface.hh"
 #include "warn.hh"
 
@@ -103,13 +102,10 @@ Break_alignment_interface::calc_positioning_done (SCM smob)
   vector<Grob *> elems = ordered_elements (me);
   vector<Interval> extents;
 
-  int last_nonempty = -1;
   for (vsize i = 0; i < elems.size (); i++)
     {
       Interval y = elems[i]->extent (elems[i], X_AXIS);
       extents.push_back (y);
-      if (!y.is_empty ())
-        last_nonempty = i;
     }
 
   vsize idx = 0;
@@ -196,9 +192,9 @@ Break_alignment_interface::calc_positioning_done (SCM smob)
           if (unsmob_grob (l->get_property ("cause")))
             orig_string = unsmob_grob (l->get_property ("cause"))->name ();
 
-          programming_error (_f ("No spacing entry from %s to `%s'",
-                                 orig_string.c_str (),
-                                 sym_string.c_str ()));
+          programming_error (to_string ("No spacing entry from %s to `%s'",
+                                        orig_string.c_str (),
+                                        sym_string.c_str ()));
         }
 
       Real distance = 1.0;