* scripts/musicxml2ly.py (bindir): gub relocation. (bugfix backport.)

* scm/music-functions.scm (toplevel-music-functions): set
ly:quote-iterator::constructor from
toplevel-music-functions. (bugfix backport for mutual quotes.)

diff --git a/ChangeLog b/ChangeLog
index 306ca5c965cc92866fb759970e2e860032c5035a..d1d84890effb1f2e33c7e7bf8c280f3020ee41e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-05  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * scripts/musicxml2ly.py (bindir): gub relocation. (bugfix backport.)
+
+       * scm/music-functions.scm (toplevel-music-functions): set
+       ly:quote-iterator::constructor from
+       toplevel-music-functions. (bugfix backport for mutual quotes.)
+
 2006-03-31  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/ advanced-notation, changing-defaults,

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index da13e221d2baf756228ceffac5dda1c70013d8e1..8fc012277edfb00bda49abb96a179fcf627aa288 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -397,7 +397,7 @@ goes down).")
     (QuoteMusic
      . (
        (description . "Quote preprocessed snippets of music. ")
-       (iterator-ctor . ,ly:quote-iterator::constructor)
+       (iterator-ctor . ,ly:music-wrapper-iterator::constructor)
        (length-callback . ,ly:music-wrapper::length-callback)
        (start-callback . ,ly:music-wrapper::start-callback)
        (types . (general-music music-wrapper-music))

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 2207e18601f6812641f0dad2c7aaa45317e0838a..0d19b6d5b7a1dba8e888d96f6477ae87c1935fef 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -734,8 +734,11 @@ Syntax:
                            #f)))
     
     (if (string? quoted-name)
-       (if  (vector? quoted-vector)
-            (set! (ly:music-property music 'quoted-events) quoted-vector)
+       (if (vector? quoted-vector)
+           (begin
+             (set! (ly:music-property music 'quoted-events) quoted-vector)
+             (set! (ly:music-property music 'iterator-ctor)
+                   ly:quote-iterator::constructor))
             (ly:warning (_ "can't find quoted music `~S'" quoted-name))))
     music))
 

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 4b5abf9a7061f450fc1fe46b95645adf96cd7294..b3a1ccb46da112f72c5feea41ee2e1995cc5f965 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -24,6 +24,15 @@ elif os.path.exists (os.path.join (datadir, 'share/lilypond/current/')):
 sys.path.insert (0, os.path.join (datadir, 'python'))
 
 
+# dynamic relocation, for GUB binaries.
+bindir = os.path.split (sys.argv[0])[0]
+
+for prefix_component in ['share', 'lib']:
+       datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % prefix_component)
+       sys.path.insert (0, datadir)
+
+
+
 import musicxml
 import musicexp
 import lilylib as ly