From 77e0d94b349a148b1d089e65a8a7cfb4313e36b4 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:12:36 +0000 Subject: [PATCH] lilypond-1.0.1 --- flower/include/interval.hh | 10 +++++++++- input/test/abbrev.ly | 29 ++++++++++++++++++----------- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/flower/include/interval.hh b/flower/include/interval.hh index f33bcb5aa0..9468fae487 100644 --- a/flower/include/interval.hh +++ b/flower/include/interval.hh @@ -30,9 +30,12 @@ struct Interval_t { // T center() { return (left + right) / T(2);} // and can't handle this either // anyone want to make a bug report? + // better make one soon, egcs in rh5.1 barfs on this! T center() { T two (2); - return (left + right) / two; +// return (left + right) / two; + T result ((left + right) / two); + return result; } void translate (T t) { left += t; @@ -75,6 +78,11 @@ struct Interval_t { left =m; right = M; } + Interval_t &operator -= (T r) { + *this += -r; + return *this; + } + Interval_t &operator += (T r) { left += r; right +=r; diff --git a/input/test/abbrev.ly b/input/test/abbrev.ly index c57aeabdae..2cb2d7b141 100644 --- a/input/test/abbrev.ly +++ b/input/test/abbrev.ly @@ -1,17 +1,20 @@ -\score{\melodic { +\score{ + \melodic \transpose c'''{ + \stemup +% \stemdown % default abbreviations c4 c4: c4:32 c4: c4 c2. - 'a1 - 'a1:32 - 'c4:8 c': 'c4:16 c': - [ 'c8:16 'c 'c 'c ] [ a a a a ] - [ 'c 'f 'b e ] - [ 'c16:32 'c 'c 'c ] [ a16:32 a a a ] + a,1 + a,1:32 + c,4:8 c': c,4:16 c': + [ c,8:16 c, c, c, ] [ a a a a ] + [ c, f, b, e ] + [ c,16:32 c, c, c, ] [ a16:32 a a a ] % % there's still some hairy beam bugfixing todo - [ c'8:16 g d 'a ] - [ c'16:32 g d 'a ] - [ 'c8:32 'f 'b e ] + [ c'8:16 g d a, ] + [ c,8:32 f, b, e ] +% [ c'16:32 g d a, ] [:32 c16 e] [:32 c16 e] [:16 c8 e] @@ -19,4 +22,8 @@ [:16 e2 g] [:16 e1 g] -}} + } + \paper{ + castingalgorithm = \Wordwrap; + } +} -- 2.39.5