From: fred Date: Sun, 24 Mar 2002 19:41:01 +0000 (+0000) Subject: lilypond-0.1.1 X-Git-Tag: release/1.5.59~4855 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=619b40843571449e3896cea551ac6adefc0c66d0;p=lilypond.git lilypond-0.1.1 --- diff --git a/flower/VERSION b/flower/VERSION index fafe5106a4..d05f7ff918 100644 --- a/flower/VERSION +++ b/flower/VERSION @@ -1,6 +1,6 @@ MAJOR_VERSION = 1 MINOR_VERSION = 1 -PATCH_LEVEL = 24 +PATCH_LEVEL = 25 # use to send patches, always empty for released version: MY_PATCH_LEVEL = # include separator: "-1" or ".a" # diff --git a/lily/keyword.cc b/lily/keyword.cc index 965630964e..1e4385f14a 100644 --- a/lily/keyword.cc +++ b/lily/keyword.cc @@ -4,10 +4,7 @@ #include -#include "glob.hh" #include "my-lily-lexer.hh" -//#include "mudobs.hh" -//#include "gram.hh" /* for the keyword table */ struct Keyword_ent diff --git a/lily/misc.cc b/lily/misc.cc index 093af7f0d4..5ee56d8045 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -1,27 +1,17 @@ +/* + misc.cc -- implement various stuff + + source file of the GNU LilyPond music typesetter + + (c) 1997 Han-Wen Nienhuys +*/ + #include #include "item.hh" #include "misc.hh" -#include "glob.hh" #include "moment.hh" - -// depreciated, see struct Duration* -Moment -wholes(int dur, int dots) -{ - if (!dur) - return 0; - - Moment f = Rational(1)/Moment(dur); - Moment delta = f; - - while (dots--) { - delta /= 2.0; - f += delta; - } - return f; -} int intlog2(int d) { int i=0; @@ -38,6 +28,7 @@ log_2(double x) { return log(x) /log(2.0); } +#if 1 Interval itemlist_width(const Array &its) { @@ -51,3 +42,4 @@ itemlist_width(const Array &its) return iv; } +#endif