X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=0cecb7951170d53e022523cdbdb3876493741f79;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=c9c316026093054e88f4b9249ccbcda246135da3;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index c9c3160260..0cecb79511 100644 --- 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 + Copyright (C) 1996--2015 Han-Wen Nienhuys 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 { @@ -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 breaking = calc_breaking (); system_->break_into_pieces (breaking); @@ -166,9 +159,3 @@ Paper_score::get_paper_systems () } return paper_systems_; } - -Paper_score * -unsmob_paper_score (SCM x) -{ - return dynamic_cast (unsmob_music_output (x)); -}