* lily/all-font-metrics.cc (find_font): Add "lm" to try-AFM-first

[lilypond.git] / lily / tab-note-heads-engraver.cc

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index cfab374043b78b05173c781e6e082cf65ad28e33..57309800922cb5f6a9934d6fdc349af7b5a108fe 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -1,13 +1,14 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--2003 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 "output-def.hh"
 #include "event.hh"
 #include "dots.hh"
 #include "dot-column.hh"
@@ -27,7 +28,7 @@ class Tab_note_heads_engraver : public Engraver
   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 bool try_music (Music *event) ;
@@ -37,7 +38,7 @@ protected:
 };
 
 
-Tab_note_heads_engraver::Tab_note_heads_engraver()
+Tab_note_heads_engraver::Tab_note_heads_engraver ()
 {
 }
 
@@ -70,20 +71,20 @@ Tab_note_heads_engraver::process_music ()
   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  = make_item ("TabNoteHead");
       
       Music * event = note_events_[i];
+      Item * note  = make_item ("TabNoteHead", event->self_scm ());
 
       
       Music * tabstring_event=0;
 
-      for (SCM s =event->get_mus_property ("articulations");
-          !tabstring_event && gh_pair_p (s); s = gh_cdr (s))
+      for (SCM s =event->get_property ("articulations");
+          !tabstring_event && scm_is_pair (s); s = scm_cdr (s))
        {
-         Music * art = unsmob_music (gh_car (s));
+         Music * art = unsmob_music (scm_car (s));
 
          if (art->is_mus_type ("string-number-event"))
            tabstring_event = art;
@@ -92,7 +93,7 @@ Tab_note_heads_engraver::process_music ()
       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++;
        }
 
@@ -100,7 +101,7 @@ Tab_note_heads_engraver::process_music ()
       bool string_found;
       if (tabstring_event)
        {
-         tab_string = gh_scm2int(tabstring_event->get_mus_property ("string-number"));
+         tab_string = scm_to_int (tabstring_event->get_property ("string-number"));
          string_found = true;
        }
       else
@@ -109,50 +110,49 @@ Tab_note_heads_engraver::process_music ()
          string_found = false;
        }
       
-      Duration dur = *unsmob_duration (event->get_mus_property ("duration"));
-      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 = make_item ("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 = event->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;
+      int min_fret = scm_is_number (min_fret_scm) ? scm_to_int (min_fret_scm) : 0;
 
-      while(!string_found)
+      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)
+         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 = gh_call3 (proc, gh_int2scm (tab_string), stringTunings, scm_pitch);
+      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, event->self_scm());
+      note->set_property ("staff-position", scm_int2num (pos));
       notes_.push (note);
     }
 }
@@ -160,28 +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_events_.clear ();
   tabstring_events_.clear ();
 }
 
 
-ENTER_DESCRIPTION(Tab_note_heads_engraver,
+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 */       "centralCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost",
+/* reads */       "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost",
 /* write */       "");