* ChangeLog: Recode utf-8.

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index 13965e2fa0f50b54b0779ff8b96f95669dd6c506..b6ded9ec05e48736b8aacee2115e9a0e4b02c483 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -67,10 +67,8 @@ Context::add_context (Context *t)
       scm_gc_unprotect_object (ts);
       Context_def *td = unsmob_context_def (t->definition_);
 
-      /*
-       this can not move before add_context (), because \override
-       operations require that we are in the hierarchy.
-      */
+      /* This cannot move before add_context (), because \override
+        operations require that we are in the hierarchy.  */
       td->apply_default_property_operations (t);
 
       recurse_over_translators (t, &Translator::initialize, DOWN);
@@ -102,9 +100,7 @@ Context::Context (Object_key const *key)
   scm_gc_unprotect_object (key_->self_scm ());
 }
 
-/*
-  TODO:  this shares code with find_create_context().
-*/
+/* TODO:  this shares code with find_create_context ().  */
 Context *
 Context::create_unique_context (SCM n, SCM operations)
 {
@@ -147,7 +143,7 @@ Context::create_unique_context (SCM n, SCM operations)
     ret = daddy_context_->create_unique_context (n, operations);
   else
     {
-      warning (_f ("Cannot find or create new `%s'",
+      warning (_f ("can't find or create new `%s'",
                   ly_symbol2string (n).to_str0 ()));
       ret = 0;
     }
@@ -211,7 +207,7 @@ Context::find_create_context (SCM n, String id, SCM operations)
     ret = daddy_context_->find_create_context (n, id, operations);
   else
     {
-      warning (_f ("Cannot find or create `%s' called `%s'",
+      warning (_f ("can't find or create `%s' called `%s'",
                   ly_symbol2string (n).to_str0 (), id));
       ret = 0;
     }
@@ -225,14 +221,14 @@ Context::create_context (Context_def *cdef,
 {
   String type = ly_symbol2string (cdef->get_context_name ());
   Object_key const *key = get_context_key (type, id);
-  Context *new_group
+  Context *new_context
     = cdef->instantiate (ops, key);
 
-  new_group->id_string_ = id;
-  add_context (new_group);
-  apply_property_operations (new_group, ops);
+  new_context->id_string_ = id;
+  add_context (new_context);
+  apply_property_operations (new_context, ops);
 
-  return new_group;
+  return new_context;
 }
 
 Object_key const *
@@ -280,7 +276,7 @@ SCM
 Context::default_child_context_name () const
 {
   return scm_is_pair (accepts_list_)
-    ? scm_car (scm_last_pair (accepts_list_))
+    ? scm_car (accepts_list_) 
     : SCM_EOL;
 }
 
@@ -536,7 +532,7 @@ Context::get_global_context () const
   if (daddy_context_)
     return daddy_context_->get_global_context ();
 
-  programming_error ("No Global context!");
+  programming_error ("no Global context");
   return 0;
 }