From a04cebcd9706fd5457d250b2d5df2d54dfc1c8cc Mon Sep 17 00:00:00 2001
From: Neil Puttock <n.puttock@gmail.com>
Date: Sun, 22 Nov 2009 23:21:18 +0000
Subject: [PATCH] Remove duplicate #include in instrument-name-engraver.cc.

---
 lily/instrument-name-engraver.cc | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index d3ee12950e..cacb2809aa 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -27,7 +27,7 @@ protected:
   SCM long_text_;
   SCM short_text_;
 
-  vector<Grob*> axis_groups_;
+  vector<Grob *> axis_groups_;
   
   virtual void finalize ();
   DECLARE_ACKNOWLEDGER (axis_group);
@@ -63,7 +63,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 +73,6 @@ Instrument_name_engraver::consider_start_spanner ()
       if (text_spanner_)
 	stop_spanner ();
 
-      
       short_text_ = short_text;
       long_text_ = long_text;
 
@@ -85,7 +84,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 +100,6 @@ Instrument_name_engraver::start_spanner ()
     text_spanner_->programming_error ("cannot find root system");
 }
 
-
 void
 Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
 {
@@ -122,26 +120,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);
 
-- 
2.39.5