Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 611af4125c353adb203479ed80971bbdf00fcce2..0cecb7951170d53e022523cdbdb3876493741f79 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2015 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
@@ -42,12 +42,6 @@ Paper_score::Paper_score (Output_def *layout)
   paper_systems_ = SCM_BOOL_F;
 }
 
-Paper_score::Paper_score (Paper_score const &s)
-  : Music_output (s)
-{
-  assert (false);
-}
-
 void
 Paper_score::derived_mark () const
 {
@@ -78,14 +72,14 @@ Paper_score::find_break_indices () const
 
   for (vsize i = 0; i < cols_.size (); i++)
     {
-      Item *it = dynamic_cast<Item*> (cols_[i]);
+      Item *it = dynamic_cast<Item *> (cols_[i]);
       if (Paper_column::is_breakable (cols_[i])
-         && (i == 0 || it->find_prebroken_piece (LEFT))
-         && (i == cols_.size () - 1 || it->find_prebroken_piece (RIGHT)))
-       {
-         break_indices_.push_back (i);
-         break_ranks_.push_back (it->get_column ()->get_rank ());
-       }
+          && (i == 0 || it->find_prebroken_piece (LEFT))
+          && (i == cols_.size () - 1 || it->find_prebroken_piece (RIGHT)))
+        {
+          break_indices_.push_back (i);
+          break_ranks_.push_back (it->get_column ()->get_rank ());
+        }
     }
 }
 
@@ -97,7 +91,7 @@ Paper_score::get_break_indices () const
   return break_indices_;
 }
 
-vector<Grob*>
+vector<Grob *>
 Paper_score::get_columns () const
 {
   if (cols_.empty ())
@@ -131,10 +125,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..."));
 
@@ -156,7 +149,7 @@ Paper_score::layout () const
 SCM
 Paper_score::get_paper_systems ()
 {
-  if (paper_systems_ == SCM_BOOL_F)
+  if (scm_is_false (paper_systems_))
     {
       vector<Column_x_positions> breaking = calc_breaking ();
       system_->break_into_pieces (breaking);
@@ -166,10 +159,3 @@ Paper_score::get_paper_systems ()
     }
   return paper_systems_;
 }
-
-
-Paper_score *
-unsmob_paper_score (SCM x)
-{
-  return dynamic_cast<Paper_score*> (unsmob_music_output (x));
-}