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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index d35e065afb..c453e95411 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -1,18 +1,30 @@
 /*
-  instrument-name-engraver.cc -- implement Instrument_name_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2007 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  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"
 
@@ -27,16 +39,25 @@ protected:
   SCM long_text_;
   SCM short_text_;
 
-  vector<Grob*> axis_groups_;
-  
+  vector<Grob *> axis_groups_;
+
   virtual void finalize ();
   DECLARE_ACKNOWLEDGER (axis_group);
   void process_music ();
   void start_spanner ();
   void consider_start_spanner ();
   void stop_spanner ();
+
+  virtual void derived_mark () const;
 };
 
+void
+Instrument_name_engraver::derived_mark () const
+{
+  scm_gc_mark (long_text_);
+  scm_gc_mark (short_text_);
+}
+
 Instrument_name_engraver::Instrument_name_engraver ()
 {
   text_spanner_ = 0;
@@ -58,22 +79,21 @@ Instrument_name_engraver::consider_start_spanner ()
   SCM short_text = get_property ("shortInstrumentName");
 
   if (!(Text_interface::is_markup (long_text)
-	|| Text_interface::is_markup (short_text)))
+        || Text_interface::is_markup (short_text)))
     {
       long_text = get_property ("vocalName");
       short_text = get_property ("shortVocalName");
     }
-  
+
   if ((Text_interface::is_markup (long_text)
        || Text_interface::is_markup (short_text))
       && (!text_spanner_
-	  || short_text_ != short_text
-	  || long_text_ != long_text))
+          || short_text_ != short_text
+          || long_text_ != long_text))
     {
       if (text_spanner_)
-	stop_spanner ();
+        stop_spanner ();
 
-      
       short_text_ = short_text;
       long_text_ = long_text;
 
@@ -85,7 +105,7 @@ void
 Instrument_name_engraver::start_spanner ()
 {
   text_spanner_ = make_spanner ("InstrumentName", SCM_EOL);
-	  
+
   Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
   text_spanner_->set_bound (LEFT, col);
   text_spanner_->set_property ("text", short_text_);
@@ -101,17 +121,18 @@ Instrument_name_engraver::start_spanner ()
     text_spanner_->programming_error ("cannot find root system");
 }
 
-
 void
 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 ())))
     {
       axis_groups_.push_back (info.grob ());
@@ -122,43 +143,43 @@ void
 Instrument_name_engraver::finalize ()
 {
   if (text_spanner_)
-    {
-      stop_spanner ();
-    }
+    stop_spanner ();
 }
 
 void
 Instrument_name_engraver::stop_spanner ()
 {
   for (vsize i = 0; i < axis_groups_.size (); i++)
-    Pointer_group_interface::add_grob (text_spanner_, ly_symbol2scm ("elements"), axis_groups_[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"), false);
+  Pointer_group_interface::set_ordered (text_spanner_,
+                                        ly_symbol2scm ("elements"),
+                                        false);
 
   text_spanner_ = 0;
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group);
 
 ADD_TRANSLATOR (Instrument_name_engraver,
-		/* doc */
-		"Create a system start text for instrument or vocal names.",
-		
-		/* create */
-		"InstrumentName ",
-		
-		/* read */
-		"currentCommandColumn "
-		"shortInstrumentName "
-		"instrumentName "
-		"shortVocalName "
-		"vocalName ",
-
-		/* write */
-		""
-		);
+                /* doc */
+                "Create a system start text for instrument or vocal names.",
+
+                /* create */
+                "InstrumentName ",
+
+                /* read */
+                "currentCommandColumn "
+                "instrumentName "
+                "shortInstrumentName "
+                "shortVocalName "
+                "vocalName ",
+
+                /* write */
+                ""
+               );