Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / lily / minimal-page-breaking.cc

diff --git a/lily/minimal-page-breaking.cc b/lily/minimal-page-breaking.cc
index c25da7cb18180fdcaf14d7193c8a2eb225ee2627..4588dddc3a8a34f6a301c095fc6b4d14677b31c8 100644 (file)
--- a/lily/minimal-page-breaking.cc
+++ b/lily/minimal-page-breaking.cc
@@ -5,7 +5,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2007--2008 Nicolas Sceaux <nicolas.sceaux@free.fr>
+  (c) 2007--2009 Nicolas Sceaux <nicolas.sceaux@free.fr>
 */
 
 #include "international.hh"
@@ -15,9 +15,8 @@
 #include "paper-book.hh"
 
 static bool
-is_break (Grob *g)
+is_break (Grob *)
 {
-  (void) g; /* shutup warning */
   return false;
 }
 
@@ -35,11 +34,11 @@ Minimal_page_breaking::solve ()
 {
   vsize end = last_break_position ();
 
-  message ("Computing line breaks...");
+  message (_ ("Calculating line breaks..."));
   set_to_ideal_line_configuration (0, end);
   break_into_pieces (0, end, current_configuration (0));
 
-  message (_ ("Computing page breaks..."));
+  message (_ ("Calculating page breaks..."));
   vsize first_page_num = robust_scm2int (book_->paper_->c_variable ("first-page-number"), 1);
   Page_spacing_result res = pack_systems_on_least_pages (0, first_page_num);
   SCM lines = systems ();