(LY_DEFINE): use Scheme style naming for

[lilypond.git] / lily / mensural-ligature-engraver.cc

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 629c299aa125dc8f21a89d3ba56833fcf2a6f8e3..299d7644474b01e3c18bd542183e914becd29635 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -211,7 +211,7 @@ Mensural_ligature_engraver::apply_transition (Array<Grob_info> primitives,
            programming_error ("last_primitive undefined");
            break;
          }
-       last_primitive->set_grob_property ("primitive", gh_int2scm (output));
+       last_primitive->set_property ("primitive", gh_int2scm (output));
        break;
       case MLP_BB:
       case MLP_LB:
@@ -226,8 +226,8 @@ Mensural_ligature_engraver::apply_transition (Array<Grob_info> primitives,
            programming_error ("primitive undefined");
            break;
          }
-       last_primitive->set_grob_property ("primitive", gh_int2scm (output));
-       primitive->set_grob_property ("primitive", gh_int2scm (MLP_NONE));
+       last_primitive->set_property ("primitive", gh_int2scm (output));
+       primitive->set_property ("primitive", gh_int2scm (MLP_NONE));
        break;
       case MLP_SS:
        // delayed primitive with two note heads
@@ -241,8 +241,8 @@ Mensural_ligature_engraver::apply_transition (Array<Grob_info> primitives,
            programming_error ("last_primitive undefined");
            break;
          }
-       last_last_primitive->set_grob_property ("primitive", gh_int2scm (output));
-       last_primitive->set_grob_property ("primitive", gh_int2scm (MLP_NONE));
+       last_last_primitive->set_property ("primitive", gh_int2scm (output));
+       last_primitive->set_property ("primitive", gh_int2scm (MLP_NONE));
        break;
       default:
        programming_error (_f ("unexpected case fall-through"));
@@ -284,7 +284,7 @@ Mensural_ligature_engraver::transform_heads (Array<Grob_info> primitives)
       }
     else
       {
-       pitch = *unsmob_pitch (nr->get_mus_property ("pitch"));
+       pitch = *unsmob_pitch (nr->get_property ("pitch"));
        have_pitch = 1;
       }
 
@@ -343,13 +343,13 @@ void
 Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
                                                  Array<Grob_info> primitives)
 {
-  Real thickness = robust_scm2double (ligature->get_grob_property ("thickness"), 1.4);
+  Real thickness = robust_scm2double (ligature->get_property ("thickness"), 1.4);
   thickness *= ligature->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
 
   Real head_width =
     Font_interface::get_default_font (ligature)->
     find_by_name ("noteheads--1mensural").extent (X_AXIS).length ();
-    Real flexa_width = robust_scm2double (ligature->get_grob_property ("flexa-width"), 2);
+    Real flexa_width = robust_scm2double (ligature->get_property ("flexa-width"), 2);
   flexa_width *= Staff_symbol_referencer::staff_space (ligature);
 
   Real half_flexa_width = 0.5 * (flexa_width + thickness);
@@ -357,26 +357,26 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
   for (int i = 0; i < primitives.size (); i++)
     {
       Item *primitive = dynamic_cast<Item*> (primitives[i].grob_);
-      int output = gh_scm2int (primitive->get_grob_property ("primitive"));
-      primitive->set_grob_property ("thickness",
+      int output = gh_scm2int (primitive->get_property ("primitive"));
+      primitive->set_property ("thickness",
                                    gh_double2scm (thickness));
       switch (output) {
        case MLP_NONE:
-         primitive->set_grob_property ("head-width",
+         primitive->set_property ("head-width",
                                        gh_double2scm (half_flexa_width));
          break;
        case MLP_sc:
        case MLP_ss:
        case MLP_cs:
-         primitive->set_grob_property ("head-width",
+         primitive->set_property ("head-width",
                                        gh_double2scm (head_width));
          break;
        case MLP_BB:
        case MLP_LB:
        case MLP_SS:
-         primitive->set_grob_property ("head-width",
+         primitive->set_property ("head-width",
                                        gh_double2scm (half_flexa_width));
-         primitive->set_grob_property ("flexa-width",
+         primitive->set_property ("flexa-width",
                                        gh_double2scm (flexa_width));
          break;
        default:
@@ -407,8 +407,8 @@ Mensural_ligature_engraver::fold_up_primitives (Array<Grob_info> primitives)
        }
 
       distance +=
-       gh_scm2double (current->get_grob_property ("head-width")) -
-       gh_scm2double (current->get_grob_property ("thickness"));
+       gh_scm2double (current->get_property ("head-width")) -
+       gh_scm2double (current->get_property ("thickness"));
     }
 }
 
@@ -419,15 +419,15 @@ Mensural_ligature_engraver::join_primitives (Array<Grob_info> primitives)
   for (int i = 0; i < primitives.size (); i++)
     {
       Grob_info info = primitives[i];
-      Pitch pitch = *unsmob_pitch (info.music_cause ()->get_mus_property ("pitch"));
+      Pitch pitch = *unsmob_pitch (info.music_cause ()->get_property ("pitch"));
       if (i > 0)
         {
          Item *primitive = dynamic_cast<Item*> (info.grob_);
-         int output = gh_scm2int (primitive->get_grob_property ("primitive"));
+         int output = gh_scm2int (primitive->get_property ("primitive"));
          if (output & MLP_ANY)
            {
              int delta_pitch = (pitch.steps () - last_pitch.steps ());
-             primitive->set_grob_property ("join-left-amount",
+             primitive->set_property ("join-left-amount",
                                            gh_int2scm (delta_pitch));
            }
        }