* lily/beam.cc (shift_region_to_valid): fix stupido bug.

* buildscripts/lilypond-profile.sh: override settings if
LILYPONDPREFIX is set.

diff --git a/ChangeLog b/ChangeLog
index c363bb45598d46a2e7e1046a7e1fb63fb12d64df..0be7d5f1940cba8c84d89f872b921c5e2a6275fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-05  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/beam.cc (shift_region_to_valid): fix stupido bug. 
+
+       * buildscripts/lilypond-profile.sh: override settings if
+       LILYPONDPREFIX is set.
+
 2002-06-04  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
 
        * scripts/ly2dvi.py (non_path_environment): Fix typo

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 40e16297a90a2b7c3f4933b5c52582f8fc8fe15b..720f2dc0991cd2dd467c11b477dcb61985cf1a37 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -7,19 +7,20 @@
 # If run by hand or from you .profile, run as follows
 #   . lilypond-profile
 
-datadir=`echo "@datadir@" | sed 's!//!/!g'`
 
 
+if [ "$LILYPONDPREFIX" == "" ] ; then
+    datadir=`echo "@datadir@" | sed 's!//!/!g'`
+else
+
+## to support development from ~/usr/src/lilypon.
+    datadir=$LILYPONDPREFIX
+fi
+
 # For direct ps output: ps/lilyponddefs.ps
 GS_LIB="$datadir/ps:"${GS_LIB:=""}
 export GS_LIB
 
-# bit silly. for ly2dvi, overrules compiled-in datadir...
-# Better comment this out.  Compiled-in datadir serves exactly the
-# same purpose, but is more likely to be correct (think multiple
-# versions of lilypond).
-# LILYPONDPREFIX="$datadir"
-# export LILYPONDPREFIX
 
 # Add the installation directory to the teTeX system tree, 
 # see Documentation/misc/fontinstallation

diff --git a/lily/beam.cc b/lily/beam.cc
index eba9e63373097c63e399d56ed6c54213342e757a..740c0ac532d28ab02df8268b3f199745ee6e1e5e 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -867,11 +867,8 @@ Beam::shift_region_to_valid (SCM grob)
       Direction d = Stem::get_direction (s);
 
 
-      /*
-       TODO: use real beam space function 
-      */
       Real left_y = Stem::calc_stem_info (s).shortest_y_
-       - dydx * (x_posns [i] - x0);
+       - dydx * x_posns [i];
 
       Interval flp ;
       flp.set_full ();