* lily/paper-outputter.cc (output_stencil): dump font definitions

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

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 7d19220de4dfbe907399744df59e277c9c5f606a..735e9ff8310baaf356490a56b96787e67965ae3b 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -73,7 +73,7 @@ static void
 set_property_on_children (Context * trans, const char * sym, SCM val)
 {
   trans->set_property (sym, val);
-  for (SCM p = trans->context_list_; is_pair (p); p = ly_cdr (p))
+  for (SCM p = trans->children_contexts (); ly_c_pair_p (p); p = ly_cdr (p))
     {
       Context *trg =  unsmob_context (ly_car (p));
       set_property_on_children (trg, sym, ly_deep_copy (val));
@@ -91,14 +91,14 @@ Accidental_engraver::initialize ()
 {
   last_keysig_ = get_property ("keySignature");
 
-  Context * trans_ = daddy_context_;
+  Context * trans_ = context ();
   while (trans_)
     {
       trans_ -> set_property ("localKeySignature",
                              ly_deep_copy (last_keysig_));
-      trans_ = trans_->daddy_context_;
+      trans_ = trans_->get_parent_context ();
     }
-  set_property_on_children (daddy_context_,"localKeySignature", last_keysig_);
+  set_property_on_children (context (),"localKeySignature", last_keysig_);
 }
 
 /*
@@ -127,7 +127,7 @@ number_accidentals_from_sig (bool *different,
     prev = scm_assoc (scm_cons (scm_int2num (o), scm_int2num (n)), sig);
 
   /* should really be true unless prev == SCM_BOOL_F */
-  if (is_pair (prev) && is_pair (ly_cdr (prev)))
+  if (ly_c_pair_p (prev) && ly_c_pair_p (ly_cdr (prev)))
     {
       accbarnum_i = ly_scm2int (ly_cddr (prev));
       prev = scm_cons (ly_car (prev), ly_cadr (prev));
@@ -135,16 +135,16 @@ number_accidentals_from_sig (bool *different,
   
   /* If an accidental was not found or the accidental was too old */
   if (prev == SCM_BOOL_F ||
-      (is_number (lazyness) && curbarnum_i > accbarnum_i + ly_scm2int (lazyness)))
+      (ly_c_number_p (lazyness) && curbarnum_i > accbarnum_i + ly_scm2int (lazyness)))
     prev = scm_assoc (scm_int2num (n), sig);
 
 
   SCM prev_acc = (prev == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev);
 
-  int p = is_number (prev_acc) ? ly_scm2int (prev_acc) : 0;
+  int p = ly_c_number_p (prev_acc) ? ly_scm2int (prev_acc) : 0;
 
   int num;
-  if (a == p && is_number (prev_acc))
+  if (a == p && ly_c_number_p (prev_acc))
     num = 0;
   else if ( (abs (a)<abs (p) || p*a<0) && a != 0 )
     num = 2;
@@ -163,24 +163,24 @@ number_accidentals (bool *different,
   int number = 0;
 
   *different = false;
-  if (is_pair (accidentals) && !is_symbol (ly_car (accidentals)))
+  if (ly_c_pair_p (accidentals) && !ly_c_symbol_p (ly_car (accidentals)))
     warning (_f ("Accidental typesetting list must begin with context-name: %s", 
                 ly_scm2string (ly_car (accidentals)).to_str0 ()));
   
-  for (; is_pair (accidentals) && origin; accidentals = ly_cdr (accidentals))
+  for (; ly_c_pair_p (accidentals) && origin; accidentals = ly_cdr (accidentals))
     {
       // If pair then it is a new accidentals typesetting rule to be checked
       SCM rule = ly_car (accidentals);
-      if (is_pair (rule))
+      if (ly_c_pair_p (rule))
        {
          SCM type = ly_car (rule);
          SCM lazyness = ly_cdr (rule);
          SCM localsig = origin->get_property ("localKeySignature");
          
          bool same_octave_b = 
-           is_eq (ly_symbol2scm ("same-octave"), type);
+           ly_c_eq_p (ly_symbol2scm ("same-octave"), type);
          bool any_octave_b = 
-           is_eq (ly_symbol2scm ("any-octave"), type);
+           ly_c_eq_p (ly_symbol2scm ("any-octave"), type);
 
          if (same_octave_b || any_octave_b)
            {
@@ -199,11 +199,11 @@ number_accidentals (bool *different,
       /*
        if symbol then it is a context name. Scan parent contexts to find it.
       */
-      else if (is_symbol (rule))
+      else if (ly_c_symbol_p (rule))
        {
          Context * dad = origin;
          while (dad && !dad->is_alias (rule))
-           dad = dad->daddy_context_;
+           dad = dad->get_parent_context ();
       
          if (dad)
            origin = dad;
@@ -223,7 +223,7 @@ Accidental_engraver::get_bar_num ()
       
   Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
   if (mp.main_part_ < Rational (0)
-      && is_number (barnum))
+      && ly_c_number_p (barnum))
     barnum = scm_int2num (ly_scm2int (barnum) - 1);
       
   return barnum ;
@@ -287,18 +287,18 @@ Accidental_engraver::process_acknowledged_grobs ()
                level, so that we get the property settings for
                Accidental from the respective Voice.
               */
-             Grob * a = make_item_from_properties (origin,
-                                                   ly_symbol2scm ("Accidental"));
+             Grob * a = make_item_from_properties (origin->implementation (),
+                                                   ly_symbol2scm ("Accidental"),
+                                                   note->self_scm ()
+                                                   );
              a->set_parent (support, Y_AXIS);
 
              if (!accidental_placement_)
                {
-                 accidental_placement_ = make_item ("AccidentalPlacement");
-                 announce_grob (accidental_placement_, a->self_scm ());
+                 accidental_placement_ = make_item ("AccidentalPlacement", a->self_scm ());
                }
              
              Accidental_placement::add_accidental (accidental_placement_, a);
-             announce_grob (a, SCM_EOL);
 
              
              SCM accs = scm_cons (scm_int2num (pitch->get_alteration ()), SCM_EOL);
@@ -411,18 +411,10 @@ Accidental_engraver::stop_translation_timestep ()
 
          if (change)
            origin->set_property ("localKeySignature",  localsig);
-         origin = origin->daddy_context_;
+         origin = origin->get_parent_context ();
        }
     }
   
-  for (int i = 0; i < accidentals_.size (); i++)
-    {
-      if (Grob *a = accidentals_[i].accidental_)
-       typeset_grob (a);
-    }
-
-  if (accidental_placement_)
-    typeset_grob (accidental_placement_);
 
   accidental_placement_ = 0;
   
@@ -441,13 +433,13 @@ Accidental_engraver::acknowledge_grob (Grob_info info)
       && Rhythmic_head::has_interface (info.grob_))
     {
       if (to_boolean ( get_property ("harmonicAccidentals"))
-         || !is_equal (info.grob_->get_property ("style"),
+         || !ly_c_equal_p (info.grob_->get_property ("style"),
                          ly_symbol2scm ("harmonic")))
        {
          
          Accidental_entry entry ;
          entry.head_ = info.grob_;
-         entry.origin_ = info.origin_trans_->daddy_context_;
+         entry.origin_ = info.origin_trans_->context ();
          entry.melodic_ = note;
 
          accidentals_.push (entry);
@@ -477,13 +469,13 @@ Accidental_engraver::process_music ()
   */
   if (last_keysig_ != sig)
     {
-      Context * trans_ = daddy_context_;
+      Context * trans_ = context ();
       while (trans_)
        {
          trans_ -> set_property ("localKeySignature",  ly_deep_copy (sig));
-         trans_ = trans_->daddy_context_;
+         trans_ = trans_->get_parent_context ();
        }
-      set_property_on_children (daddy_context_,"localKeySignature", sig);
+      set_property_on_children (context (),"localKeySignature", sig);
 
       last_keysig_ = sig;
     }