* lily/rest.cc (polyphonic_offset_callback): new function. Do

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index a072d4f0d9e1a91c222df49be70fe9be883e97a0..9c141f4d1bf1dc526d6d954f5cbf4040a34b23e5 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  1998--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c)  1998--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in linethickness (thicknesses) and
@@ -352,7 +352,7 @@
     (LeftEdge
      . (
        (break-align-symbol . left-edge)
-       (X-extent-callback . ,Grob::point_dimension_callback)
+       (X-extent .  (0 . 0))
        (breakable . #t)
        (space-alist . (
                        (custos . (extra-space . 0.0))
@@ -493,7 +493,7 @@
        (length . 0.66)
        (spacing-procedure . ,Hyphen_spanner::set_spacing_rods)
        (print-function . ,Hyphen_spanner::print)
-       (Y-extent-callback . ,Grob::point_dimension_callback)
+       (Y-extent  . (0 . 0))
        (meta . ((interfaces . (lyric-interface lyric-hyphen-interface
                                                spanner-interface))))
        ))
@@ -503,7 +503,7 @@
        (print-function . ,Lyric_extender::print)
        (thickness . 0.8) ; linethickness
        (minimum-length . 1.5)
-       (Y-extent-callback . ,Grob::point_dimension_callback)
+       (Y-extent . (0 . 0))
        (meta . ((interfaces . (lyric-interface
                                lyric-extender-interface spanner-interface))))
        ))
@@ -769,7 +769,9 @@
        (X-extent-callback . ,Rest::extent_callback)
        (Y-extent-callback . ,Rest::extent_callback)            
        (print-function . ,Rest::print)
-       (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) 
+       (Y-offset-callbacks . (,Staff_symbol_referencer::callback
+                              ,Rest::polyphonic_offset_callback
+                              ))
        (minimum-distance . 0.25)
        (meta . (
                 (interfaces . (font-interface