From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Tue, 26 Feb 2008 17:50:05 +0000 (+0100)
Subject: Set side-axis for InstrumentSwitch grobs
X-Git-Tag: release/2.11.42-1~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fc273c71061c4859cebc95bb91d86c9373d94f64;p=lilypond.git

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.

Signed-off-by: Reinhold Kainhofer <reinhold@kainhofer.com>
---

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index bffcf98426..a289aea5b3 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -296,7 +296,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 564b51d01d..14f57fedd6 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