| Index: lily/context.cc |
| diff --git a/lily/context.cc b/lily/context.cc |
| index f6306b739f587c783aea4508fbda1020f6c8b19b..1ffd62217b792394f4789322684f93aadcc670f1 100644 |
| --- a/lily/context.cc |
| +++ b/lily/context.cc |
| @@ -55,12 +55,12 @@ Context::check_removal () |
| if (ctx->is_removable ()) |
| { |
| recurse_over_translators |
| - (ctx, |
| - Callback0_wrapper::make_smob |
| - <Translator, &Translator::finalize> (), |
| - Callback0_wrapper::make_smob |
| - <Translator_group, &Translator_group::finalize> (), |
| - UP); |
| + (ctx, |
| + Callback0_wrapper::make_smob |
| + <Translator, &Translator::finalize> (), |
| + Callback0_wrapper::make_smob |
| + <Translator_group, &Translator_group::finalize> (), |
| + UP); |
| send_stream_event (ctx, "RemoveContext", 0); |
| } |
| } |
| @@ -209,12 +209,13 @@ Context::set_property_from_event (SCM sev) |
| { |
| SCM val = ev->get_property ("value"); |
| - if (SCM_UNBNDP (val)) { |
| - // TODO: It looks like this ignores \once. |
| - // Should this be unset_property_from event (sev)? |
| - unset_property (sym); |
| - return; |
| - } |
| + if (SCM_UNBNDP (val)) |
| + { |
| + // TODO: It looks like this ignores \once. |
| + // Should this be unset_property_from event (sev)? |
| + unset_property (sym); |
| + return; |
| + } |
| bool ok = true; |
| ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")); |
| @@ -321,7 +322,7 @@ Context::path_to_acceptable_context (SCM name) const |
| } |
| return unsmob<Context_def> (definition_)-> |
| - path_to_acceptable_context (name, odef, acceptance_.get_list ()); |
| + path_to_acceptable_context (name, odef, acceptance_.get_list ()); |
| } |
| Context * |
| @@ -388,7 +389,7 @@ Context::create_hierarchy (const std::vector<Context_def *> &path, |
| } |
| } |
| - leaf = leaf->create_context (path.back(), leaf_id, leaf_operations); |
| + leaf = leaf->create_context (path.back (), leaf_id, leaf_operations); |
| if (!leaf) |
| return 0; // expect that create_context logged failure |
| } |
| @@ -662,7 +663,7 @@ Context * |
| find_context_near (Context *where, |
| SCM type, const string &id) |
| { |
| - for ( ; where; where = where->get_parent_context ()) |
| + for (; where; where = where->get_parent_context ()) |
| { |
| Context *found = find_context_below (where, type, id); |
| if (found) |
| @@ -676,7 +677,7 @@ Context * |
| find_top_context (Context *where) |
| { |
| Context *top = where; |
| - for ( ; where; where = where->get_parent_context()) |
| + for (; where; where = where->get_parent_context ()) |
| top = where; |
| return top; |
| } |
| @@ -701,7 +702,7 @@ Context::context_name () const |
| } |
| string |
| -Context::diagnostic_id (SCM name, const string& id) |
| +Context::diagnostic_id (SCM name, const string &id) |
| { |
| // For robustness when this static method is called directly (e.g. after a |
| // failure to create a context), we do not assume that name is a symbol. |
| @@ -788,7 +789,7 @@ Context::mark_smob () const |
| return properties_scm_; |
| } |
| -const char * const Context::type_p_name_ = "ly:context?"; |
| +const char *const Context::type_p_name_ = "ly:context?"; |
| Context * |
| Context::get_parent_context () const |
| @@ -881,11 +882,13 @@ melisma_busy (Context *tr) |
| // all contexts need to have a busy melisma for this to evaluate |
| // to true. |
| - do { |
| - if (!melisma_busy (unsmob<Context> (scm_car (ch)))) |
| - return false; |
| - ch = scm_cdr (ch); |
| - } while (scm_is_pair (ch)); |
| + do |
| + { |
| + if (!melisma_busy (unsmob<Context> (scm_car (ch)))) |
| + return false; |
| + ch = scm_cdr (ch); |
| + } |
| + while (scm_is_pair (ch)); |
| return true; |
| } |
