X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=aff6336ab74467217df52bd00b4005d8dcbdae59;hb=d3c50bb3e14b4ded57e6747ed5d122fabedebecb;hp=b4e1593a4f147e3b2f49cca116674c22bbf87a1c;hpb=2536405e9584f63d559653183971c0fec57ba037;p=lilypond.git

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index b4e1593a4f..aff6336ab7 100644
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -1,10 +1,13 @@
 /*
-  head-grav.cc -- part of GNU LilyPond
+  tab-note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  based on note-heads-engraver.cc, by Jean-Baptiste Lamy <jiba@tuxfamily.org>,
+
+  (c) 2002--2005
 */
-#include <ctype.h>
-#include <stdio.h>
+
+#include <cctype>
+#include <cstdio>
 
 #include "rhythmic-head.hh"
 #include "output-def.hh"
@@ -22,7 +25,7 @@
 class Tab_note_heads_engraver : public Engraver
 {
   Link_array<Item> notes_;
-  
+
   Link_array<Item> dots_;
   Link_array<Music> note_events_;
   Link_array<Music> tabstring_events_;
@@ -30,19 +33,18 @@ public:
   TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver);
 
 protected:
-  virtual bool try_music (Music *event) ;
+  virtual bool try_music (Music *event);
   virtual void process_music ();
 
   virtual void stop_translation_timestep ();
 };
 
-
 Tab_note_heads_engraver::Tab_note_heads_engraver ()
 {
 }
 
 bool
-Tab_note_heads_engraver::try_music (Music *m) 
+Tab_note_heads_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("note-event"))
     {
@@ -58,41 +60,38 @@ Tab_note_heads_engraver::try_music (Music *m)
     {
       return note_events_.size ();
     }
-  
+
   return false;
 }
 
-
 void
 Tab_note_heads_engraver::process_music ()
 {
-  int j = 0; 
-  for (int i=0; i < note_events_.size (); i++)
+  int j = 0;
+  for (int i = 0; i < note_events_.size (); i++)
     {
       SCM stringTunings = get_property ("stringTunings");
       int number_of_strings = ((int) ly_length (stringTunings));
       bool high_string_one = to_boolean (get_property ("highStringOne"));
 
-      
-      Music * event = note_events_[i];
-      Item * note  = make_item ("TabNoteHead", event->self_scm ());
+      Music *event = note_events_[i];
+      Item *note = make_item ("TabNoteHead", event->self_scm ());
 
-      
-      Music * tabstring_event=0;
+      Music *tabstring_event = 0;
 
-      for (SCM s =event->get_property ("articulations");
-	   !tabstring_event && scm_is_pair (s); s = ly_cdr (s))
+      for (SCM s = event->get_property ("articulations");
+	   !tabstring_event && scm_is_pair (s); s = scm_cdr (s))
 	{
-	  Music * art = unsmob_music (ly_car (s));
+	  Music *art = unsmob_music (scm_car (s));
 
 	  if (art->is_mus_type ("string-number-event"))
 	    tabstring_event = art;
 	}
 
-      if (!tabstring_event  && j < tabstring_events_.size ())
+      if (!tabstring_event && j < tabstring_events_.size ())
 	{
 	  tabstring_event = tabstring_events_[j];
-	  if (j +1 <  tabstring_events_.size ())
+	  if (j +1 < tabstring_events_.size ())
 	    j++;
 	}
 
@@ -108,36 +107,35 @@ Tab_note_heads_engraver::process_music ()
 	  tab_string = high_string_one ? 1 : number_of_strings;
 	  string_found = false;
 	}
-      
+
       Duration dur = *unsmob_duration (event->get_property ("duration"));
       note->set_property ("duration-log",
-			       scm_int2num (dur.duration_log ()));
+			  scm_int2num (dur.duration_log ()));
 
       if (dur.dot_count ())
 	{
-	  Item * d = make_item ("Dots", event->self_scm ());
+	  Item *d = make_item ("Dots", event->self_scm ());
 	  Rhythmic_head::set_dots (note, d);
-	  
+
 	  if (dur.dot_count ()
 	      != scm_to_int (d->get_property ("dot-count")))
 	    d->set_property ("dot-count", scm_int2num (dur.dot_count ()));
 
 	  d->set_parent (note, Y_AXIS);
-	  
+
 	  dots_.push (d);
 	}
-      
-      
+
       SCM scm_pitch = event->get_property ("pitch");
-      SCM proc      = get_property ("tablatureFormat");
+      SCM proc = get_property ("tablatureFormat");
       SCM min_fret_scm = get_property ("minimumFret");
       int min_fret = scm_is_number (min_fret_scm) ? scm_to_int (min_fret_scm) : 0;
 
       while (!string_found)
 	{
 	  int fret = unsmob_pitch (scm_pitch)->semitone_pitch ()
-	    - scm_to_int (scm_list_ref (stringTunings,scm_int2num (tab_string-1)));
-	  if (fret<min_fret)
+	    - scm_to_int (scm_list_ref (stringTunings, scm_int2num (tab_string - 1)));
+	  if (fret < min_fret)
 	    tab_string += high_string_one ? 1 : -1;
 	  else
 	    string_found = true;
@@ -148,9 +146,9 @@ Tab_note_heads_engraver::process_music ()
       int pos = 2 * tab_string - number_of_strings - 1; // No tab-note between the string !!!
       if (to_boolean (get_property ("stringOneTopmost")))
 	pos = -pos;
-      
-      note->set_property ("text", text);      
-      
+
+      note->set_property ("text", text);
+
       note->set_property ("staff-position", scm_int2num (pos));
       notes_.push (note);
     }
@@ -165,12 +163,11 @@ Tab_note_heads_engraver::stop_translation_timestep ()
   tabstring_events_.clear ();
 }
 
-
-ENTER_DESCRIPTION (Tab_note_heads_engraver,
-/* descr */       "Generate one or more tablature noteheads from Music of type NoteEvent.",
-/* creats*/       "TabNoteHead Dots",
-/* accepts */     "note-event string-number-event busy-playing-event",
-/* acks  */      "",
-/* reads */       "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost",
-/* write */       "");
+ADD_TRANSLATOR (Tab_note_heads_engraver,
+		/* descr */ "Generate one or more tablature noteheads from Music of type NoteEvent.",
+		/* creats*/ "TabNoteHead Dots",
+		/* accepts */ "note-event string-number-event busy-playing-event",
+		/* acks  */ "",
+		/* reads */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost",
+		/* write */ "");