From: fred <fred>
Date: Sun, 24 Mar 2002 19:30:51 +0000 (+0000)
Subject: lilypond-0.0.29
X-Git-Tag: release/1.5.59~5442
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=990f6257548bc2fbaef58b993c3cd48171cb67ac;p=lilypond.git

lilypond-0.0.29
---

diff --git a/Makefile b/Makefile
index e55ebd0dc9..10ad8c1642 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ include Variables.make
 
 
 $(exe): $(obs)
-	strip --strip-debug $(STABLEOBS)
+	$(STRIPDEBUG) $(STABLEOBS)
 	$(CXX) -o $@ $^ $(LOADLIBES)
 
 
@@ -23,6 +23,9 @@ distclean: clean
 
 all: kompijl doc
 
+win32: # value of $(OSTYPE) on windhoos; "make $OSTYPE" if u use bash :-)
+	$(MAKE) -C . CXX=g++ 
+
 doc:
 	$(MAKE) -C Documentation doc
 
diff --git a/NEWS b/NEWS
index 4592ee36f9..932246fcb9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+pl 29
+	- multiplatform Makefile
+	- context errors: bugfixes
+
 pl 28
 
 Internal
diff --git a/Variables.make b/Variables.make
index f0a26c0c3d..c53033674c 100644
--- a/Variables.make
+++ b/Variables.make
@@ -1,3 +1,8 @@
+# version info
+MAJVER=0
+MINVER=0
+PATCHLEVEL=29
+include Site.make
 ####
 #### USER CONFIGURABLE
 ####
@@ -37,10 +42,6 @@ endif
 
 
 
-# version info
-MAJVER=0
-MINVER=0
-PATCHLEVEL=28
 VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL)
 CXXVER=`$(CXX) --version`
 
@@ -105,3 +106,4 @@ SUBDIRS=Documentation $(OBJECTDIR) $(CCDIR) $(HEADERDIR) $(INITDIR) $(DEPDIR) \
 depfile=deps/$(subst .o,.dep,$(notdir $@)) 
 DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(OBJECTDIR)/$(notdir $@)"
 
+STRIPDEBUG=strip --strip-debug
\ No newline at end of file
diff --git a/configure b/configure
index e07c529a01..6ecf9b1104 100755
--- a/configure
+++ b/configure
@@ -3,7 +3,7 @@
 PREFIX=${PREFIX:-.}
 echo using PREFIX=$PREFIX
 
-NEEDFLOWERVER=1.0.24
+NEEDFLOWERVER=1.0.25
 flowertar=flower-$NEEDFLOWERVER
 here=`pwd`
 cd ..
@@ -27,5 +27,5 @@ echo Compiling Library
 cd $here
 
 echo '#define LIBDIR "'$PREFIX'/"'> hdr/config.hh
-
+touch Site.make
 make -f Initial.make
diff --git a/hdr/request.hh b/hdr/request.hh
index 203fc9ab05..44d42e5301 100644
--- a/hdr/request.hh
+++ b/hdr/request.hh
@@ -96,6 +96,7 @@ struct Spacing_req :virtual Request {
     Real distance;
     Real strength;
     /****************/
+    Spacing_req();
     REQUESTMETHODS(Spacing_req, spacing);
 };
 
diff --git a/input/wohltemperirt.ly b/input/wohltemperirt.ly
index 3163a7bf3c..ae48f898cc 100644
--- a/input/wohltemperirt.ly
+++ b/input/wohltemperirt.ly
@@ -48,6 +48,8 @@ basstaf = staff { melodic
 
 score {
 	staff { melodic
+
+		% every "music {} " in a staff has its own "voicegroup"
 		music { dux }
 		music { comes }
 		
diff --git a/src/lookup.cc b/src/lookup.cc
index 77cf12554c..be3466e092 100644
--- a/src/lookup.cc
+++ b/src/lookup.cc
@@ -174,7 +174,11 @@ Lookup::meter(Array<Scalar> a)
 Symbol
 Lookup::stem(Real y1,Real y2)
 {
-    assert(y1 <= y2);
+    if (y1 > y2) {
+	Real t = y1;
+	y1 = y2;
+	y2 = t;
+    }
     Symbol s;
     
     s.dim.x = Interval(0,0);