From b9910bc22f0a65c9d8476370ceea6475f7002ff2 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Wed, 5 Apr 2006 10:53:48 +0000
Subject: [PATCH] * 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.)
---
 ChangeLog                  | 8 ++++++++
 scm/define-music-types.scm | 2 +-
 scm/music-functions.scm    | 7 +++++--
 scripts/musicxml2ly.py     | 9 +++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 306ca5c965..d1d84890ef 100644
--- 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 da13e221d2..8fc012277e 100644
--- 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 2207e18601..0d19b6d5b7 100644
--- 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 4b5abf9a70..b3a1ccb46d 100644
--- 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
-- 
2.39.5