X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=e3214069b3955bc3602c7b43ead87c33b410d8b0;hb=a066a93ee74edebb9d238a1bac93c3bc7e8e6e4a;hp=26a6fdd04d80066c3d879b4880e8d0ff4772c0d7;hpb=3b870eb9ab448ebc11a2d6283ad35796b22351aa;p=lilypond.git

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 26a6fdd04d..e3214069b3 100644
--- 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2011 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
@@ -39,7 +39,7 @@ protected:
   SCM short_text_;
 
   vector<Grob *> axis_groups_;
-  
+
   virtual void finalize ();
   DECLARE_ACKNOWLEDGER (axis_group);
   void process_music ();
@@ -78,7 +78,7 @@ Instrument_name_engraver::consider_start_spanner ()
   SCM short_text = get_property ("shortInstrumentName");
 
   if (!(Text_interface::is_markup (long_text)
-	|| Text_interface::is_markup (short_text)))
+        || Text_interface::is_markup (short_text)))
     {
       long_text = get_property ("vocalName");
       short_text = get_property ("shortVocalName");
@@ -87,11 +87,11 @@ Instrument_name_engraver::consider_start_spanner ()
   if ((Text_interface::is_markup (long_text)
        || Text_interface::is_markup (short_text))
       && (!text_spanner_
-	  || short_text_ != short_text
-	  || long_text_ != long_text))
+          || short_text_ != short_text
+          || long_text_ != long_text))
     {
       if (text_spanner_)
-	stop_spanner ();
+        stop_spanner ();
 
       short_text_ = short_text;
       long_text_ = long_text;
@@ -149,36 +149,35 @@ 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]);
-  
+                                       ly_symbol2scm ("elements"),
+                                       axis_groups_[i]);
+
   text_spanner_->set_bound (RIGHT,
-			    unsmob_grob (get_property ("currentCommandColumn")));
+                            unsmob_grob (get_property ("currentCommandColumn")));
 
   Pointer_group_interface::set_ordered (text_spanner_,
-					ly_symbol2scm ("elements"),
-					false);
+                                        ly_symbol2scm ("elements"),
+                                        false);
 
   text_spanner_ = 0;
 }
 
-
 ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group);
 
 ADD_TRANSLATOR (Instrument_name_engraver,
-		/* doc */
-		"Create a system start text for instrument or vocal names.",
-		
-		/* create */
-		"InstrumentName ",
-		
-		/* read */
-		"currentCommandColumn "
-		"instrumentName "
-		"shortInstrumentName "
-		"shortVocalName "
-		"vocalName ",
-
-		/* write */
-		""
-		);
+                /* doc */
+                "Create a system start text for instrument or vocal names.",
+
+                /* create */
+                "InstrumentName ",
+
+                /* read */
+                "currentCommandColumn "
+                "instrumentName "
+                "shortInstrumentName "
+                "shortVocalName "
+                "vocalName ",
+
+                /* write */
+                ""
+               );