X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=c4aff10fc0e592f70c8736584c4374d949ea570a;hb=b7b68363b15a8f723b55338b613de077ce5e1bdd;hp=fb2b29101a89618c44a84f3f29e87db88c16e66b;hpb=0a8f98072c53d877cbb53dd490ba4394d03fa8d2;p=lilypond.git

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index fb2b29101a..c4aff10fc0 100644
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -1,14 +1,15 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <ctype.h>
-#include <stdio.h>
+
+#include <cctype>
+#include <cstdio>
 
 #include "rhythmic-head.hh"
-#include "paper-def.hh"
-#include "musical-request.hh"
+#include "output-def.hh"
+#include "event.hh"
 #include "dots.hh"
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
@@ -17,28 +18,27 @@
 #include "warn.hh"
 
 /**
-  make (guitar-like) tablature note
- */
+   make (guitar-like) tablature note
+*/
 class Tab_note_heads_engraver : public Engraver
 {
   Link_array<Item> notes_;
   
   Link_array<Item> dots_;
-  Link_array<Music> note_reqs_;
-  Link_array<Music> tabstring_reqs_;
+  Link_array<Music> note_events_;
+  Link_array<Music> tabstring_events_;
 public:
-  TRANSLATOR_DECLARATIONS(Tab_note_heads_engraver);
+  TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver);
 
 protected:
-  virtual void start_translation_timestep ();
-  virtual bool try_music (Music *req) ;
+  virtual bool try_music (Music *event) ;
   virtual void process_music ();
 
   virtual void stop_translation_timestep ();
 };
 
 
-Tab_note_heads_engraver::Tab_note_heads_engraver()
+Tab_note_heads_engraver::Tab_note_heads_engraver ()
 {
 }
 
@@ -47,20 +47,17 @@ Tab_note_heads_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("note-event"))
     {
-      note_reqs_.push (m);
+      note_events_.push (m);
       return true;
     }
   else if (m->is_mus_type ("string-number-event"))
     {
-      while(tabstring_reqs_.size () < note_reqs_.size ()-1)
-	tabstring_reqs_.push(0);
-      
-      tabstring_reqs_.push (m);
+      tabstring_events_.push (m);
       return true;
     }
   else if (m->is_mus_type ("busy-playing-event"))
     {
-      return note_reqs_.size ();
+      return note_events_.size ();
     }
   
   return false;
@@ -70,77 +67,92 @@ Tab_note_heads_engraver::try_music (Music *m)
 void
 Tab_note_heads_engraver::process_music ()
 {
-  for (int i=0; i < note_reqs_.size (); i++)
+  int j = 0; 
+  for (int i = 0; i < note_events_.size (); i++)
     {
       SCM stringTunings = get_property ("stringTunings");
-      int number_of_strings = ((int) gh_length(stringTunings));
-      bool high_string_one = to_boolean(get_property ("highStringOne"));
+      int number_of_strings = ((int) ly_length (stringTunings));
+      bool high_string_one = to_boolean (get_property ("highStringOne"));
 
-      Item * note  = new Item (get_property ("TabNoteHead"));
       
-      Music * req = note_reqs_[i];
+      Music * event = note_events_[i];
+      Item * note  = make_item ("TabNoteHead", event->self_scm ());
+
       
-      Music * tabstring_req = 0;
-      if(tabstring_reqs_.size()>i)
-	tabstring_req = tabstring_reqs_[i];
-      // printf("%d %d\n",tabstring_reqs_.size(),i);
-      // size_t lenp;
+      Music * tabstring_event = 0;
+
+      for (SCM s = event->get_property ("articulations");
+	   !tabstring_event && scm_is_pair (s); s = scm_cdr (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 ())
+	{
+	  tabstring_event = tabstring_events_[j];
+	  if (j +1 <  tabstring_events_.size ())
+	    j++;
+	}
+
       int tab_string;
       bool string_found;
-      if (tabstring_req) {
-	//char* tab_string_as_string = gh_scm2newstr(tabstring_req->get_mus_property ("text"), &lenp);
-	//tab_string = atoi(tab_string_as_string);
-	tab_string = gh_scm2int(tabstring_req->get_mus_property ("string-number"));
-	string_found = true;
-      }
-      else {
-	tab_string = high_string_one ? 1 : number_of_strings;
-	string_found = false;
-      }
-      
-      Duration dur = *unsmob_duration (req->get_mus_property ("duration"));
+      if (tabstring_event)
+	{
+	  tab_string = scm_to_int (tabstring_event->get_property ("string-number"));
+	  string_found = true;
+	}
+      else
+	{
+	  tab_string = high_string_one ? 1 : number_of_strings;
+	  string_found = false;
+	}
       
-      note->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ()));
+      Duration dur = *unsmob_duration (event->get_property ("duration"));
+      note->set_property ("duration-log",
+			       scm_int2num (dur.duration_log ()));
 
       if (dur.dot_count ())
 	{
-	  Item * d = new Item (get_property ("Dots"));
+	  Item * d = make_item ("Dots", event->self_scm ());
 	  Rhythmic_head::set_dots (note, d);
 	  
 	  if (dur.dot_count ()
-	      != gh_scm2int (d->get_grob_property ("dot-count")))
-	    d->set_grob_property ("dot-count", gh_int2scm (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);
-	  announce_grob (d, SCM_EOL);
+	  
 	  dots_.push (d);
 	}
       
       
-      SCM scm_pitch = req->get_mus_property ("pitch");
+      SCM scm_pitch = event->get_property ("pitch");
       SCM proc      = get_property ("tablatureFormat");
       SCM min_fret_scm = get_property ("minimumFret");
-      int min_fret = gh_number_p(min_fret_scm) ? gh_scm2int(min_fret_scm) : 0;
-
-      while(!string_found) {
-	int fret = unsmob_pitch(scm_pitch)->semitone_pitch()
-	  - gh_scm2int(gh_list_ref(stringTunings,gh_int2scm(tab_string-1)));
-	if(fret<min_fret)
-	  tab_string += high_string_one ? 1 : -1;
-	else
-	  string_found = true;
-      }
+      int min_fret = scm_is_number (min_fret_scm) ? scm_to_int (min_fret_scm) : 0;
 
-      SCM text = gh_call3 (proc, gh_int2scm (tab_string), stringTunings, scm_pitch);
+      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)
+	    tab_string += high_string_one ? 1 : -1;
+	  else
+	    string_found = true;
+	}
+
+      SCM text = scm_call_3 (proc, scm_int2num (tab_string), stringTunings, scm_pitch);
 
       int pos = 2 * tab_string - number_of_strings - 1; // No tab-note between the string !!!
-      if(to_boolean(get_property("stringOneTopmost")))
+      if (to_boolean (get_property ("stringOneTopmost")))
 	pos = -pos;
       
-      note->set_grob_property ("text", text);      
+      note->set_property ("text", text);      
       
-      note->set_grob_property ("staff-position", gh_int2scm (pos));
-      announce_grob (note, req->self_scm());
+      note->set_property ("staff-position", scm_int2num (pos));
       notes_.push (note);
     }
 }
@@ -148,34 +160,18 @@ Tab_note_heads_engraver::process_music ()
 void
 Tab_note_heads_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < notes_.size (); i++)
-    {
-      typeset_grob (notes_[i]);
-    }
-
   notes_.clear ();
-  for (int i=0; i < dots_.size (); i++)
-    {
-      typeset_grob (dots_[i]);
-    }
   dots_.clear ();
-  
-  note_reqs_.clear ();
-  
-  tabstring_reqs_.clear ();
-}
-
-void
-Tab_note_heads_engraver::start_translation_timestep ()
-{
+  note_events_.clear ();
+  tabstring_events_.clear ();
 }
 
 
-ENTER_DESCRIPTION(Tab_note_heads_engraver,
-/* descr */       "Generate one or more tablature noteheads from Music of type Note_req.",
+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 */       "centralCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost",
+/* reads */       "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost",
 /* write */       "");