From 73bb5d4f5e35c08302b53c7ca09f9eee571e2875 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 8 Aug 2006 12:49:47 +0000 Subject: [PATCH] * scm/translation-functions.scm (format-bass-figure): inspect stream-event. * scripts/lilypond-book.py (bindir): add bindir to $PATH. --- ChangeLog | 7 +++++++ scm/translation-functions.scm | 5 +++-- scripts/lilypond-book.py | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e202e41a6a..99df8bb3e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-08 Han-Wen Nienhuys + + * scm/translation-functions.scm (format-bass-figure): inspect stream-event. + + * scripts/lilypond-book.py (bindir): add bindir to $PATH. + 2006-08-08 Joe Neeman * 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 * lily/lexer.ll, lily/source-file.cc: Add \sourcefileline command diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm index e687c32fae..2767a7b212 100644 --- 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 c81e103177..79e45c8c48 100644 --- 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) -- 2.39.5