diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2005-10-21 13:29:42 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2005-10-21 13:29:42 +0000 |
| commit | 31a6650e2b2a5c1cae3237ee47b80cd43d084d53 (patch) | |
| tree | 1da6154277870b8f3bede5c1ea0b5b8eb7c86c04 /lily/balloon.cc | |
| parent | bbe309d3187641b47d8509b8d162f3f96652d2ea (diff) | |
* lily/grob.cc: remove X-extent-callback / Y-extent-callback.
* scm/define-grob-properties.scm (all-user-grob-properties):
remove callback property.
* lily/include/grob.hh (class Grob): remove property_callbacks_
member. Properties of procedure type are assumed to be callbacks.
* lily/ligature-engraver.cc (override_stencil_callback):
rewrite. Use noteHeadLigaturePrimitive as source.
* scm/define-grob-properties.scm (all-internal-grob-properties):
remove ligature-primitive-callback
* lily/include/dimension-cache.hh (class Dimension_cache): make
class, with Grob as friend.
* lily/grob.cc: remove set_extent_callback(), set_extent() and
has_extent_callback()
* scm/translation-functions.scm (format-new-bass-figure): read
figuredBassPlusDirection
* scm/define-context-properties.scm
(all-user-translation-properties): add figuredBassPlusDirection.
* lily/staff-spacing.cc (next_notes_correction): oops. Init wishes.
* lily/align-interface.cc (set_ordered): new function.
* lily/grob.cc (flush_extent_cache): rewrite.
* lily/dimension-cache.cc (Dimension_cache): cache extent as
Interval pointer directly.
* lily/main.cc (setup_paths): insert extra / .
(setup_paths): junk cff entry.
* lily/font-config.cc (init_fontconfig): only add type1 / otf
directories.
* lily/axis-group-engraver.cc (finalize): remove
extraVerticalExtent, minimumVerticalExtent verticalExtent.
* lily/grob.cc (Grob): don't set extent from ctor.
(extent): use property callbacks.
* lily/axis-group-interface.cc: remove set_axes() function.
* lily/grob-property.cc (del_property): new function.
Diffstat (limited to 'lily/balloon.cc')
| -rw-r--r-- | lily/balloon.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lily/balloon.cc b/lily/balloon.cc index 20508d8db3..fb7ac913d6 100644 --- a/lily/balloon.cc +++ b/lily/balloon.cc @@ -28,12 +28,7 @@ Balloon_interface::print (SCM smob) { Grob *me = unsmob_grob (smob); - SCM cb = me->get_property ("balloon-original-callback"); - SCM stil = SCM_EOL; - - if (ly_is_procedure (cb)) - stil = scm_call_1 (cb, smob); - + SCM stil = me->get_property ("original-stencil"); if (!unsmob_stencil (stil)) return stil; @@ -85,5 +80,11 @@ Balloon_interface::print (SCM smob) ADD_INTERFACE (Balloon_interface, "text-balloon-interface", "A collection of routines to put text balloons around an object.", - "balloon-padding balloon-text-props balloon-text-offset balloon-text balloon-original-callback"); + + /* properties */ + "balloon-padding " + "balloon-text-props " + "balloon-text-offset " + "balloon-text " + "original-stencil "); |