Comment-out \fetaflat,

[lilypond.git] / lily / context-def.cc

diff --git a/lily/context-def.cc b/lily/context-def.cc
index def8427221a9fe0b65984a59c858ecd611e844cf..1bc3e7a9c80196846a31e3b87ba558f31a79f5bd 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -10,8 +10,8 @@
    a single list of context modifications?  */
 
 #include "context-def.hh"
+
 #include "engraver.hh"
-#include "lily-proto.hh"
 #include "output-def.hh"
 #include "performer.hh"
 #include "score-context.hh"
@@ -169,7 +169,7 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
       accepteds.push (t);
 
   Link_array<Context_def> best_result;
-  for (int i=0; i < accepteds.size (); i++)
+  for (int i = 0; i < accepteds.size (); i++)
     {
       /* do not check aliases, because \context Staff should not
         create RhythmicStaff. */
@@ -180,8 +180,8 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
        }
     }
 
-  int best_depth= INT_MAX;
-  for (int i=0; i < accepteds.size (); i++)
+  int best_depth = INT_MAX;
+  for (int i = 0; i < accepteds.size (); i++)
     {
       Context_def * g = accepteds[i];
 
@@ -260,14 +260,14 @@ filter_engravers (SCM ell)
 
 
 Context *
-Context_def::instantiate (SCM ops)
+Context_def::instantiate (SCM ops, Object_key const *key)
 {
   Context *tg =  0;
 
   if (context_name_ == ly_symbol2scm ("Score"))
-    tg = new Score_context ();
+    tg = new Score_context (key);
   else
-    tg = new Context ();
+    tg = new Context (key);
 
   tg->definition_ = self_scm ();
 
@@ -295,7 +295,7 @@ Context_def::instantiate (SCM ops)
              if (scm_is_pair (trans_list))
                scm_set_cdr_x (scm_last_pair (trans_list), cons);
              else
-               trans_list= cons;
+               trans_list = cons;
            }
          else
            {