From 113845a5b62c77f7ba2d035c15694287077f00ce Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 14 Jun 2010 11:09:11 +0200 Subject: [PATCH] Metronome mark: do away with break-align-symbol . multi-measure-rest. Rather, check directly on class name. This fixes stray warnings. --- lily/metronome-engraver.cc | 11 +++++++++-- scm/define-grobs.scm | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index a1024049d5..db6c66df01 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -84,6 +84,13 @@ Metronome_mark_engraver::acknowledge_break_aligned (Grob_info info) } } +SCM +grob_name_scm (Grob *g) +{ + SCM name_pair = scm_assq (ly_symbol2scm ("name"), g->get_property ("meta")); + return scm_is_pair (name_pair) ? scm_cdr (name_pair) : SCM_EOL; +} + void Metronome_mark_engraver::acknowledge_grob (Grob_info info) { @@ -91,8 +98,8 @@ Metronome_mark_engraver::acknowledge_grob (Grob_info info) if (text_ && !support_ - && scm_member (g->get_property_data ("break-align-symbol"), - text_->get_property_data ("break-align-symbols")) + && scm_member (grob_name_scm (g), + text_->get_property_data ("non-break-align-symbols")) != SCM_BOOL_F) { text_->set_parent (g, X_AXIS); diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 39a2abd8f3..d4e3863c03 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1171,7 +1171,8 @@ (list ly:self-alignment-interface::x-aligned-on-self))))) (self-alignment-X . -1) (break-align-symbol . time-signature) - (break-align-symbols . (time-signature multi-measure-rest)) + (break-align-symbols . (time-signature)) + (non-break-align-symbols . (MultiMeasureRest)) (meta . ((class . Item) (interfaces . (font-interface metronome-mark-interface @@ -1181,7 +1182,6 @@ (MultiMeasureRest . ( - (break-align-symbol . multi-measure-rest) (expand-limit . 10) (hair-thickness . 2.0) (padding . 1) -- 2.39.2