remove Note_head::extent.

diff --git a/ChangeLog b/ChangeLog
index b3e3708fd365a41459bc110d7531db8935115e6a..4b741c5fe348809351a6b68e5ee313c0c0fc7fe5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-23  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/note-head.cc: remove Note_head::extent.
+
 2004-09-23  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/tutorial.itely: do manual style 2-space

diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh
index 863db83d17f0f35b8f665ff604274b591260492c..88173d1b0e34d65f6931a221c061fa4119a42e43 100644 (file)
--- a/lily/include/note-head.hh
+++ b/lily/include/note-head.hh
@@ -21,7 +21,6 @@ class Note_head
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM ));
-  static Interval head_extent (Grob*, Axis);
   DECLARE_SCHEME_CALLBACK (brew_ez_stencil, (SCM));
   DECLARE_SCHEME_CALLBACK (extent, (SCM,SCM));
   static bool has_interface (Grob*);

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 74ee76e7321d8939672413ea157f57dcbcf1e74e..7ab1d8b9d05f70de895115f5dc7f77607524b435 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -85,21 +85,6 @@ Note_head::head_extent (Grob *me, Axis a)
   return Interval (0,0);
 }
 
-/*
-  This is necessary to prevent a cyclic dependency: the appearance of
-  the ledgers depends on positioning, so the Grob::get_stencil () can
-  not be used for determining the note head extent.
-  
- */ 
-MAKE_SCHEME_CALLBACK (Note_head,extent,2);
-SCM
-Note_head::extent (SCM smob, SCM axis)  
-{
-  Grob *me = unsmob_grob (smob);
-
-  return ly_interval2scm (head_extent (me, (Axis) scm_to_int (axis)));
-}
-
 MAKE_SCHEME_CALLBACK (Note_head,brew_ez_stencil,1);
 SCM
 Note_head::brew_ez_stencil (SCM smob)

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 99696e7a76f15b17840d5f5a048fe82fee74bcec..e5e930b99e340ca5fcf88322d573298aa8d75a52 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -76,8 +76,6 @@
        (style . default)
        (print-function . ,Note_head::print)
        (glyph-name-procedure . ,find-notehead-symbol)
-       (X-extent-callback . ,Note_head::extent)
-       (Y-extent-callback . ,Note_head::extent)
        (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
        (meta . ((interfaces . (font-interface note-head-interface
                                               ambitus-interface
@@ -733,8 +731,6 @@
        (print-function . ,Note_head::print)
        (ligature-primitive-callback . ,Note_head::print)
        (glyph-name-procedure . ,find-notehead-symbol)
-       (X-extent-callback . ,Note_head::extent)
-       (Y-extent-callback . ,Note_head::extent)
        (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
        (stem-attachment-function . ,note-head-style->attachment-coordinates)
        (meta . ((interfaces . (rhythmic-grob-interface

diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm
index 974cf6fc9e68ed0574c2b0d1bc368efbcf2d3965..165da128413e6d5f827444b59d67c7759ba3296b 100644 (file)
--- a/scm/safe-lily.scm
+++ b/scm/safe-lily.scm
@@ -231,7 +231,6 @@
      Multi_measure_rest::percent
      Multi_measure_rest::print
      Multi_measure_rest::set_spacing_rods
-     Note_head::extent
      Note_head::print
      Note_head::brew_ez_stencil
      Ottava_bracket::print