X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=d339fbce612e94c19638c33ed0da5c532b07f89b;hb=ef5a42b89fce52317d2b8b0e176e5a012687f2c3;hp=c453e95411053eed99d8492a56a2b1a90843565b;hpb=5670dc898dbedc105b5ff0719959317850ef443d;p=lilypond.git

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index c453e95411..d339fbce61 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@ protected:
   SCM short_text_;
 
   vector<Grob *> axis_groups_;
+  vector<Grob *> backup_axis_groups_;
 
   virtual void finalize ();
   DECLARE_ACKNOWLEDGER (axis_group);
@@ -88,8 +89,8 @@ Instrument_name_engraver::consider_start_spanner ()
   if ((Text_interface::is_markup (long_text)
        || Text_interface::is_markup (short_text))
       && (!text_spanner_
-          || short_text_ != short_text
-          || long_text_ != long_text))
+          || !scm_is_eq (short_text_, short_text)
+          || !scm_is_eq (long_text_, long_text)))
     {
       if (text_spanner_)
         stop_spanner ();
@@ -106,7 +107,7 @@ Instrument_name_engraver::start_spanner ()
 {
   text_spanner_ = make_spanner ("InstrumentName", SCM_EOL);
 
-  Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
+  Grob *col = unsmob<Grob> (get_property ("currentCommandColumn"));
   text_spanner_->set_bound (LEFT, col);
   text_spanner_->set_property ("text", short_text_);
   text_spanner_->set_property ("long-text", long_text_);
@@ -114,7 +115,7 @@ Instrument_name_engraver::start_spanner ()
   /*
     UGH, should handle this in Score_engraver.
   */
-  Grob *system = unsmob_grob (get_property ("rootSystem"));
+  Grob *system = unsmob<Grob> (get_property ("rootSystem"));
   if (system)
     Axis_group_interface::add_element (system, text_spanner_);
   else
@@ -126,16 +127,21 @@ Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
 {
   if (dynamic_cast<Spanner *> (info.grob ())
       && Axis_group_interface::has_axis (info.grob (), Y_AXIS)
-      && Page_layout_problem::is_spaceable (info.grob ())
 
       /* ugh. */
 
       && !info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
       && !info.grob ()->internal_has_interface (ly_symbol2scm ("piano-pedal-interface"))
       && !info.grob ()->internal_has_interface (ly_symbol2scm ("volta-interface"))
-      && (!Align_interface::has_interface (info.grob ())))
+      && (!has_interface<Align_interface> (info.grob ())))
     {
-      axis_groups_.push_back (info.grob ());
+      if (Page_layout_problem::is_spaceable (info.grob ()))
+        axis_groups_.push_back (info.grob ());
+      else
+        // By default, don't include non-spaceable staves in the
+        // support of an instrument name.  However, if the only staves
+        // are non-spaceable, we'll fall back to using them.
+        backup_axis_groups_.push_back (info.grob ());
     }
 }
 
@@ -149,13 +155,16 @@ Instrument_name_engraver::finalize ()
 void
 Instrument_name_engraver::stop_spanner ()
 {
+  if (axis_groups_.empty ())
+    axis_groups_ = backup_axis_groups_;
+
   for (vsize i = 0; i < axis_groups_.size (); i++)
     Pointer_group_interface::add_grob (text_spanner_,
                                        ly_symbol2scm ("elements"),
                                        axis_groups_[i]);
 
   text_spanner_->set_bound (RIGHT,
-                            unsmob_grob (get_property ("currentCommandColumn")));
+                            unsmob<Grob> (get_property ("currentCommandColumn")));
 
   Pointer_group_interface::set_ordered (text_spanner_,
                                         ly_symbol2scm ("elements"),