* Documentation/user/refman.itely (Printing named chords): add

[lilypond.git] / lily / new-accidental-engraver.cc

diff --git a/lily/new-accidental-engraver.cc b/lily/new-accidental-engraver.cc
index 1e5fd92accd3140c8722d6ccfd55b1bce579f7eb..aa03965df4b1baf1e064f03a15c7fb5958d9878d 100644 (file)
--- a/lily/new-accidental-engraver.cc
+++ b/lily/new-accidental-engraver.cc
@@ -1,16 +1,16 @@
 /*
   new-accidental-engraver.cc -- implement new_accidental_engraver
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Modified 2001--2003 by Rune Zedeler <rz@daimi.au.dk>
 
   This is an experimental file - producing correct accidentals but
   unfortunately ruining the spacing. -rz
   
 */
 
-#include "musical-request.hh"
-#include "command-request.hh"
+#include "event.hh"
+
 #include "item.hh"
 #include "tie.hh"
 #include "rhythmic-head.hh"
@@ -185,9 +185,9 @@ static int
 number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazyness, 
                    bool ignore_octave_b)
 {
-  int n = pitch->notename_;
-  int o = pitch->octave_;
-  int a = pitch->alteration_;
+  int n = pitch->get_notename ();
+  int o = pitch->get_octave ();
+  int a = pitch->get_alteration (); 
   int curbarnum_i = gh_scm2int (curbarnum);
   int accbarnum_i = 0;
 
@@ -324,9 +324,9 @@ New_accidental_engraver::process_grobs_first_pass ()
       for (int j = 0; j < ties_.size (); j++)
        if (support == Tie::head (ties_[j], RIGHT))
          tie_changes = accidentals_[i].different_;
-      int n = pitch->notename_;
-      int o = pitch->octave_;
-      int a = pitch->alteration_;
+      int n = pitch->get_notename ();
+      int o = pitch->get_octave ();
+      int a = pitch->get_alteration ();
       SCM o_s = gh_int2scm (o);
       SCM n_s = gh_int2scm (n);
       SCM on_s = gh_cons (o_s,n_s);
@@ -434,7 +434,7 @@ New_accidental_engraver::process_grobs_second_pass ()
          announce_grob (a, SCM_EOL);
          
          
-         SCM accs = gh_cons (gh_int2scm (pitch->alteration_), SCM_EOL);
+         SCM accs = gh_cons (gh_int2scm (pitch->get_alteration ()), SCM_EOL);
          if (num == 2 && extra_natural_b)
            accs = gh_cons (gh_int2scm (0), accs);
          
@@ -550,12 +550,12 @@ New_accidental_engraver::process_music ()
 
 
 ENTER_DESCRIPTION (New_accidental_engraver,
-"Make accidentals.  Catches note heads, ties and notices key-change
-events.  Due to interaction with ties (which don't come together
-with note heads), this needs to be in a context higher than Tie_engraver.",
+"Make accidentals.  Catches note heads, ties and notices key-change "
+"events.  Due to interaction with ties (which don't come together "
+"with note heads), this needs to be in a context higher than Tie_engraver.",
                   
               "Accidental",
-/* accepts */     "general-music",
+/* accepts */     "",
               "rhythmic-head-interface tie-interface arpeggio-interface",
               "localKeySignature localKeySignatureChanges extraNatural autoAccidentals autoCautionaries",
                   "localKeySignature localKeySignatureChanges");