resolve merge

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index d3ee12950e421888c65c0a19eb75169a43f45503..56fa84ee263a60c2abb275b433d5393d24487c0f 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  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--2009 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 "engraver.hh"
@@ -27,7 +38,7 @@ protected:
   SCM long_text_;
   SCM short_text_;
 
-  vector<Grob*> axis_groups_;
+  vector<Grob *> axis_groups_;
   
   virtual void finalize ();
   DECLARE_ACKNOWLEDGER (axis_group);
@@ -35,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;
@@ -63,7 +83,7 @@ Instrument_name_engraver::consider_start_spanner ()
       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_
@@ -73,7 +93,6 @@ Instrument_name_engraver::consider_start_spanner ()
       if (text_spanner_)
        stop_spanner ();
 
-      
       short_text_ = short_text;
       long_text_ = long_text;
 
@@ -85,7 +104,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,7 +120,6 @@ Instrument_name_engraver::start_spanner ()
     text_spanner_->programming_error ("cannot find root system");
 }
 
-
 void
 Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
 {
@@ -112,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 ());
@@ -122,26 +141,27 @@ 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")));
 
-  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);
 
@@ -154,8 +174,8 @@ ADD_TRANSLATOR (Instrument_name_engraver,
                
                /* read */
                "currentCommandColumn "
-               "shortInstrumentName "
                "instrumentName "
+               "shortInstrumentName "
                "shortVocalName "
                "vocalName ",