(SLIB_PATH): add SLIB_PATH to

GUILE_LOAD_PATH

diff --git a/ChangeLog b/ChangeLog
index c6ea2b280b65a37efadad3e1a507cc10087142e7..d43c8bce88f9d3d5b7a43f8506d01cc89f541bc8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-17  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * buildscripts/guile-gnome.sh (SLIB_PATH): add SLIB_PATH to
+       GUILE_LOAD_PATH
+
 2004-09-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/output-gnome.scm: Small fixes.
@@ -23,6 +28,8 @@
 
 2004-09-16  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * buildscripts/guile-gnome.sh (LD_LIBRARY_PATH): new script.
+
        * lily/slur-scoring.cc (get_y_attachment_range): set end point
        using  base_attachment.
 

diff --git a/THANKS b/THANKS
index 04f41671381e03b766d0b5f06cbe97551b2ba8ff..3a049dfefcd02ae94a2eca75e06c00bb1787b530 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Jan Nieuwenhuizen
 
 CONTRIBUTORS
 
+Antti Kaihola
 Carl Sorensen
 David Svoboda
 Erik Sandberg
@@ -17,6 +18,7 @@ Graham Percival
 Guy Gascoigne-Piggford
 Heikki Junes
 Hendrik Maryns
+Jefferson dos Santos Felix
 Kristof Bastiaensen
 Michael Welsh Duggan
 Pedro Kroger

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 7ebc6dbd9edc0b6e95b5e3c217064b56de8212ec..564d2380e5d8afb8cc2e8138f0f878ce85bcbe9b 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -13,6 +13,7 @@ set -ex
 
 # Where user built stuff will be installed
 OPT=$HOME/usr/pkg
+SLIB_PATH=`locate slib/require.scm | head -1 | sed -s 's/require.scm//g'`
 
 # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck")
 EXTRA=${EXTRA-libgnomecanvas}
@@ -57,8 +58,8 @@ if ! pkg-config --atleast-version=1.5.1 pango; then
        echo "." > CVS/Repository
        cvs -z3 checkout -P pango
     else
-        wget ftp://ftp.gtk.org/pub/gtk/v2.5/pango-1.5.2.tar.gz
-       tar -zf pango-1.5.2.tar.gz
+        wget -N ftp://ftp.gtk.org/pub/gtk/v2.5/pango-1.5.2.tar.gz
+       tar -xzf pango-1.5.2.tar.gz
        ln -s pango-1.5.2 pango
     fi
     cd pango
@@ -81,7 +82,8 @@ fi
 
 PKG_CONFIG_PATH=$OPT/g-wrap/lib/pkgconfig:$PKG_CONFIG_PATH
 LD_LIBRARY_PATH=$OPT/g-wrap/lib:$LD_LIBRARY_PATH
-GUILE_LOAD_PATH=$OPT/g-wrap/share/guile/site:$GUILE_LOAD_PATH
+GUILE_LOAD_PATH=$OPT/g-wrap/share/guile/site:$GUILE_LOAD_PATH:$SLIB_PATH
+
 
 ## 4.  get g-wrap 2.0
 ## note that bleeding edge (2004-9-13) g-wrap breaks guile-gnome.
@@ -96,7 +98,7 @@ if ! pkg-config --exact-version=1.9.1 g-wrap-2.0-guile; then
         ## ughr:
        mkdir -p g-wrap/libffi
     else
-       wget http://savannah.nongnu.org/download/g-wrap/g-wrap-1.9.1.tar.gz
+       wget -N http://savannah.nongnu.org/download/g-wrap/g-wrap-1.9.1.tar.gz
        tar zxf g-wrap-1.9.1.tar.gz
        ln -s g-wrap-1.9.1 g-wrap
     fi
@@ -123,7 +125,6 @@ fi
 PKG_CONFIG_PATH=$OPT/guile-gnome/lib/pkgconfig:$PKG_CONFIG_PATH
 LD_LIBRARY_PATH=$OPT/guile-gnome/lib:$LD_LIBRARY_PATH
 GUILE_LOAD_PATH=$OPT/guile-gnome/share/guile:$GUILE_LOAD_PATH
-
 ## 5.  get guile-gnome
 if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
     if [ -n "$BLOEDIGE_RAND" ]; then
@@ -165,7 +166,7 @@ if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
        fi
        cd ..
     else
-       wget http://ambient.2y.net/wingo/tmp/guile-gnome-platform-$GGVERSION.tar.gz
+       wget -N http://ambient.2y.net/wingo/tmp/guile-gnome-platform-$GGVERSION.tar.gz
        tar xzf guile-gnome-platform-$GGVERSION.tar.gz
        ln -s guile-gnome-platform-$GGVERSION guile-gnome
        cd guile-gnome

diff --git a/lily/bezier.cc b/lily/bezier.cc
index d46e63638b13816056bb49a314b7a7ea3f21954d..8c806a0f6304cb1b145c79880e6ac19952d41868 100644 (file)
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -117,9 +117,10 @@ Bezier::polynomial (Axis a)const
   Polynomial p (0.0);
   for (int j=0; j <= 3; j++)
     {
-      p += (control_[j][a] *   binomial_coefficient (3, j))
-       * Polynomial::power (j , Polynomial (0,1))*
-       Polynomial::power (3 - j, Polynomial (1,-1));
+      p +=
+       (control_[j][a] * binomial_coefficient (3, j))
+       * Polynomial::power (j, Polynomial (0, 1))
+       * Polynomial::power (3 - j, Polynomial (1, -1));
     }
 
   return p;
@@ -191,7 +192,6 @@ Bezier::extent (Axis a)const
 /**
    Flip around axis A
  */
-
 void
 Bezier::scale (Real x, Real y)
 {

diff --git a/lily/slur.cc b/lily/slur.cc
index 725922bf613789e24cf0a3d2c2f2b36b7c8e0d39..f695309f45281ff9316112a39f542e0cf1198b7b 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -158,7 +158,9 @@ Slur::outside_slur_callback (SCM grob, SCM axis)
                   curve.control_[3][X_AXIS]);
 
   Real x = xext.center ();
-  if (!bezext.contains (xext[RIGHT]))
+  if (bezext.contains (x))
+    ;
+  else if (!bezext.contains (xext[RIGHT]))
     x = xext[LEFT];
   else if (!bezext.contains (xext[LEFT]))
     x = xext[RIGHT];

diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 265affbf7d9c7ddd29547aa3cd02569a2dbe7bd0..cff4bd4ac11da65ae6b751de4636fdd1f3642e3f 100644 (file)
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -330,7 +330,7 @@ is what have collected so far, and has ascending page numbers."
                 (entry (list idx (1+ idx) distance)))
              entry)))
         (rods (map calc-rod (iota (1- no-systems))))
-        (page-very-empty? (> space-left (/ page-height 3)))
+        (page-very-empty? (> space-left (/ page-height 1.5)))
         (result (ly:solve-spring-rod-problem
                  springs rods space
                  (or page-very-empty? ragged?)))