From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 12 Apr 2004 14:48:41 +0000 (+0000)
Subject: * lily/include/translator.hh (class Translator): rename
X-Git-Tag: release/2.3.1~90
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3e07faa176c300184b2e41d0dcfa779360519359;p=lilypond.git

* 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 dca84c09bc..76269cde92 100644
--- 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 73314fb4ea..1ed0e5d405 100644
--- 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 76ec0f6030..55bd91e29e 100644
--- 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 585e407fa5..65e8f86317 100644
--- 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 4b1cf29bc6..50e53db1b1 100644
--- 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 4305aa2191..b485f71464 100644
--- 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 1767f4f5b2..8748d7320d 100644
--- 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 152ca2fdb2..13254fa8de 100644
--- 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 670dd39b4d..eacc015ab4 100644
--- 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 eb48fb48a2..6301ca71bd 100644
--- 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 3c7dc854e4..6e926b8d6c 100644
--- 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 8a2d6da214..0820f3c73e 100644
--- 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 6ddab140ff..bc1d2580a0 100644
--- 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 bed934002a..611e49dc25 100644
--- 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 9e68c27676..6c6bfa91d1 100644
--- 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 d56cd46862..bc6205a8dc 100644
--- 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 2cd1509693..c0f97f1d45 100644
--- 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 de0c4e9a64..5c064bf71b 100644
--- 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 69b09852ad..0c791e51ec 100644
--- 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 fd39cdfe36..892bde9b9f 100644
--- 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 c4209caa2e..a13b4315a6 100644
--- 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 2acc370501..75c915d322 100644
--- 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 2691b7d9cc..e32fca941a 100644
--- 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 a7e050d92c..ce1d13e7b9 100644
--- 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 1b01c2d82d..d71cf13d98 100644
--- 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 34e32df049..2c8bd4659e 100644
--- 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 5b846f57c6..05f60c433e 100644
--- 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 f5a548a87a..190c0bcc93 100644
--- 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 a0b2fbda7a..06bfffefca 100644
--- 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 7319dd9223..b776432de1 100644
--- 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 95be8f5638..41e96ee5e9 100644
--- 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 33a7c275ed..ad4082962c 100644
--- 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 e3bd20fb7c..1b4ebcf0c1 100644
--- 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 175450d381..f1aa576917 100644
--- 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 d5804fbd0a..8ebf701bbf 100644
--- 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 bd88065842..3ab5b42256 100644
--- 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 79434ad225..91498a7240 100644
--- 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 32896aac05..1836016161 100644
--- 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 42a9fec884..de3e1fda41 100644
--- 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 5d20f881fe..4264011e39 100644
--- 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 14de1ade5c..d594868da3 100644
--- 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 5d4c4342b0..a0fdceb4dd 100644
--- 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 28559aeac5..ee2fdab41d 100644
--- 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 f2efe82f7d..a90d4bab1e 100644
--- 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 5740034be7..2c12f4166a 100644
--- 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 cc96ec066d..24d2c3c377 100644
--- 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 9948739c26..85e9d43b62 100644
--- 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);
 }