Run grand replace for 2015.

[lilypond.git] / lily / instrument-name-engraver.cc

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index e3214069b3955bc3602c7b43ead87c33b410d8b0..41c68a5a14c099f974d57db6054e92c8dfd51d63 100644 (file)
--- 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
@@ -17,13 +17,14 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "align-interface.hh"
+#include "axis-group-interface.hh"
 #include "engraver.hh"
+#include "page-layout-problem.hh"
 #include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
-#include "axis-group-interface.hh"
-#include "align-interface.hh"
-#include "text-interface.hh"
 #include "system.hh"
+#include "text-interface.hh"
 
 #include "translator.icc"
 
@@ -39,6 +40,7 @@ protected:
   SCM short_text_;
 
   vector<Grob *> axis_groups_;
+  vector<Grob *> backup_axis_groups_;
 
   virtual void finalize ();
   DECLARE_ACKNOWLEDGER (axis_group);
@@ -105,7 +107,7 @@ Instrument_name_engraver::start_spanner ()
 {
   text_spanner_ = make_spanner ("InstrumentName", SCM_EOL);
 
-  Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
+  Grob *col = Grob::unsmob (get_property ("currentCommandColumn"));
   text_spanner_->set_bound (LEFT, col);
   text_spanner_->set_property ("text", short_text_);
   text_spanner_->set_property ("long-text", long_text_);
@@ -113,7 +115,7 @@ Instrument_name_engraver::start_spanner ()
   /*
     UGH, should handle this in Score_engraver.
   */
-  Grob *system = unsmob_grob (get_property ("rootSystem"));
+  Grob *system = Grob::unsmob (get_property ("rootSystem"));
   if (system)
     Axis_group_interface::add_element (system, text_spanner_);
   else
@@ -133,7 +135,13 @@ Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
       && !info.grob ()->internal_has_interface (ly_symbol2scm ("volta-interface"))
       && (!Align_interface::has_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 ());
     }
 }
 
@@ -147,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")));
+                            Grob::unsmob (get_property ("currentCommandColumn")));
 
   Pointer_group_interface::set_ordered (text_spanner_,
                                         ly_symbol2scm ("elements"),