diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2000-08-20 02:23:22 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2000-08-20 02:23:22 +0200 |
| commit | 11be23f380bcb249d49269cfa6f7889c6829011f (patch) | |
| tree | 92002fdcef7ffc637f4aa50d4a89e97cb3293048 /lily/include | |
| parent | cf5f855d867f98f409b6ecac42561a1a8a21c0c4 (diff) | |
patch::: 1.3.79.jcn2
1.3.79.jcn2
===========
* Fixed some silly url reversals in FAQ.
* Finished Coriolan music entry (again); entered second viola part.
* Updated Coriolan to use part combiner on Voice level for wind parts
and on Staff level for violi and bassi.
* Part-combiner now uses duration inquiry, which fixes rhythm-related
bugs in determining solo/a2. Also, rests are taken into account.
* Another crude fix for almost unexplainable (with a gdb that dumps
core on ly_display_scm) all-zero control points slurs.
* Fixed slurs that crossed through stems and note heads. Note
that beautifying of ugly slurs is still broken.
Diffstat (limited to 'lily/include')
| -rw-r--r-- | lily/include/duration.hh | 7 | ||||
| -rw-r--r-- | lily/include/musical-request.hh | 9 | ||||
| -rw-r--r-- | lily/include/part-combine-music-iterator.hh | 3 |
3 files changed, 19 insertions, 0 deletions
diff --git a/lily/include/duration.hh b/lily/include/duration.hh index da85a46239..3f352fccc2 100644 --- a/lily/include/duration.hh +++ b/lily/include/duration.hh @@ -25,6 +25,7 @@ struct Duration { void set_plet (int,int ); void compress (Rational); Rational length_mom () const ; + static int compare (Duration const&, Duration const&); /// Logarithm of the base duration. int durlog_i_; @@ -37,5 +38,11 @@ struct Duration { int tuplet_type_i_; }; + +#include "compare.hh" +INSTANTIATE_COMPARE(Duration, Duration::compare); + +int compare (Array<Duration>*, Array<Duration>*); + #endif // DURATION_HH diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index b70763d9b8..7b43113027 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -167,6 +167,15 @@ public: VIRTUAL_COPY_CONS (Music); }; +/** + What rhythms have ben acked ? + */ +class Rhythm_interrogate_req : public Request +{ +public: + Array<Duration> duration_arr_; + VIRTUAL_COPY_CONS (Music); +}; /** diff --git a/lily/include/part-combine-music-iterator.hh b/lily/include/part-combine-music-iterator.hh index 60cbebc8fc..7b38e0f033 100644 --- a/lily/include/part-combine-music-iterator.hh +++ b/lily/include/part-combine-music-iterator.hh @@ -32,6 +32,9 @@ private: Music_iterator * first_iter_p_; Music_iterator * second_iter_p_; + Moment now_; + Moment first_until_; + Moment second_until_; bool combined_b_; }; |