* scm/define-markup-commands.scm (fill-line): use

[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 ecca3ed9e5386cc9b8e1c275ae9f2724611e81ab..57309800922cb5f6a9934d6fdc349af7b5a108fe 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -3,11 +3,12 @@
 
   (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"
@@ -73,17 +74,17 @@ Tab_note_heads_engraver::process_music ()
       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_property ("articulations");
-          !tabstring_event && ly_c_pair_p (s); s = ly_cdr (s))
+          !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;
@@ -100,7 +101,7 @@ Tab_note_heads_engraver::process_music ()
       bool string_found;
       if (tabstring_event)
        {
-         tab_string = ly_scm2int (tabstring_event->get_property ("string-number"));
+         tab_string = scm_to_int (tabstring_event->get_property ("string-number"));
          string_found = true;
        }
       else
@@ -115,15 +116,15 @@ Tab_note_heads_engraver::process_music ()
 
       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 ()
-             != ly_scm2int (d->get_property ("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);
        }
       
@@ -131,12 +132,12 @@ Tab_note_heads_engraver::process_music ()
       SCM scm_pitch = event->get_property ("pitch");
       SCM proc      = get_property ("tablatureFormat");
       SCM min_fret_scm = get_property ("minimumFret");
-      int min_fret = ly_c_number_p (min_fret_scm) ? ly_scm2int (min_fret_scm) : 0;
+      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 ()
-           - ly_scm2int (scm_list_ref (stringTunings,scm_int2num (tab_string-1)));
+           - scm_to_int (scm_list_ref (stringTunings,scm_int2num (tab_string-1)));
          if (fret<min_fret)
            tab_string += high_string_one ? 1 : -1;
          else
@@ -152,7 +153,6 @@ Tab_note_heads_engraver::process_music ()
       note->set_property ("text", text);      
       
       note->set_property ("staff-position", scm_int2num (pos));
-      announce_grob (note, event->self_scm ());
       notes_.push (note);
     }
 }
@@ -160,17 +160,7 @@ 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 ();