(accidental): NL

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index 7d7eddfc1966980978fffc9e3b26f4fa4af86959..a14b25e8367b3b66fcc34bdec8689c3b2b0919d8 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -22,7 +22,7 @@ bool
 Context::is_removable () const
 {
   return context_list_ == SCM_EOL && ! iterator_count_
-    && !dynamic_cast < Score_context const *> (this);
+    && !dynamic_cast<Score_context const *> (this);
 }
 
 void
@@ -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;
     }
@@ -459,7 +455,6 @@ Context::get_output_def () const
 
 Context::~Context ()
 {
-
 }
 
 Moment
@@ -537,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;
 }