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 bffcf98426f727b79f1613a10b9b67a4b7a62ee4..a289aea5b3d136e20211a12cfd3a8a4978e58932 100644 (file)
--- 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 564b51d01d15937c332011d9e9a866de964b9a0f..14f57fedd65e861d817cf24a2ca9edaa584f6f0d 100644 (file)
--- 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