From 027f1aab2ec8fbbc8a20cf421510f8b9a259d6d2 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 14 Aug 2000 20:55:10 +0200 Subject: patch::: 1.3.78.jcn1 1.3.78.jcn1 =========== * Fixed a2-devnull-engraver, a2-engraver. * Renamed part combiner music names to "one", "two". * Cleaned up property setting of part combiner, renamed to "solo"/"unison" --- lily/include/musical-pitch.hh | 2 ++ lily/include/part-combine-music-iterator.hh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lily/include') diff --git a/lily/include/musical-pitch.hh b/lily/include/musical-pitch.hh index 7f2c386b4d..079de76c8f 100644 --- a/lily/include/musical-pitch.hh +++ b/lily/include/musical-pitch.hh @@ -53,5 +53,7 @@ struct Musical_pitch : public Input #include "compare.hh" INSTANTIATE_COMPARE(Musical_pitch, Musical_pitch::compare); +int compare (Array*, Array*); + #endif /* MUSICAL_PITCH_HH */ diff --git a/lily/include/part-combine-music-iterator.hh b/lily/include/part-combine-music-iterator.hh index 60cbebc8fc..dcf86214e8 100644 --- a/lily/include/part-combine-music-iterator.hh +++ b/lily/include/part-combine-music-iterator.hh @@ -33,7 +33,7 @@ private: Music_iterator * first_iter_p_; Music_iterator * second_iter_p_; - bool combined_b_; + bool unirhythm_b_; }; #endif /* PART_COMBINE_MUSIC_ITERATOR_HH */ -- cgit v1.2.3