(find_create_context): assign to lvalue.

[lilypond.git] / lily / dynamic-engraver.cc

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 1e0f8768e7f2fca5c2516972bf736757483b7945..6e926b8d6c880b567f0bf70b3c67e5c9b9a56869 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -220,7 +220,7 @@ Dynamic_engraver::process_music ()
            start_type = "crescendo";
          
          SCM s = get_property ((start_type + "Spanner").to_str0 ());
-         if (!ly_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
+         if (!ly_c_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
            {
              cresc_  = make_spanner ("Hairpin");
              cresc_->set_property ("grow-direction",
@@ -239,17 +239,17 @@ Dynamic_engraver::process_music ()
            {
              cresc_  = make_spanner ("TextSpanner");
              cresc_->set_property ("style", s);
-             daddy_context_->set_property ((start_type
+             context ()->set_property ((start_type
                                            + "Spanner").to_str0 (), SCM_EOL);
              s = get_property ((start_type + "Text").to_str0 ());
              /*
                FIXME: use get_markup () to check type.
              */
-             if (ly_string_p (s) || ly_pair_p (s))
+             if (ly_c_string_p (s) || ly_c_pair_p (s))
                {
                  cresc_->set_property ("edge-text",
                                             scm_cons (s, scm_makfrom0str ("")));
-                 daddy_context_->set_property ((start_type + "Text").to_str0 (),
+                 context ()->set_property ((start_type + "Text").to_str0 (),
                                                SCM_EOL);
                }
            }
@@ -400,7 +400,7 @@ Dynamic_engraver::acknowledge_grob (Grob_info i)
       if (script_ && !script_->get_parent (X_AXIS))
        {
          SCM head = scm_last_pair (i.grob_->get_property ("note-heads"));
-         if (ly_pair_p (head))
+         if (ly_c_pair_p (head))
            script_->set_parent (unsmob_grob (ly_car (head)),  X_AXIS);
        }
       
@@ -414,7 +414,7 @@ Dynamic_engraver::acknowledge_grob (Grob_info i)
 
        DynamicText doesn't really have a script-priority field.
        */
-      if (ly_number_p (p)
+      if (ly_c_number_p (p)
          && ly_scm2int (p) < ly_scm2int (script_->get_property ("script-priority")))
        {
          Side_position_interface::add_support (line_spanner_, i.grob_);