Add warning about using \relative with tagged music (3253)

[lilypond.git] / scm / define-music-callbacks.scm

diff --git a/scm/define-music-callbacks.scm b/scm/define-music-callbacks.scm
index 06d616f8b014e3cfbb4e57da6811315af3020f07..723ed130ec49b00912fe045a00d6006e65d8856a 100644 (file)
--- a/scm/define-music-callbacks.scm
+++ b/scm/define-music-callbacks.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Neil Puttock <n.puttock@gmail.com>
 ;;;;                 Carl Sorensen <c_sorensen@byu.edu>
@@ -92,11 +92,11 @@ to be used by the sequential-iterator"
                 (lambda (context)
                   (let* ((time-signature-settings
                           (ly:context-property context 'timeSignatureSettings))
-                         (my-base-fraction
-                           (base-fraction fraction time-signature-settings))
+                         (my-base-length
+                           (base-length fraction time-signature-settings))
                          (my-beat-structure
                            (if (null? structure)
-                               (beat-structure my-base-fraction
+                               (beat-structure my-base-length
                                                fraction
                                                time-signature-settings)
                                structure))
@@ -106,7 +106,7 @@ to be used by the sequential-iterator"
                      (ly:context-set-property!
                        context 'timeSignatureFraction fraction)
                      (ly:context-set-property!
-                       context 'baseMoment (fraction->moment my-base-fraction))
+                       context 'baseMoment (ly:make-moment my-base-length))
                      (ly:context-set-property!
                        context 'beatStructure my-beat-structure)
                      (ly:context-set-property!