* lily/include/translator.hh (class Translator): rename

get_parent_context() to context () to avoid confusion.

* lily/include/translator.hh (class Translator): make
daddy_context_ protected.
(class Translator): clean up.

* lily/lyric-engraver.cc (get_voice_to_lyrics): recursively go
higher for finding Voice. (backportme)

diff --git a/ChangeLog b/ChangeLog
index dca84c09bcaa7f2c89874b9ec1b982fef673181f..76269cde924c8e66483355fd1356bb344c599e81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-04-12  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/include/translator.hh (class Translator): rename
+       get_parent_context() to context () to avoid confusion.
+
        * lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.
 
        * lily/lexer.ll: change is_string -> ly_c_string_p 

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 73314fb4eac282ab23749a71894b426a525f1540..1ed0e5d405c1c2b8ab4fe7a9fdcac2af38542f8b 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -91,14 +91,14 @@ Accidental_engraver::initialize ()
 {
   last_keysig_ = get_property ("keySignature");
 
-  Context * trans_ = get_parent_context ();
+  Context * trans_ = context ();
   while (trans_)
     {
       trans_ -> set_property ("localKeySignature",
                              ly_deep_copy (last_keysig_));
       trans_ = trans_->get_parent_context ();
     }
-  set_property_on_children (get_parent_context (),"localKeySignature", last_keysig_);
+  set_property_on_children (context (),"localKeySignature", last_keysig_);
 }
 
 /*
@@ -447,7 +447,7 @@ Accidental_engraver::acknowledge_grob (Grob_info info)
          
          Accidental_entry entry ;
          entry.head_ = info.grob_;
-         entry.origin_ = info.origin_trans_->get_parent_context ();
+         entry.origin_ = info.origin_trans_->context ();
          entry.melodic_ = note;
 
          accidentals_.push (entry);
@@ -477,13 +477,13 @@ Accidental_engraver::process_music ()
   */
   if (last_keysig_ != sig)
     {
-      Context * trans_ = get_parent_context ();
+      Context * trans_ = context ();
       while (trans_)
        {
          trans_ -> set_property ("localKeySignature",  ly_deep_copy (sig));
          trans_ = trans_->get_parent_context ();
        }
-      set_property_on_children (get_parent_context (),"localKeySignature", sig);
+      set_property_on_children (context (),"localKeySignature", sig);
 
       last_keysig_ = sig;
     }

diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc
index 76ec0f603014625a91de49ef0e887265587f4185..55bd91e29ebb09f2df0b99bf72c5428846a5c8d3 100644 (file)
--- a/lily/audio-element-info.cc
+++ b/lily/audio-element-info.cc
@@ -29,12 +29,12 @@ Audio_element_info::Audio_element_info ()
 Link_array<Context>
 Audio_element_info::origin_contexts (Translator* end) const
 {
-  Context * t = origin_trans_->get_parent_context ();
+  Context * t = origin_trans_->context ();
   Link_array<Context> r;
   do {
     r.push (t);
     t = t->get_parent_context ();
-  } while (t && t != end->get_parent_context ());
+  } while (t && t != end->context ());
   
   return r;
 }

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 585e407fa59353c7b2df5fa95e0e14fee8e89558..65e8f86317f9ad1a5ccb26baecb6293d59624b56 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -300,7 +300,7 @@ Auto_beam_engraver::begin_beam ()
   
   stems_ = new Link_array<Item>;
   grouping_ = new Beaming_info_list;
-  beam_settings_ = updated_grob_properties (get_parent_context (), ly_symbol2scm ("Beam"));
+  beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam"));
   
   beam_start_moment_ = now_mom ();
   beam_start_location_ = *unsmob_moment (get_property ("measurePosition"));

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 4b1cf29bc6a1fe740c5028de6f6e6a33848bf7d1..50e53db1b1fd1a506db703b2523407f605fed472 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -69,7 +69,7 @@ Axis_group_engraver::finalize ()
   if (!staffline_)
     return ;
   
-  String type = get_parent_context ()->context_name ();
+  String type = context ()->context_name ();
   SCM dims = get_property ("verticalExtent");
   
   if (is_number_pair (dims))

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 4305aa2191a1a26205e3174b52140b6271cc7c28..b485f714644d742bd5315b05044407938a2607e3 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -121,7 +121,7 @@ Beam_engraver::set_melisma (bool ml)
 {
   SCM b = get_property ("autoBeaming");
   if (!to_boolean (b))
-    get_parent_context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+    context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void

diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 1767f4f5b2e05555879d3d32855c4953a6017c1a..8748d7320d0ebe3987bb9f523e8b40c11f8dd21e 100644 (file)
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -57,7 +57,7 @@ Beam_performer::set_melisma (bool ml)
 {
   SCM b = get_property ("autoBeaming");
   if (!to_boolean (b))
-    get_parent_context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 152ca2fdb21c812a15c3536295bc7f8139931a2a..13254fa8def864ea3c30a91e69e6d9bb3455860e 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -102,7 +102,7 @@ Chord_name_engraver::process_music ()
 
   SCM name_proc = get_property ("chordNameFunction");
   SCM markup = scm_call_4 (name_proc, pitches, bass, inversion,
-                          get_parent_context ()->self_scm ());
+                          context ()->self_scm ());
 
   /*
     Ugh. 

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 670dd39b4df21e5618921e0df9db18e969fc05ed..eacc015ab4d7c25d6156120bd11cd9700919d0ec 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -61,8 +61,8 @@ Clef_engraver::set_glyph ()
 
   SCM basic = ly_symbol2scm ("Clef");
   
-  execute_pushpop_property (get_parent_context (), basic, glyph_sym, SCM_UNDEFINED);
-  execute_pushpop_property (get_parent_context (), basic, glyph_sym, glyph);
+  execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED);
+  execute_pushpop_property (context (), basic, glyph_sym, glyph);
 }
 
 /** 
@@ -152,7 +152,7 @@ Clef_engraver::inspect_clef_properties ()
 
   if (to_boolean (force_clef))
     {
-      Context * w = get_parent_context ()->where_defined (ly_symbol2scm ("forceClef"));
+      Context * w = context ()->where_defined (ly_symbol2scm ("forceClef"));
       w->set_property ("forceClef", SCM_EOL);
     }
 }

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index eb48fb48a23e0eb136dbecd7fea9e5b9191e5f97..6301ca71bd5e1484c2995d99298533e85b9afe66 100644 (file)
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -106,7 +106,7 @@ Drum_notes_engraver::process_music ()
              Item *p  = make_item ("Script");
              SCM desc  = SCM_EOL;
              make_script_from_event (p, &desc,
-                                     get_parent_context (), script,
+                                     context (), script,
                                      0);
 
              if (p->get_property ("follow-into-staff"))

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 3c7dc854e490fa6b7852c1a540e7995f7724439b..6e926b8d6c880b567f0bf70b3c67e5c9b9a56869 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -239,7 +239,7 @@ Dynamic_engraver::process_music ()
            {
              cresc_  = make_spanner ("TextSpanner");
              cresc_->set_property ("style", s);
-             get_parent_context ()->set_property ((start_type
+             context ()->set_property ((start_type
                                            + "Spanner").to_str0 (), SCM_EOL);
              s = get_property ((start_type + "Text").to_str0 ());
              /*
@@ -249,7 +249,7 @@ Dynamic_engraver::process_music ()
                {
                  cresc_->set_property ("edge-text",
                                             scm_cons (s, scm_makfrom0str ("")));
-                 get_parent_context ()->set_property ((start_type + "Text").to_str0 (),
+                 context ()->set_property ((start_type + "Text").to_str0 (),
                                                SCM_EOL);
                }
            }

diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc
index 8a2d6da2145d005bb5f1cac27d802484ee76c7c5..0820f3c73ebe27ea9d0b002ab04df71fd9c55e57 100644 (file)
--- a/lily/engraver-group-engraver.cc
+++ b/lily/engraver-group-engraver.cc
@@ -101,7 +101,7 @@ void
 Engraver_group_engraver::initialize ()
 {
   SCM tab = scm_make_vector (scm_int2num (61), SCM_BOOL_F);
-  get_parent_context ()->set_property ("acknowledgeHashTable", tab);
+  context ()->set_property ("acknowledgeHashTable", tab);
 
   Translator_group::initialize ();
 }

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 6ddab140ff9586835416b5f5d48eefcc52ee8ebd..bc1d2580a09414a399a877f45afcafc116286733 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -92,7 +92,7 @@ Extender_engraver::stop_translation_timestep ()
 
   if (extender_ || pending_extender_)
     {
-      Context *voice = get_voice_to_lyrics (get_parent_context ());
+      Context *voice = get_voice_to_lyrics (context ());
       Grob* h =  (voice) ? get_current_note_head (voice) : 0;
 
       if (h)

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index bed934002ac18d5cb235b4b4f747bf53ea8f41af..611e49dc258d5c8bf4617524e7fa353f637ae5fd 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -85,7 +85,7 @@ Figured_bass_engraver::process_music ()
              t = SCM_CDRLOC (*t);
            }
          figure_ = make_item ("BassFigure");
-         scm_call_3 (proc, l, get_parent_context ()->self_scm (),
+         scm_call_3 (proc, l, context ()->self_scm (),
                      figure_->self_scm ());
          announce_grob (figure_, figures_[0]->self_scm ()); // todo
        }

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 9e68c27676a924ca575d4b6d44734720fb818674..6c6bfa91d1bbc8d100f1fd119c752011cab8084b 100644 (file)
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -33,7 +33,7 @@ Font_size_engraver::acknowledge_grob (Grob_info gi)
   /*
     We only want to process a grob once.
    */
-  if (gi.origin_trans_->get_parent_context () != get_parent_context ())
+  if (gi.origin_trans_->context () != context ())
     return ;
   
   if (ly_c_number_p (sz) && ly_scm2double (sz))

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index d56cd46862b3f1a7cd261d23f27473cc052062ed..bc6205a8dc5e3fcb9c6f1f1e5b0a20c22029735f 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -28,12 +28,12 @@ Grob_info::music_cause ()
 Link_array<Context>
 Grob_info::origin_contexts (Translator* end) const
 {
-  Context * t = origin_trans_->get_parent_context ();
+  Context * t = origin_trans_->context ();
   Link_array<Context> r;
   do {
     r.push (t);
     t = t->get_parent_context ();
-  } while (t && t != end->get_parent_context ());
+  } while (t && t != end->context ());
   
   return r;
 }

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 2cd150969328cf40b44ac9a964ed99ee908f7974..c0f97f1d45c5e44bec31d149ad73c505ecd28b66 100644 (file)
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -30,7 +30,7 @@ Grob_pq_engraver::Grob_pq_engraver ()
 void
 Grob_pq_engraver::initialize ()
 {
-  get_parent_context ()->set_property ("busyGrobs", SCM_EOL); 
+  context ()->set_property ("busyGrobs", SCM_EOL); 
 }
 
 LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq-less?",
@@ -71,7 +71,7 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi)
 
       SCM busy= get_property ("busyGrobs");
       busy = scm_merge_x (lst, busy, ly_grob_pq_less_p_proc);
-      get_parent_context ()->set_property ("busyGrobs", busy);
+      context ()->set_property ("busyGrobs", busy);
     }
 }
 
@@ -88,7 +88,7 @@ Grob_pq_engraver::stop_translation_timestep ()
     }
 
   if (start_busy != busy)
-    get_parent_context ()->set_property ("busyGrobs", busy);
+    context ()->set_property ("busyGrobs", busy);
 }
 
 void
@@ -108,7 +108,7 @@ Grob_pq_engraver::start_translation_timestep ()
     }
 
   if (start_busy != busy)
-    get_parent_context ()->set_property ("busyGrobs", busy);
+    context ()->set_property ("busyGrobs", busy);
 }
 
 

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index de0c4e9a64267ea9fbb889da29f5df35f7e2cd81..5c064bf71b8a3246e6eb67127476c9ede70820e8 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -57,8 +57,8 @@ public:
   TRANSLATOR_DECLARATIONS(Engraver);
 };
 
-#define make_item(x) make_item_from_properties (get_parent_context (), ly_symbol2scm (x))
-#define make_spanner(x) make_spanner_from_properties (get_parent_context (), ly_symbol2scm (x))
+#define make_item(x) make_item_from_properties (context (), ly_symbol2scm (x))
+#define make_spanner(x) make_spanner_from_properties (context (), ly_symbol2scm (x))
 Item* make_item_from_properties (Context * tg, SCM x);
 Spanner* make_spanner_from_properties (Context * tg, SCM x);
 

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 69b09852ad931bb47dfb2bb8d3c21177e6b405e5..0c791e51ec9f891e3c2593cd66af1d15605c0555 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -37,7 +37,7 @@ class Translator
   void init ();
   
 public:
-  Context * get_parent_context () const { return daddy_context_; }
+  Context * context () const { return daddy_context_; }
   
   Translator (Translator const &);
 

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index fd39cdfe3645eb4efedcd9b0dac09338476df3e2..892bde9b9f89fc000eb03c640ba0eed595f6cead 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -42,7 +42,7 @@ Instrument_name_engraver::Instrument_name_engraver ()
 void
 Instrument_name_engraver::initialize ()
 {
-  get_parent_context ()->set_property ("instrumentSupport", SCM_EOL); 
+  context ()->set_property ("instrumentSupport", SCM_EOL); 
 }
 
 void
@@ -111,7 +111,7 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
       SCM nl = scm_cons (i.grob_->self_scm (),
                        get_property ("instrumentSupport"));
 
-      get_parent_context ()->set_property ("instrumentSupport", nl);
+      context ()->set_property ("instrumentSupport", nl);
     }
 }
 

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index c4209caa2ec218c54721b88b3aface0e06144386..a13b4315a6d869cf6b902c677f199cfd1cc80d9f 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -167,8 +167,8 @@ Key_engraver::read_ev (Music const * r)
     if (ly_scm2int (ly_cdar (s)))
       accs = scm_cons (ly_car (s), accs);
 
-  get_parent_context ()->set_property ("keySignature", accs);
-  get_parent_context ()->set_property ("tonic" ,
+  context ()->set_property ("keySignature", accs);
+  context ()->set_property ("tonic" ,
                              r->get_property ("tonic"));
 }
 
@@ -177,18 +177,18 @@ void
 Key_engraver::start_translation_timestep ()
 {
   key_ev_ = 0;
-  get_parent_context ()->set_property ("lastKeySignature", get_property ("keySignature"));
+  context ()->set_property ("lastKeySignature", get_property ("keySignature"));
 }
 
 
 void
 Key_engraver::initialize ()
 {
-  get_parent_context ()->set_property ("keySignature", SCM_EOL);
-  get_parent_context ()->set_property ("lastKeySignature", SCM_EOL);
+  context ()->set_property ("keySignature", SCM_EOL);
+  context ()->set_property ("lastKeySignature", SCM_EOL);
 
   Pitch p (0,0,0);
-  get_parent_context ()->set_property ("tonic", p.smobbed_copy ());
+  context ()->set_property ("tonic", p.smobbed_copy ());
 
 }
 

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 2acc37050115bd375f1acc741a6a0af4524203c1..75c915d32208d7bba4c3f4a631419b73727c48ac 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -115,9 +115,9 @@ Ligature_engraver::override_stencil_callback ()
 {
   SCM target_callback = ly_symbol2scm ("print-function");
   SCM source_callback = ly_symbol2scm ("ligature-primitive-callback");
-  SCM noteHeadProperties = updated_grob_properties (get_parent_context (), ly_symbol2scm ("NoteHead"));
+  SCM noteHeadProperties = updated_grob_properties (context (), ly_symbol2scm ("NoteHead"));
   SCM value = ly_cdr (scm_sloppy_assq (source_callback, noteHeadProperties));
-  execute_pushpop_property (get_parent_context (), ly_symbol2scm ("NoteHead"),
+  execute_pushpop_property (context (), ly_symbol2scm ("NoteHead"),
                            target_callback, value);
 }
 
@@ -139,7 +139,7 @@ Ligature_engraver::revert_stencil_callback ()
 {
   SCM symbol = ly_symbol2scm ("NoteHead");
   SCM key = ly_symbol2scm ("print-function");
-  execute_pushpop_property (get_parent_context (), symbol, key, SCM_UNDEFINED);
+  execute_pushpop_property (context (), symbol, key, SCM_UNDEFINED);
 }
 
 void

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 2691b7d9cc331a42d1492971d5ba0ac77e9bb088..e32fca941afce9184edccc440375bb2645aeb0f3 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -128,7 +128,7 @@ Lyric_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      Context * voice = get_voice_to_lyrics (get_parent_context ());
+      Context * voice = get_voice_to_lyrics (context ());
 
       if (voice)
        {

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index a7e050d92ca093ed97e1afd2b03523fbb2031900..ce1d13e7b9b2e2545c0aadc3f4025124416642a2 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -123,12 +123,12 @@ Mark_engraver::process_music ()
            {
              int mark_count = ly_scm2int (m);
              mark_count ++;
-             get_parent_context ()->set_property ("rehearsalMark",
+             context ()->set_property ("rehearsalMark",
                                            scm_int2num (mark_count));
            }
 
          if (ly_c_number_p (m))
-           m = scm_call_2 (proc, m, get_parent_context ()->self_scm ());
+           m = scm_call_2 (proc, m, context ()->self_scm ());
          else
            warning ("rehearsalMark does not have integer value.");
        }

diff --git a/lily/melisma-translator.cc b/lily/melisma-translator.cc
index 1b01c2d82d67a7e80a7a3fe7dcb98ed69394148d..d71cf13d98c3c5253ce42947b0814de4b9d3896f 100644 (file)
--- a/lily/melisma-translator.cc
+++ b/lily/melisma-translator.cc
@@ -36,7 +36,7 @@ Melisma_translator::try_music (Music *m)
 {
   if (m->is_mus_type ("melisma-playing-event"))
     {
-      return melisma_busy (get_parent_context ());
+      return melisma_busy (context ());
     }
   else if (m->is_mus_type ("melisma-span-event"))
     {
@@ -55,9 +55,9 @@ Melisma_translator::process_music ()
       SCM sd = event_->get_property ("span-direction");
       Direction d = to_dir (sd);
       if (d == START)
-       get_parent_context ()->set_property ("melismaBusy", SCM_BOOL_T);
+       context ()->set_property ("melismaBusy", SCM_BOOL_T);
       else
-       get_parent_context ()->unset_property (ly_symbol2scm ("melismaBusy"));
+       context ()->unset_property (ly_symbol2scm ("melismaBusy"));
     }
       
 }

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 34e32df049d8cb72e08b68a65267b8614fc5ba5a..2c8bd4659ee225ee0c4aec6eceeed5b45ba823bd 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -101,7 +101,7 @@ Metronome_mark_engraver::process_music ()
 
       SCM proc = get_property ("metronomeMarkFormatter");
       SCM result= scm_call_2 (proc, mark_ev_->self_scm (),
-                             get_parent_context ()->self_scm ()); 
+                             context ()->self_scm ()); 
       
       text_->set_property ("text", result);
     }

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 5b846f57c6ad6d8d55fac28cb161df379b4c0af8..05f60c433eed1350ff98484d1e34bfa7e9c8c936 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -112,7 +112,7 @@ New_fingering_engraver::add_script (Grob * head,
   Finger_tuple ft ;
 
   Grob * g=  make_item ("Script");
-  make_script_from_event (g, &ft.description_, get_parent_context (),
+  make_script_from_event (g, &ft.description_, context (),
                          event->get_property ("articulation-type"), 0);
   if (g)
     {

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index f5a548a87ad4d0d53c5e63b9fd18859ac1acc7c2..190c0bcc93d749487eeae0838cb2457405fa7ac6 100644 (file)
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -60,7 +60,7 @@ Note_head_line_engraver::acknowledge_grob (Grob_info info)
       head_ = info.grob_;
       if (to_boolean (get_property ("followVoice")))
        {
-         Context * tr = get_parent_context ();
+         Context * tr = context ();
          while (tr && !tr->is_alias (ly_symbol2scm ( "Staff")))
            tr = tr->get_parent_context () ;
 

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index a0b2fbda7ad2188cb3dff4bde1a16707a5e4f551..06bfffefcacfa8b802beaa600273612f26efbc12 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -64,13 +64,13 @@ Output_property_engraver::acknowledge_grob (Grob_info inf)
            dynamic_cast<Context *> (inf.origin_trans_);
 
          if (!d)
-           d = dynamic_cast<Context *> (inf.origin_trans_->get_parent_context ());
+           d = dynamic_cast<Context *> (inf.origin_trans_->context ());
          
          SCM proc = o->get_property ("procedure");
          scm_call_3 (proc,
                      inf.grob_->self_scm (),
                      d->self_scm (), 
-                     get_parent_context ()->self_scm ());
+                     context ()->self_scm ());
        }
     }
 }

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 7319dd92233f097383bbd45f361bc00782db7854..b776432de1628dd24b2293a822f3c52dc4da60ba 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -28,7 +28,7 @@ Performer_group_performer::announce_element (Audio_element_info info)
 {
   announce_infos_.push (info);
   Translator *t
-    = get_parent_context ()->get_parent_context ()->implementation ();
+    = context ()->get_parent_context ()->implementation ();
 
   if (Performer_group_performer * eg = dynamic_cast<Performer_group_performer*> (t))
     eg->announce_element (info);

diff --git a/lily/recording-group-engraver.cc b/lily/recording-group-engraver.cc
index 95be8f56380eb37a87f44723726d5a7dfbf75a1e..41e96ee5e988c9f3751309c4ef1f929fc7530e2d 100644 (file)
--- a/lily/recording-group-engraver.cc
+++ b/lily/recording-group-engraver.cc
@@ -81,7 +81,7 @@ Recording_group_engraver::finalize ()
   SCM proc = get_property ("recordEventSequence");
 
   if (ly_c_procedure_p (proc))
-    scm_call_2  (proc, get_parent_context ()->self_scm (), ly_cdr (accumulator_));
+    scm_call_2  (proc, context ()->self_scm (), ly_cdr (accumulator_));
 
   accumulator_ = SCM_EOL;
 }

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 33a7c275edbbc4baab6e1a720cc936b694eb4feb..ad4082962c5074506da3e2cbad2f220bb19b8a37 100644 (file)
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -38,7 +38,7 @@ public:
 void
 Repeat_acknowledge_engraver::initialize ()
 {
-  get_parent_context ()->set_property ("repeatCommands", SCM_EOL);
+  context ()->set_property ("repeatCommands", SCM_EOL);
 }
 
 
@@ -49,9 +49,9 @@ Repeat_acknowledge_engraver::Repeat_acknowledge_engraver ()
 void
 Repeat_acknowledge_engraver::start_translation_timestep ()
 {
-  Context * tr = get_parent_context ()->where_defined (ly_symbol2scm ("repeatCommands"));
+  Context * tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"));
   if (!tr)
-    tr = get_parent_context ();
+    tr = context ();
 
   tr->set_property ("repeatCommands", SCM_EOL);
 }
@@ -104,7 +104,7 @@ Repeat_acknowledge_engraver::process_music ()
     {
       if (s != "" || (volta_found && !ly_c_string_p (wb)))
        {
-         get_parent_context ()->set_property ("whichBar", scm_makfrom0str (s.to_str0 ()));
+         context ()->set_property ("whichBar", scm_makfrom0str (s.to_str0 ()));
        }
     }
 }

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index e3bd20fb7ca1f26079827411e3998c86d74033a6..1b4ebcf0c1610af43df753c58a0fd4009b75b319 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -47,9 +47,9 @@ Score_engraver::make_columns ()
   if (!command_column_)
     {
       SCM nmp
-       = updated_grob_properties (get_parent_context (),
+       = updated_grob_properties (context (),
                                   ly_symbol2scm ("NonMusicalPaperColumn"));
-      SCM pc = updated_grob_properties (get_parent_context (),
+      SCM pc = updated_grob_properties (context (),
                                        ly_symbol2scm ("PaperColumn"));
       
       set_columns (new Paper_column (nmp), new Paper_column (pc));
@@ -80,7 +80,7 @@ Score_engraver::prepare (Moment m)
   command_column_->set_property ("when", w);
   musical_column_->set_property ("when", w);
   
-  recurse_over_translators (get_parent_context (), &Translator::start_translation_timestep, DOWN);
+  recurse_over_translators (context (), &Translator::start_translation_timestep, DOWN);
 }
 
 void
@@ -89,7 +89,7 @@ Score_engraver::finish ()
   if ((breaks_%8))
     progress_indication ("[" + to_string (breaks_) + "]");
 
-  recurse_over_translators (get_parent_context (), &Translator::finalize, UP);
+  recurse_over_translators (context (), &Translator::finalize, UP);
 }
 
 /*
@@ -107,7 +107,7 @@ Score_engraver::initialize ()
   pscore_ = new Paper_score;
   pscore_->paper_ = dynamic_cast<Paper_def*> (get_output_def ());
 
-  SCM props = updated_grob_properties (get_parent_context (), ly_symbol2scm ("System"));
+  SCM props = updated_grob_properties (context (), ly_symbol2scm ("System"));
 
   pscore_->typeset_line (new System (props));
   
@@ -139,11 +139,11 @@ Score_engraver::one_time_step ()
 {
   if (!to_boolean (get_property ("skipTypesetting")))
     {
-      recurse_over_translators (get_parent_context (), &Engraver::process_music, UP);
-      recurse_over_translators (get_parent_context (), &Engraver::do_announces, UP);
+      recurse_over_translators (context (), &Engraver::process_music, UP);
+      recurse_over_translators (context (), &Engraver::do_announces, UP);
     }
   
-  recurse_over_translators (get_parent_context (), &Translator::stop_translation_timestep, UP);
+  recurse_over_translators (context (), &Translator::stop_translation_timestep, UP);
 }
 
 void
@@ -241,12 +241,12 @@ Score_engraver::set_columns (Paper_column *new_command,
   musical_column_ = new_musical;
   if (new_command)
     {
-      get_parent_context ()->set_property ("currentCommandColumn", new_command->self_scm ());  
+      context ()->set_property ("currentCommandColumn", new_command->self_scm ());  
     }
   
   if (new_musical)
     {
-      get_parent_context ()->set_property ("currentMusicalColumn", new_musical->self_scm ());
+      context ()->set_property ("currentMusicalColumn", new_musical->self_scm ());
     }
 }
 

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 175450d381bc727821942392ee3d74ec3d7bbffd..f1aa57691796cb2b9321efbd9b0c96ed6aff2d36 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -58,21 +58,21 @@ Score_performer::prepare (Moment m)
 {
   audio_column_ = new Audio_column (m);
   play_element (audio_column_);
-  recurse_over_translators (get_parent_context (), &Translator::start_translation_timestep, UP);
+  recurse_over_translators (context (), &Translator::start_translation_timestep, UP);
 }
 
 void
 Score_performer::finish ()
 {
-  recurse_over_translators (get_parent_context (), &Translator::finalize, UP);
+  recurse_over_translators (context (), &Translator::finalize, UP);
 }
   
 void 
 Score_performer::one_time_step ()
 {
-  recurse_over_translators (get_parent_context (), &Performer::process_music, UP);
-  recurse_over_translators (get_parent_context (), &Performer::do_announces, UP);
-  recurse_over_translators (get_parent_context (), &Translator::stop_translation_timestep, UP);
+  recurse_over_translators (context (), &Performer::process_music, UP);
+  recurse_over_translators (context (), &Performer::do_announces, UP);
+  recurse_over_translators (context (), &Translator::stop_translation_timestep, UP);
 }
 
 int

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index d5804fbd0afb556a7dd6e365c3b6e8e350ad4dfb..8ebf701bbf5f7a584413aebd868c3835a364991c 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -134,7 +134,7 @@ Script_engraver::process_music ()
 
       Grob * p = make_item ("Script");
 
-      make_script_from_event (p, &scripts_[i].description_, get_parent_context (),
+      make_script_from_event (p, &scripts_[i].description_, context (),
                              l->get_property ("articulation-type"),
                              i);
 

diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index bd880658423971aef63504a0104458f494e9de64..3ab5b422562c93b29bdb49f7bda903e4edbd60b2 100644 (file)
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -140,7 +140,7 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i)
       if (ib)
        {
          p_ref_->set_property ("breakable", SCM_BOOL_T);
-         get_parent_context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
+         context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
        }
       announce_grob (p_ref_, SCM_EOL);
 
@@ -179,7 +179,7 @@ void
 Separating_line_group_engraver::start_translation_timestep ()
 {
   if (break_item_)
-    get_parent_context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
+    context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
   break_item_ =0;
 }
 

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 79434ad225283deae7c9dc063b0f5f007517cddc..91498a7240d0d4f10152e60db82866c0db1601d3 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -88,7 +88,7 @@ Slur_engraver::try_music (Music *ev)
 void
 Slur_engraver::set_melisma (bool m)
 {
-  get_parent_context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+  context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void

diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc
index 32896aac0578efd9e9468806ca6499242c550350..1836016161cc7c551bb056dd09a52bb19ddbf303 100644 (file)
--- a/lily/slur-performer.cc
+++ b/lily/slur-performer.cc
@@ -60,7 +60,7 @@ Slur_performer::process_music ()
 void
 Slur_performer::set_melisma (bool ml)
 {
-  get_parent_context ()->set_property ("slurMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+  context ()->set_property ("slurMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void

diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index 42a9fec8843fa1259dee3a37c4c80ca031ba07af..de3e1fda41ae9fbd748bed8406932115b7b4cb9e 100644 (file)
--- a/lily/staff-collecting-engraver.cc
+++ b/lily/staff-collecting-engraver.cc
@@ -32,7 +32,7 @@ Staff_collecting_engraver::acknowledge_grob (Grob_info gi)
       SCM staffs = get_property ("stavesFound");
       staffs = scm_cons (gi.grob_->self_scm (), staffs);
 
-      get_parent_context ()->set_property ("stavesFound", staffs);
+      context ()->set_property ("stavesFound", staffs);
     }
 }
 

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 5d20f881fef475e82aaf00305c91cb18f3eced95..4264011e39c18f252cc60f94993e6eba78eb29f8 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -65,7 +65,7 @@ Staff_performer::initialize ()
   audio_staff_ = new Audio_staff;
   announce_element (Audio_element_info (audio_staff_, 0));
 
-  name_ = new Audio_text (Audio_text::TRACK_NAME, get_parent_context ()->id_string_);
+  name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string_);
   announce_element (Audio_element_info (name_, 0));
 
   tempo_ = new Audio_tempo (get_tempo ());

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 14de1ade5c36272a0a76184ce046e6a7de11baa6..d594868da30bd9121150cc3c717013e9c438ff2e 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -88,7 +88,7 @@ Stem_engraver::acknowledge_grob (Grob_info i)
                else
                  requested_type = 8; 
              else
-               get_parent_context ()->set_property ("tremoloFlags", scm_int2num (requested_type));
+               context ()->set_property ("tremoloFlags", scm_int2num (requested_type));
 
              int tremolo_flags = intlog2 (requested_type) - 2
                - (duration_log > 2 ? duration_log - 2 : 0);
@@ -152,13 +152,13 @@ Stem_engraver::stop_translation_timestep ()
       if (ly_c_number_p (prop))
        {
          Stem::set_beaming (stem_,ly_scm2int (prop),LEFT);
-         get_parent_context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
+         context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
        }
       prop = get_property ("stemRightBeamCount");
       if (ly_c_number_p (prop))
        {
          Stem::set_beaming (stem_,ly_scm2int (prop), RIGHT);
-         get_parent_context ()->unset_property (ly_symbol2scm ("stemRightBeamCount"));
+         context ()->unset_property (ly_symbol2scm ("stemRightBeamCount"));
        }
 
       typeset_grob (stem_);

diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index 5d4c4342b0b752fc2658ef016b905241d476b62c..a0fdceb4dd1abcd185fe0321845286bdedb848f2 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -73,7 +73,7 @@ System_start_delimiter_engraver::process_music ()
   if (!delim_)
     {
       SCM delim_name =get_property ("systemStartDelimiter");
-      delim_ = make_spanner_from_properties (get_parent_context (), delim_name);
+      delim_ = make_spanner_from_properties (context (), delim_name);
 
       delim_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
       announce_grob (delim_, SCM_EOL);

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 28559aeac567d433ff98e7f64a251cdcc079d7d2..ee2fdab41dfbef0ea00c3e687de47274ac10922b 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -74,7 +74,7 @@ void
 Tie_engraver::process_music ()
 {
   if (event_)
-    get_parent_context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
+    context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
 void
@@ -123,7 +123,7 @@ Tie_engraver::acknowledge_grob (Grob_info i)
 void
 Tie_engraver::start_translation_timestep ()
 {
-  get_parent_context ()->set_property ("tieMelismaBusy",
+  context ()->set_property ("tieMelismaBusy",
                              ly_bool2scm (heads_to_tie_.size ()));
       
 }

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index f2efe82f7dfe407b6dbd309f23362f80d88390ce..a90d4bab1e352bfd239c9cb74ede4726c834a3de 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -57,7 +57,7 @@ void
 Tie_performer::process_music ()
 {
   if (event_)
-    get_parent_context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
+    context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
 void
@@ -87,7 +87,7 @@ Tie_performer::acknowledge_audio_element (Audio_element_info inf)
 void
 Tie_performer::start_translation_timestep ()
 {
-  get_parent_context ()->set_property ("tieMelismaBusy",
+  context ()->set_property ("tieMelismaBusy",
                              ly_bool2scm (heads_to_tie_.size ()));
       
 }

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index 5740034be753c8f7bb86611c9696079ccb6c6032..2c12f4166abaa523a36b04eb6ad144a5e379acbf 100644 (file)
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -49,7 +49,7 @@ Timing_engraver::initialize ()
     which = (now.main_part_ || now.main_part_ == last_moment_.main_part_)
       ? SCM_EOL : scm_makfrom0str ("|");
 
-  get_parent_context ()->set_property ("whichBar", which);
+  context ()->set_property ("whichBar", which);
 }
 
 
@@ -88,14 +88,14 @@ Timing_engraver::start_translation_timestep ()
        }
     }
 
-  get_parent_context ()->set_property ("whichBar", which);
+  context ()->set_property ("whichBar", which);
 }
 
 void
 Timing_engraver::stop_translation_timestep ()
 {
   Timing_translator::stop_translation_timestep ();
-  get_parent_context ()->set_property ("whichBar", SCM_EOL);
+  context ()->set_property ("whichBar", SCM_EOL);
   last_moment_ = now_mom ();
 }
 

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index cc96ec066d3a0fd640ce464bbe64d44d92fc79b9..24d2c3c377d397e4ff13f5a4f24d15fcb4551ff1 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -49,18 +49,18 @@ Timing_translator::initialize ()
   /*
     move this to engraver-init.ly? 
    */
-  get_parent_context ()->add_alias (ly_symbol2scm ("Timing"));
-  get_parent_context ()->set_property ("timing" , SCM_BOOL_T);  
-  get_parent_context ()->set_property ("currentBarNumber" , scm_int2num (1));
+  context ()->add_alias (ly_symbol2scm ("Timing"));
+  context ()->set_property ("timing" , SCM_BOOL_T);  
+  context ()->set_property ("currentBarNumber" , scm_int2num (1));
 
-  get_parent_context ()->set_property ("timeSignatureFraction",
+  context ()->set_property ("timeSignatureFraction",
                                scm_cons (scm_int2num (4), scm_int2num (4)));
   /*
     Do not init measurePosition; this should be done from global
     context.
    */
-  get_parent_context ()->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ());
-  get_parent_context ()->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ());
+  context ()->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ());
+  context ()->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ());
 }
 
 Rational
@@ -125,7 +125,7 @@ Timing_translator::start_translation_timestep ()
   else
     {
       measposp = now;
-      get_parent_context ()->set_property ("measurePosition",
+      context ()->set_property ("measurePosition",
                                    measposp.smobbed_copy ());
     }
   
@@ -148,8 +148,8 @@ Timing_translator::start_translation_timestep ()
       b ++;
     }
 
-  get_parent_context ()->set_property ("currentBarNumber", scm_int2num (b));
-  get_parent_context ()->set_property ("measurePosition", measposp.smobbed_copy ());
+  context ()->set_property ("currentBarNumber", scm_int2num (b));
+  context ()->set_property ("measurePosition", measposp.smobbed_copy ());
 }
 
 ENTER_DESCRIPTION (Timing_translator,

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 9948739c26a85eeb9e9c75c9b16f78742de1c9b7..85e9d43b62d65e9371a9ab2fd42eafc205354cc3 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -20,7 +20,7 @@
 Translator_group*
 Translator_group::get_daddy_translator () const
 {
-  return get_parent_context ()->get_parent_context ()->implementation ();
+  return context ()->get_parent_context ()->implementation ();
 }
 
 
@@ -36,7 +36,7 @@ void
 Translator_group::initialize ()
 {
   SCM tab = scm_make_vector (scm_int2num (19), SCM_BOOL_F);
-  get_parent_context ()->set_property ("acceptHashTable", tab);
+  context ()->set_property ("acceptHashTable", tab);
 }