2003 -> 2004

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

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 095ed8d0d0e92bd56914e687b404b0239f83943b..f41260d6b65428042c65bdf83d998db03f6928fe 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -1,7 +1,7 @@
 /*
   accidental-engraver.cc -- implement accidental_engraver
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
 */
 
@@ -17,6 +17,7 @@
 #include "arpeggio.hh"
 #include "warn.hh"
 #include "translator-group.hh"
+#include "protected-scm.hh"
 
 /**
 
@@ -81,7 +82,7 @@ static void
 set_property_on_children (Translator_group * trans, const char * sym, SCM val)
 {
   trans->set_property (sym, val);
-  for (SCM p = trans -> trans_group_list_; gh_pair_p (p); p = ly_cdr(p)) {
+  for (SCM p = trans->trans_group_list_; gh_pair_p (p); p = ly_cdr(p)) {
     Translator_group *trg =  dynamic_cast<Translator_group*> (unsmob_translator (ly_car (p)));
     set_property_on_children(trg,sym,ly_deep_copy(val));
   }
@@ -116,7 +117,7 @@ calculates the number of accidentals on basis of the current local key sig
 
 */
 static int
-number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazyness, 
+number_accidentals_from_sig (SCM sig, Music *, Pitch *pitch, SCM curbarnum, SCM lazyness, 
                    bool ignore_octave_b)
 {
   int n = pitch->get_notename ();
@@ -170,13 +171,14 @@ number_accidentals (Music * note, Pitch *pitch, Translator_group * origin,
     warning (_f ("Accidental typesetting list must begin with context-name: %s", 
                 ly_scm2string (ly_car (accidentals)).to_str0 ()));
   
-  while (gh_pair_p (accidentals) && origin)
+  for (; gh_pair_p (accidentals) && origin; accidentals = gh_cdr (accidentals))
     {
       // If pair then it is a new accidentals typesetting rule to be checked
-      if (gh_pair_p (ly_car (accidentals)))
+      SCM rule = gh_car (accidentals);
+      if (gh_pair_p (rule))
        {
-         SCM type = gh_caar (accidentals);
-         SCM lazyness = gh_cdar (accidentals);
+         SCM type = gh_car (rule);
+         SCM lazyness = gh_cdr (rule);
          SCM localsig = origin->get_property ("localKeySignature");
          
          bool same_octave_b = 
@@ -186,7 +188,7 @@ number_accidentals (Music * note, Pitch *pitch, Translator_group * origin,
 
          if (same_octave_b || any_octave_b)
            {
-             int n = number_accidentals
+             int n = number_accidentals_from_sig
                (localsig, note, pitch, curbarnum, lazyness, any_octave_b);
              diff = diff || (n < 0);
              number = max (number, abs (n));     
@@ -200,22 +202,19 @@ number_accidentals (Music * note, Pitch *pitch, Translator_group * origin,
       /*
        if symbol then it is a context name. Scan parent contexts to find it.
       */
-      else if (gh_symbol_p (ly_car (accidentals)))
+      else if (gh_symbol_p (rule))
        {
-         String context = ly_symbol2string (ly_car (accidentals));
-         
-         while (origin && !origin->is_alias_b (context))
-           origin = origin->daddy_trans_;
+         Translator_group * dad = origin;
+         while (dad && !dad->is_alias (rule))
+           dad = dad->daddy_trans_;
       
-         if (!origin)
-           warning (_f ("Symbol is not a parent context: %s. Ignored", 
-                        context.to_str0 ()));
+         if (dad)
+           origin = dad;
        }
-      else warning (_f ("Accidental typesetting must be pair or context-name: %s", 
-                       ly_scm2string (ly_car (accidentals)).to_str0 ()));
-      
-      accidentals = ly_cdr (accidentals);
+      else warning (_f ("Accidental rule must be pair or context-name; Found %s", 
+                       ly_scm2string (rule).to_str0 ()));
     }
+
   return diff ? -number : number;
 }
 
@@ -242,6 +241,9 @@ Accidental_engraver::process_acknowledged_grobs ()
          Translator_group * origin = accidentals_[i].origin_;
 
          Pitch * pitch = unsmob_pitch (note->get_mus_property ("pitch"));
+         if (!pitch)
+           continue;
+         
          int num = number_accidentals (note, pitch, origin, accidentals, barnum);
          int num_caut = number_accidentals (note, pitch, origin, cautionaries, barnum);
          bool cautionary = to_boolean (note->get_mus_property ("cautionary"));
@@ -282,12 +284,12 @@ Accidental_engraver::process_acknowledged_grobs ()
 
          if (num)
            {
-             Grob * a = new Item (get_property ("Accidental"));
+             Grob * a = make_item ("Accidental");
              a->set_parent (support, Y_AXIS);
 
              if (!accidental_placement_)
                {
-                 accidental_placement_ = new Item (get_property ("AccidentalPlacement"));
+                 accidental_placement_ = make_item ("AccidentalPlacement");
                  announce_grob (accidental_placement_, a->self_scm());
                }
              
@@ -395,7 +397,7 @@ Accidental_engraver::process_acknowledged_grobs ()
 void
 Accidental_engraver::finalize ()
 {
-
+  last_keysig_ = SCM_EOL;
 }
 
 void