From b4ba6444fc75af979d4c3e40a9e8db7fcd138ae9 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 6 Jan 2003 23:39:37 +0000 Subject: [PATCH] *** empty log message *** --- lily/chord-name.cc | 31 +------------------------------ lily/include/chord-name.hh | 1 - scm/grob-property-description.scm | 1 - 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/lily/chord-name.cc b/lily/chord-name.cc index 97c69f02e8..80c58ee5e5 100644 --- a/lily/chord-name.cc +++ b/lily/chord-name.cc @@ -33,37 +33,8 @@ Chord_name::after_line_breaking (SCM smob) return SCM_UNSPECIFIED; } -MAKE_SCHEME_CALLBACK (Chord_name,brew_molecule,1); -SCM -Chord_name::brew_molecule (SCM smob) -{ - Grob *me = unsmob_grob (smob); - SCM style = me->get_grob_property ("style"); - - if (!gh_symbol_p (style)) - style = ly_symbol2scm ("banter"); - - SCM chord = me->get_grob_property ("chord"); - SCM func = me->get_grob_property ("chord-name-function"); - SCM text = gh_call2 (func, style, chord); - - SCM properties = Font_interface::font_alist_chain (me); - Molecule mol = Text_item::text2molecule (me, text, properties); - - SCM space = me->get_grob_property ("word-space"); - if (gh_number_p (space)) - { - Molecule m; - m.set_empty (false); - mol.add_at_edge (X_AXIS, RIGHT, m, gh_scm2double (space)* - Staff_symbol_referencer::staff_space (me), 0); - } - - return mol.smobbed_copy (); -} - ADD_INTERFACE (Chord_name, "chord-name-interface", "generate a chord name", - "pitches chord style chord-name-function inversion bass begin-of-line-visible"); + "pitches chord style inversion bass begin-of-line-visible"); diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh index 69b6a1ef7c..39f82ffaf5 100644 --- a/lily/include/chord-name.hh +++ b/lily/include/chord-name.hh @@ -16,7 +16,6 @@ class Chord_name { public: - DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM )); DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM )); static bool has_interface (Grob*); }; diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index 08f0ced821..f7034298fd 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -585,7 +585,6 @@ staff in a row more often, when the heights of the notes vary. (grob-property-description 'causes list? "list of cause objects; these can be music objects or grobs.") (grob-property-description 'flag-count number? "") -(grob-property-description 'chord-name-function procedure? "DOCME") (grob-property-description 'chord-tremolo boolean? "if set, this beam is a tremolo. TODO: use interface for this!") (grob-property-description 'chord pair? "?") (grob-property-description 'begin-of-line-visible boolean? "?") -- 2.39.5