Merge branch 'issue4032'

[lilypond.git] / lily / paper-score.cc

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index c9c316026093054e88f4b9249ccbcda246135da3..bcc6e12e870274a00ad3e27e8ca117c8ea5e4ef7 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--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
@@ -131,10 +131,9 @@ Paper_score::calc_breaking ()
 void
 Paper_score::process ()
 {
-  if (be_verbose_global)
-    message (_f ("Element count %d (spanners %d) ",
-                 system_->element_count (),
-                 system_->spanner_count ()));
+  debug_output (_f ("Element count %d (spanners %d) ",
+                    system_->element_count (),
+                    system_->spanner_count ()));
 
   message (_ ("Preprocessing graphical objects..."));
 
@@ -168,7 +167,7 @@ Paper_score::get_paper_systems ()
 }
 
 Paper_score *
-unsmob_paper_score (SCM x)
+Paper_score::unsmob (SCM x)
 {
-  return dynamic_cast<Paper_score *> (unsmob_music_output (x));
+  return dynamic_cast<Paper_score *> (Music_output::unsmob (x));
 }