From 81c0ec3cc267e2978fbedef992b39a47a80d7c95 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Tue, 26 Feb 2008 18:50:05 +0100 Subject: [PATCH] Set side-axis for InstrumentSwitch grobs InstrumentSwitch was missing a setting for side-axis, which caused a not very helpful warning "side-axis not set." on the command line. I now added the side-axis setting for the InstrumentSwitch and also changed the warning message to include the type of grob for which the setting is missing. --- lily/side-position-interface.cc | 4 +++- scm/define-grobs.scm | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index a3c4ca0..8238ddd 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -295,7 +295,9 @@ Side_position_interface::get_axis (Grob *me) if (scm_is_number (me->get_property ("side-axis"))) return Axis (scm_to_int (me->get_property ("side-axis"))); - me->programming_error ("side-axis not set."); + string msg = String_convert::form_string ("side-axis not set for grob %s.", + me->name ().c_str ())); + me->programming_error (msg); return NO_AXES; } diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index edd5495..33137dd 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -834,6 +834,7 @@ (X-offset . ,ly:self-alignment-interface::x-aligned-on-self) (staff-padding . 2) (direction . ,UP) + (side-axis . ,Y) (self-alignment-X . ,CENTER) (meta . ((class . Item) (interfaces . (side-position-interface -- 1.5.4.3