* input/regression/hairpin-dashed.ly: new file.

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

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index b7c9289eab27db460c0e2057bca1b3e87428d775..e7ee7654635d52345522c40991ec9ed317352697 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -1,8 +1,8 @@
 /*
   accidental-engraver.cc -- implement 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--2002 by Rune Zedeler <rz@daimi.au.dk>
 */
 
 #include "event.hh"
@@ -16,8 +16,8 @@
 #include "engraver.hh"
 #include "arpeggio.hh"
 #include "warn.hh"
-
 #include "translator-group.hh"
+#include "protected-scm.hh"
 
 /**
 
@@ -59,35 +59,27 @@ protected:
   virtual void finalize ();
 public:
 
-  /*
-    TODO -> property.
-    
-    This is not a property, and it is not protected.  This poses a
-    very small risk of the value being GC'd from under us.
-  */
-  SCM last_keysig_;
+  Protected_scm last_keysig_;
 
   /*
     Urgh. Since the accidentals depend on lots of variables, we have to
     store all information before we can really create the accidentals.
   */
-  Link_array<Grob> arpeggios_;
+  Link_array<Grob> left_objects_;
+  Link_array<Grob> right_objects_;
 
   Grob * accidental_placement_;
-  
 
   /*
     The next 
    */
   Array<Accidental_entry> accidentals_;
-  
   Link_array<Grob> ties_;
-
-
 };
 
 
-static void set_property_on_children (Translator_group * trans, const char * sym, SCM val)
+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)) {
@@ -128,9 +120,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;
 
@@ -138,7 +130,7 @@ number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazy
   if (ignore_octave_b)
     prev = ly_assoc_cdr (scm_int2num (n), sig);
   else
-    prev = gh_assoc (gh_cons (scm_int2num (o), scm_int2num (n)), sig);
+    prev = scm_assoc (gh_cons (scm_int2num (o), scm_int2num (n)), sig);
 
   /* should really be true unless prev == SCM_BOOL_F */
   if (gh_pair_p (prev) && gh_pair_p (ly_cdr (prev)))
@@ -150,7 +142,7 @@ number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazy
   /* If an accidental was not found or the accidental was too old */
   if (prev == SCM_BOOL_F ||
       (gh_number_p (lazyness) && curbarnum_i > accbarnum_i + gh_scm2int (lazyness)))
-    prev = gh_assoc (scm_int2num (n), sig);
+    prev = scm_assoc (scm_int2num (n), sig);
 
 
   SCM prev_acc = (prev == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev);
@@ -211,14 +203,13 @@ number_accidentals (Music * note, Pitch *pitch, Translator_group * origin,
       */
       else if (gh_symbol_p (ly_car (accidentals)))
        {
-         String context = ly_symbol2string (ly_car (accidentals));
-         
+         SCM context =ly_car (accidentals);
          while (origin && !origin->is_alias_b (context))
            origin = origin->daddy_trans_;
       
          if (!origin)
            warning (_f ("Symbol is not a parent context: %s. Ignored", 
-                        context.to_str0 ()));
+                        ly_symbol2string (context).to_str0 ()));
        }
       else warning (_f ("Accidental typesetting must be pair or context-name: %s", 
                        ly_scm2string (ly_car (accidentals)).to_str0 ()));
@@ -304,7 +295,7 @@ Accidental_engraver::process_acknowledged_grobs ()
              announce_grob (a, SCM_EOL);
 
              
-             SCM accs = gh_cons (scm_int2num (pitch->alteration_), SCM_EOL);
+             SCM accs = gh_cons (scm_int2num (pitch->get_alteration ()), SCM_EOL);
              if (num == 2 && extra_natural_b)
                accs = gh_cons (scm_int2num (0), accs);
 
@@ -334,8 +325,10 @@ Accidental_engraver::process_acknowledged_grobs ()
        accidentals. 
        
       */
-             for (int i = 0;  i < arpeggios_.size ();  i++)
-               Side_position_interface::add_support (arpeggios_[i], a);
+             for (int i = 0;  i < left_objects_.size ();  i++)
+               Side_position_interface::add_support (left_objects_[i], a);
+             for (int i = 0;  i < right_objects_.size ();  i++)
+               Side_position_interface::add_support (a, right_objects_[i]);
            }
          
 
@@ -348,9 +341,9 @@ Accidental_engraver::process_acknowledged_grobs ()
          */
          
 
-         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 on_s = gh_cons (scm_int2num (o), scm_int2num (n));
 
          /*
@@ -422,7 +415,8 @@ Accidental_engraver::stop_translation_timestep ()
   accidental_placement_ = 00;
   
   accidentals_.clear();
-  arpeggios_.clear ();
+  left_objects_.clear ();
+  right_objects_.clear ();
   ties_.clear ();
 }
 
@@ -448,9 +442,12 @@ Accidental_engraver::acknowledge_grob (Grob_info info)
     }
   else if (Arpeggio::has_interface (info.grob_))
     {
-      arpeggios_.push (info.grob_); 
+      left_objects_.push (info.grob_); 
+    }
+  else if (info.grob_->internal_has_interface (ly_symbol2scm("finger-interface")))
+    {
+      left_objects_.push (info.grob_); 
     }
-  
 }
 
 void
@@ -485,6 +482,6 @@ ENTER_DESCRIPTION (Accidental_engraver,
 " with note heads), this needs to be in a context higher than Tie_engraver.",
               "Accidental",
 /* accepts */     "",
-              "rhythmic-head-interface tie-interface arpeggio-interface",
+              "finger-interface rhythmic-head-interface tie-interface arpeggio-interface",
               "localKeySignature extraNatural autoAccidentals autoCautionaries",
                   "localKeySignature");