Imported Upstream version 2.14.2

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

diff --git a/lily/instrument-switch-engraver.cc b/lily/instrument-switch-engraver.cc
index a2830554ede8a30e50acfc5c8191815288d7e984..8ae322fae0e7d1c24587b452cb5606ff02839b07 100644 (file)
--- a/lily/instrument-switch-engraver.cc
+++ b/lily/instrument-switch-engraver.cc
@@ -1,14 +1,27 @@
 /*
-  instrument-switch-engraver.cc -- implement
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
 
-  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
 
+  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 "engraver.hh"
 #include "item.hh"
+#include "text-interface.hh"
+
 #include "translator.icc"
 
 
@@ -22,8 +35,15 @@ protected:
 
   void stop_translation_time_step ();
   void process_music ();
+
+  virtual void derived_mark () const;
 };
 
+void
+Instrument_switch_engraver::derived_mark () const
+{
+  scm_gc_mark (cue_name_);
+}
 
 Instrument_switch_engraver::Instrument_switch_engraver ()
 {
@@ -38,11 +58,14 @@ void
 Instrument_switch_engraver::process_music ()
 {
   SCM cue_text = get_property ("instrumentCueName");
-  
+
   if (!scm_is_eq (cue_name_, cue_text))
     {
-      text_ = make_item ("InstrumentSwitch", SCM_EOL);
-      text_->set_property ("text", cue_text);
+      if (Text_interface::is_markup (cue_text))
+        {
+          text_ = make_item ("InstrumentSwitch", SCM_EOL);
+          text_->set_property ("text", cue_text);
+        }
       cue_name_ = cue_text;
     }
 }