From 31bdda1129407bd277cfaf8959b68e01c26a8a85 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 17 Sep 2004 18:51:01 +0000 Subject: [PATCH] (SLIB_PATH): add SLIB_PATH to GUILE_LOAD_PATH --- ChangeLog | 7 +++++++ THANKS | 2 ++ buildscripts/guile-gnome.sh | 13 +++++++------ lily/bezier.cc | 8 ++++---- lily/slur.cc | 4 +++- scm/page-layout.scm | 2 +- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6ea2b280b..d43c8bce88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-09-17 Han-Wen Nienhuys + + * buildscripts/guile-gnome.sh (SLIB_PATH): add SLIB_PATH to + GUILE_LOAD_PATH + 2004-09-17 Jan Nieuwenhuizen * scm/output-gnome.scm: Small fixes. @@ -23,6 +28,8 @@ 2004-09-16 Han-Wen Nienhuys + * 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 04f4167138..3a049dfefc 100644 --- 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 7ebc6dbd9e..564d2380e5 100644 --- 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 d46e63638b..8c806a0f63 100644 --- 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 725922bf61..f695309f45 100644 --- 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 265affbf7d..cff4bd4ac1 100644 --- 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?))) -- 2.39.5