diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2000-08-14 20:55:10 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2000-08-14 20:55:10 +0200 |
| commit | 027f1aab2ec8fbbc8a20cf421510f8b9a259d6d2 (patch) | |
| tree | 1d41f2cee1e2dc6414c7bc5b5f3aaf925a91f95e /lily/include | |
| parent | 277d986b4aa1172813b9a2a7a4daa86983d26d73 (diff) | |
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"
Diffstat (limited to 'lily/include')
| -rw-r--r-- | lily/include/musical-pitch.hh | 2 | ||||
| -rw-r--r-- | lily/include/part-combine-music-iterator.hh | 2 |
2 files changed, 3 insertions, 1 deletions
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<Musical_pitch>*, Array<Musical_pitch>*); + #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 */ |