* scm/translation-functions.scm (format-bass-figure): inspect stream-event.

* scripts/lilypond-book.py (bindir): add bindir to $PATH.

diff --git a/ChangeLog b/ChangeLog
index e202e41a6aa0a4465d4f43b295fb63e7e254ae91..99df8bb3e1655f60ac421a1ed6d26df827ef953a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-08  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * scm/translation-functions.scm (format-bass-figure): inspect stream-event.
+
+       * scripts/lilypond-book.py (bindir): add bindir to $PATH.
+
 2006-08-08  Joe Neeman  <joeneeman@gmail.com>
 
        * lily/include/constrained-breaking.hh: add Line_details (Prob*)
@@ -16,6 +22,7 @@
 
        * lily/paper-book.cc (pages): use the new page-breaking calling convention
 
+>>>>>>> 1.5227
 2006-08-07  Erik Sandberg  <mandolaerik@gmail.com>
 
        * lily/lexer.ll, lily/source-file.cc: Add \sourcefileline command

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index e687c32faef5cd411d8714de847d378f4a3605c2..2767a7b212dd53885322c64b92eb49234194a017 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -62,8 +62,9 @@
 ;; Bass figures.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-public (format-bass-figure figure event context)
-  (let* ((fig (ly:music-property event 'figure))
+(define-public (format-bass-figure figure stream-event context)
+  (let* ((event (ly:event-property stream-event 'music-cause ))
+        (fig (ly:music-property event 'figure))
         (fig-markup (if (number? figure)
 
                         ;; this is not very elegant, but center-aligning all digits

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index c81e103177ec269c8ea7c60bf13a415fe634ab17..79e45c8c481714e2c58f742013af26a6f7b91531 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -47,6 +47,8 @@ for d in ['@lilypond_datadir@',
 
 # dynamic relocation, for GUB binaries.
 bindir = os.path.abspath (os.path.split (sys.argv[0])[0])
+
+os.environ['PATH'] = bindir + ':' + os.environ['PATH']
 for p in ['share', 'lib']:
     datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % p)
     sys.path.insert (0, datadir)