From ab0cdaac534b56bade64d957ed2cb45b3014ae62 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 23 Sep 2004 19:15:03 +0000 Subject: [PATCH] remove Note_head::extent. --- ChangeLog | 4 ++++ lily/include/note-head.hh | 1 - lily/note-head.cc | 15 --------------- scm/define-grobs.scm | 4 ---- scm/safe-lily.scm | 1 - 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3e3708fd3..4b741c5fe3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-09-23 Han-Wen Nienhuys + + * lily/note-head.cc: remove Note_head::extent. + 2004-09-23 Graham Percival * Documentation/user/tutorial.itely: do manual style 2-space diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index 863db83d17..88173d1b0e 100644 --- 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 74ee76e732..7ab1d8b9d0 100644 --- 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 99696e7a76..e5e930b99e 100644 --- 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 974cf6fc9e..165da12841 100644 --- 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 -- 2.39.2