From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 5 Nov 2006 22:20:24 +0000 (+0100)
Subject: ignore dynamic and pedal line spanners.
X-Git-Tag: release/2.10.0-2~32^2~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3f064aed93e63be2f8cb3eabe74f2c998edda380;p=lilypond.git

ignore dynamic and pedal line spanners.
---

diff --git a/input/regression/instrument-name-dynamic.ly b/input/regression/instrument-name-dynamic.ly
new file mode 100644
index 0000000000..5edc1c0354
--- /dev/null
+++ b/input/regression/instrument-name-dynamic.ly
@@ -0,0 +1,20 @@
+\version "2.9.28"
+
+\header {
+  texidoc = "
+  Instrument names (aligned on axis group spanners) ignore dynamic and
+  pedal line spanners."
+}
+
+\relative {
+  \set Staff.shortInstrumentName = "foo"
+  f1 | f1 | f1 |
+  f1\< | f1 | f1\! |
+}
+
+\paper {
+  line-width = 3\cm
+  indent = 0\cm
+}
+
+% EOF
diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 6a4bd93f1c..377d66b832 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -99,6 +99,11 @@ Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
 {
   if (dynamic_cast<Spanner *> (info.grob ())
       && Axis_group_interface::has_axis (info.grob (), Y_AXIS)
+
+      /* ugh. */
+
+      && !info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
+      && !info.grob ()->internal_has_interface (ly_symbol2scm ("piano-pedal-interface"))
       && (!Align_interface::has_interface (info.grob ())))
     {
       axis_groups_.push_back (info.grob ());