From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 6 Oct 2006 11:40:39 +0000 (+0000)
Subject: (pure-conversion): move pure-callback
X-Git-Tag: release/2.10.0-2~227
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=582673e3a69e69c67d3ab381384ff2d062aca314;p=lilypond.git

(pure-conversion): move pure-callback
further into body.
---

diff --git a/ChangeLog b/ChangeLog
index 2e41649fd2..d10ac47ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-06  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+	* scm/define-grobs.scm (pure-conversion): move pure-callback
+	further into body.
+
+	* scm/script.scm (default-script-alist): set avoid-slur for turn,
+	marcato, stopped, thumb.
+
 2006-10-05  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
 	* lily/completion-note-heads-engraver.cc (process_music): don't
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 97de2fd69f..a82741dc69 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1986,7 +1986,6 @@
 
 (set! all-grob-descriptions (sort all-grob-descriptions alist<?))
 
-
 (define pure-print-callbacks
   (list
    `(,ly:note-head::print . '())
@@ -2038,14 +2037,18 @@
 
 (define (pure-conversion pures conversions defsymbol defreturn rettype? grob start stop)
   (let* ((normal-callback (ly:grob-property-data grob defsymbol))
-	 (pure-callback (assq normal-callback conversions)))
+	 )
+
     (if (rettype? normal-callback)
 	normal-callback
 	(if (pair? (assq normal-callback pures))
 	    (normal-callback grob)
-	    (if (pair? pure-callback)
-		((cdr pure-callback) grob start stop)
-		defreturn)))))
+	    (let
+		((pure-callback (assq normal-callback conversions)))
+
+	      (if (pair? pure-callback)
+		  ((cdr pure-callback) grob start stop)
+		  defreturn))))))
 
 (define-public (pure-Y-extent grob start stop)
   (pure-conversion pure-Y-extents Y-extent-conversions