X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-switch-engraver.cc;h=67a58c7e6fca4ebec53bc57ec8f61b409fa12769;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=c9dce0aafb7ff1186a57d7b311027cbbb56b05a3;hpb=711cf44d0ab28f3159230c84d63c0b19199408b0;p=lilypond.git

diff --git a/lily/instrument-switch-engraver.cc b/lily/instrument-switch-engraver.cc
index c9dce0aafb..67a58c7e6f 100644
--- a/lily/instrument-switch-engraver.cc
+++ b/lily/instrument-switch-engraver.cc
@@ -1,29 +1,48 @@
 /*
-  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--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
 
-  (c) 2006 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 "translator.icc"
+#include "text-interface.hh"
 
+#include "translator.icc"
 
 class Instrument_switch_engraver : public Engraver
 {
 
-  TRANSLATOR_DECLARATIONS(Instrument_switch_engraver);
+  TRANSLATOR_DECLARATIONS (Instrument_switch_engraver);
 protected:
   Grob *text_;
   SCM cue_name_;
 
   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 +57,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;
     }
 }
@@ -53,11 +75,16 @@ Instrument_switch_engraver::stop_translation_time_step ()
   text_ = 0;
 }
 
-ADD_TRANSLATOR(Instrument_switch_engraver,
-	       "Create a cue text for taking instrument.",
-			
-	       "InstrumentSwitch ",
+ADD_TRANSLATOR (Instrument_switch_engraver,
+                /* doc */
+                "Create a cue text for taking instrument.",
+
+                /* create */
+                "InstrumentSwitch ",
+
+                /* read */
+                "instrumentCueName ",
 
-	       "instrumentCueName",
-			
-	       "");
+                /* write */
+                ""
+               );