* flower

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 74bb0b21a40e946c7cfb08d3d85a5fc0b9560ae3..1ae35630c6a5b12661c227c03f7a37e20b48be52 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -1,11 +1,10 @@
-/*   
+/*
   instrument-name-engraver.cc -- implement Instrument_name_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
+
   (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+*/
 
 #include "engraver.hh"
 #include "bar-line.hh"
@@ -18,7 +17,7 @@
 
 class Instrument_name_engraver : public Engraver
 {
-  
+
 public:
   TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
 
@@ -40,7 +39,7 @@ Instrument_name_engraver::Instrument_name_engraver ()
 void
 Instrument_name_engraver::initialize ()
 {
-  context ()->set_property ("instrumentSupport", SCM_EOL); 
+  context ()->set_property ("instrumentSupport", SCM_EOL);
 }
 
 void
@@ -58,24 +57,23 @@ void
 Instrument_name_engraver::create_text ()
 {
   if (text_)
-    return ;
-  
+    return;
+
   SCM txt = get_property ("instrument");
-  
+
   if (now_mom () > Moment (0))
     txt = get_property ("instr");
   /*
     UGH.
   */
   if (txt == SCM_EOL)
-    return ;
+    return;
 
-  
   text_ = make_item ("InstrumentName", SCM_EOL);
-      
+
   if (text_->get_property ("text") != txt)
     text_->set_property ("text", txt);
-  
+
 }
 
 void
@@ -88,11 +86,10 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
 
   /*
     Ugh - typechecking for pedal and dynamic sucks.
-   */
-  if (dynamic_cast<Spanner*> (i.grob_)
+  */
+  if (dynamic_cast<Spanner *> (i.grob_)
       && (i.grob_->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
-         || i.grob_->internal_has_interface (ly_symbol2scm ("piano-pedal-interface")))
-         )
+         || i.grob_->internal_has_interface (ly_symbol2scm ("piano-pedal-interface"))))
     return;
 
   /*
@@ -104,13 +101,13 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
     We could also just use stavesFound, but lets keep this working
     without staffs as well.
   */
-  if (dynamic_cast<Spanner*> (i.grob_)
+  if (dynamic_cast<Spanner *> (i.grob_)
       && ((Axis_group_interface::has_interface (i.grob_)
           && Axis_group_interface::has_axis (i.grob_, Y_AXIS)))
       && !Align_interface::has_interface (i.grob_))
     {
       SCM nl = scm_cons (i.grob_->self_scm (),
-                       get_property ("instrumentSupport"));
+                        get_property ("instrumentSupport"));
 
       context ()->set_property ("instrumentSupport", nl);
     }
@@ -121,25 +118,24 @@ Instrument_name_engraver::process_music ()
 {
   /*
     Also create text if barlines in other groups. This allows
-    a name to be attached to lyrics or chords. 
-   */
+    a name to be attached to lyrics or chords.
+  */
   if (scm_is_string (get_property ("whichBar")))
     create_text ();
 }
 
 ADD_TRANSLATOR (Instrument_name_engraver,
-/* descr */       " Prints the name of the instrument (specified by "
-" @code{Staff.instrument} and @code{Staff.instr}) "
-"at the left of the staff. ",
-/* creats*/       "InstrumentName",
-/* accepts */     "",
-/* acks  */      "bar-line-interface axis-group-interface",
-/* reads */       "instrument instr",
-/* write */       "");
+               /* descr */ " Prints the name of the instrument (specified by "
+               " @code{Staff.instrument} and @code{Staff.instr}) "
+               "at the left of the staff. ",
+               /* creats*/ "InstrumentName",
+               /* accepts */ "",
+               /* acks  */ "bar-line-interface axis-group-interface",
+               /* reads */ "instrument instr",
+               /* write */ "");
 
 /****************************************************************/
 
-
 class Vocal_name_engraver : public Instrument_name_engraver
 {
 public:
@@ -147,20 +143,18 @@ public:
   virtual void create_text ();
 };
 
-
 Vocal_name_engraver::Vocal_name_engraver ()
 {
 }
 
-
 void
 Vocal_name_engraver::create_text ()
 {
   if (text_)
-    return ;
-  
+    return;
+
   SCM txt = get_property ("vocalName");
-  
+
   if (now_mom () > Moment (0))
     txt = get_property ("vocNam");
 
@@ -168,23 +162,21 @@ Vocal_name_engraver::create_text ()
     UGH.
   */
   if (txt == SCM_EOL)
-    return ;
-  
+    return;
+
   text_ = make_item ("VocalName", SCM_EOL);
-      
+
   if (text_->get_property ("text") != txt)
     text_->set_property ("text", txt);
-  
-}
-
 
+}
 
 ADD_TRANSLATOR (Vocal_name_engraver,
-/* descr */       " Prints the name of the a lyric voice (specified by "
-" @code{Staff.vocalName} and @code{Staff.vocNam}) "
-"at the left of the staff. ",
-/* creats*/       "VocalName",
-/* accepts */     "",
-/* acks  */      "bar-line-interface axis-group-interface",
-/* reads */       "vocNam vocalName",
-/* write */       "");
+               /* descr */ " Prints the name of the a lyric voice (specified by "
+               " @code{Staff.vocalName} and @code{Staff.vocNam}) "
+               "at the left of the staff. ",
+               /* creats*/ "VocalName",
+               /* accepts */ "",
+               /* acks  */ "bar-line-interface axis-group-interface",
+               /* reads */ "vocNam vocalName",
+               /* write */ "");