X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-switch-engraver.cc;h=8bd364646c58af80b5089ef388f34b70f9c00f56;hb=23a1ad9c2dca3c5fa3e14b2ec5640c1d745d18d8;hp=67a6803a0ec8d57394f3f1a4805b7825bc863494;hpb=e3fd23261e5feb8d3809b887d34fc4517fe5f169;p=lilypond.git

diff --git a/lily/instrument-switch-engraver.cc b/lily/instrument-switch-engraver.cc
index 67a6803a0e..8bd364646c 100644
--- a/lily/instrument-switch-engraver.cc
+++ b/lily/instrument-switch-engraver.cc
@@ -1,29 +1,49 @@
 /*
-  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--2010 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 "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 ()
 {
@@ -31,15 +51,21 @@ Instrument_switch_engraver::Instrument_switch_engraver ()
   text_ = 0;
 }
 
+/*
+  TODO: should use an event.
+ */
 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;
     }
 }
@@ -50,13 +76,16 @@ Instrument_switch_engraver::stop_translation_time_step ()
   text_ = 0;
 }
 
-ADD_TRANSLATOR(Instrument_switch_engraver,
-	       "Create a cue text for taking instrument.",
+ADD_TRANSLATOR (Instrument_switch_engraver,
+		/* doc */
+		"Create a cue text for taking instrument.",
 			
-	       "InstrumentSwitch ",
-
-	       "",
+		/* create */
+		"InstrumentSwitch ",
 
-	       "instrumentCueName",
+		/* read */
+		"instrumentCueName ",
 			
-	       "");
+		/* write */
+		""
+		);