(pure-conversion): move pure-callback

further into body.

diff --git a/ChangeLog b/ChangeLog
index 2e41649fd295bc25163027e0fb94e40997e96af4..d10ac47ee3ebe4ec89314fbbb231e710025b23ed 100644 (file)
--- 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 97de2fd69f997fb9dc903193bcd6faa1d1be7a49..a82741dc6937a61eb774541fdaaf4fdc6d2389a5 100644 (file)
--- 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