From b99527c715a0e20f0ba3d87ce68a84ad8df9e04c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 4 Nov 2005 15:04:18 +0000 Subject: [PATCH] (class Score): remove texts_ member. --- ChangeLog | 2 ++ lily/include/paper-book.hh | 1 - lily/include/score.hh | 1 - lily/paper-book.cc | 2 +- lily/score.cc | 5 ----- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d7b6a9b42..43c0286f53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-11-04 Han-Wen Nienhuys + * lily/include/score.hh (class Score): remove texts_ member. + * lily/beam.cc (set_stem_lengths): force direction callback. (print): read quantized-positions, so we can force Beam::set_stem_lengths to occur. diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh index 2780a231ed..3bad2b32b8 100644 --- a/lily/include/paper-book.hh +++ b/lily/include/paper-book.hh @@ -46,7 +46,6 @@ public: Stencil score_title (SCM); void classic_output (SCM output_channel); void output (SCM output_channel); - void post_processing (SCM, SCM); }; DECLARE_UNSMOB (Paper_book, paper_book) diff --git a/lily/include/score.hh b/lily/include/score.hh index b032533786..5ccab2bb81 100644 --- a/lily/include/score.hh +++ b/lily/include/score.hh @@ -27,7 +27,6 @@ public: String user_key_; Link_array defs_; SCM header_; - SCM texts_; bool error_found_; Score (); diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 5e274e98b6..56a5164a0c 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -56,7 +56,7 @@ int Paper_book::print_smob (SCM smob, SCM port, scm_print_state*) { Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob); - + (void)b; scm_puts ("#", port); return 1; } diff --git a/lily/score.cc b/lily/score.cc index 62047fd40c..b5898a5603 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -31,7 +31,6 @@ Score::Score () { header_ = SCM_EOL; music_ = SCM_EOL; - texts_ = SCM_EOL; error_found_ = false; smobify_self (); } @@ -50,7 +49,6 @@ Score::mark_smob (SCM s) Score *sc = (Score *) SCM_CELL_WORD_1 (s); scm_gc_mark (sc->header_); - scm_gc_mark (sc->texts_); for (int i = sc->defs_.size (); i--;) scm_gc_mark (sc->defs_[i]->self_scm ()); return sc->music_; @@ -69,7 +67,6 @@ Score::Score (Score const &s) { header_ = SCM_EOL; music_ = SCM_EOL; - texts_ = SCM_EOL; error_found_ = s.error_found_; smobify_self (); @@ -91,8 +88,6 @@ Score::Score (Score const &s) header_ = ly_make_anonymous_module (false); if (ly_is_module (s.header_)) ly_module_copy (header_, s.header_); - - texts_ = s.texts_; } void -- 2.39.5