lilypond-0.1.1

diff --git a/flower/VERSION b/flower/VERSION
index fafe5106a46e9925eacedbe521bc37018efc8bd6..d05f7ff918571601ba9acd4b3e9df705a1b8fcb6 100644 (file)
--- 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 965630964e1997aef969216c281cde2bf921b4e4..1e4385f14a5d7f8c420f7f821c8f52bff0ad78a5 100644 (file)
--- a/lily/keyword.cc
+++ b/lily/keyword.cc
@@ -4,10 +4,7 @@
 
 #include <stdlib.h>
 
-#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 093af7f0d4b89b80264671dd2eaab4c85961be2c..5ee56d8045d50d573af86298729445659663e40d 100644 (file)
--- 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 <hanwen@stack.nl>
+*/
+
 #include <math.h>
 
 #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<Item*> &its)
 {
@@ -51,3 +42,4 @@ itemlist_width(const Array<Item*> &its)
     return iv;
 }
 
+#endif