X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=cacb2809aa80f99b18b995b123055d6795d6ed00;hb=a04cebcd9706fd5457d250b2d5df2d54dfc1c8cc;hp=a900154032f243e6f38c97596e11c28adb0bce61;hpb=3e08e326e7c38c81d3355a3f2e7ef8eb48bd121e;p=lilypond.git

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index a900154032..cacb2809aa 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -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,33 +120,33 @@ 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);
 
 ADD_TRANSLATOR (Instrument_name_engraver,
-
 		/* doc */
-		"Creates a system start text for instrument or vocal names.",
+		"Create a system start text for instrument or vocal names.",
 		
 		/* create */
 		"InstrumentName ",
@@ -158,7 +156,8 @@ ADD_TRANSLATOR (Instrument_name_engraver,
 		"shortInstrumentName "
 		"instrumentName "
 		"shortVocalName "
-		"vocalName "
-		,
+		"vocalName ",
 
-		/* write */ "");
+		/* write */
+		""
+		);