fix typos.

[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 af1450d692c21cb79702098ec449c843c33aedb7..f40fddbeade0c9d88a2c5a9dad3651eb1034fe64 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #include "rhythmic-head.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "event.hh"
 #include "dots.hh"
 #include "dot-column.hh"
@@ -81,9 +81,9 @@ Tab_note_heads_engraver::process_music ()
       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 +100,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
@@ -119,7 +119,7 @@ Tab_note_heads_engraver::process_music ()
          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);
@@ -131,12 +131,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