Merge branch 'lilypond/translation'

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index f39677ffffcb0774be2b32142964e8ff21ee9abf..26a6fdd04d80066c3d879b4880e8d0ff4772c0d7 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--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2010 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
@@ -46,8 +46,17 @@ protected:
   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;
@@ -121,6 +130,7 @@ Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
 
       && !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 ());
@@ -164,8 +174,8 @@ ADD_TRANSLATOR (Instrument_name_engraver,
                
                /* read */
                "currentCommandColumn "
-               "shortInstrumentName "
                "instrumentName "
+               "shortInstrumentName "
                "shortVocalName "
                "vocalName ",