Refactor get/set_property to take the item as first argument

lily/hairpin.cc

 /*
   This file is part of LilyPond, the GNU music typesetter.
 
   Copyright (C) 1997--2020 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
@@ skipping 21 matching lines @@
 #include "text-interface.hh"
 #include "note-column.hh"
 #include "system.hh"
 #include "warn.hh"
 
 MAKE_SCHEME_CALLBACK (Hairpin, pure_height, 3);
 SCM
 Hairpin::pure_height (SCM smob, SCM, SCM)
 {
   Grob *me = unsmob<Grob> (smob);
-  Real height = robust_scm2double (me->get_property ("height"), 0.0)
+  Real height = robust_scm2double (get_property (me, "height"), 0.0)
                 * Staff_symbol_referencer::staff_space (me);
 
-  Real thickness = robust_scm2double (me->get_property ("thickness"), 1)
+  Real thickness = robust_scm2double (get_property (me, "thickness"), 1)
                    * Staff_symbol_referencer::line_thickness (me);
 
   height += thickness / 2;
   return ly_interval2scm (Interval (-height, height));
 }
 
 MAKE_SCHEME_CALLBACK (Hairpin, broken_bound_padding, 1);
 SCM
 Hairpin::broken_bound_padding (SCM smob)
 {
@@ skipping 21 matching lines @@
     return scm_from_double (0.0);
 
   Drul_array<Grob *> span_bars (0, 0);
   for (DOWN_and_UP (d))
     {
       extract_grob_set (vertical_axis_groups[d], "elements", elts);
       for (vsize i = elts.size (); i--;)
         if (elts[i]->internal_has_interface (ly_symbol2scm ("bar-line-interface"))
             && dynamic_cast<Item *> (elts[i])->break_status_dir () == -1)
           {
-            SCM hsb = elts[i]->get_property ("has-span-bar");
+            SCM hsb = get_property (elts[i], "has-span-bar");
             if (!scm_is_pair (hsb))
               break;
 
             span_bars[d] = unsmob<Grob> ((d == UP ? scm_car : scm_cdr) (hsb));
             break;
           }
 
       if (!span_bars[d])
         return scm_from_double (0.0);
     }
 
   if (span_bars[DOWN] != span_bars[UP])
     return scm_from_double (0.0);
 
-  return scm_from_double (robust_scm2double (me->get_property ("bound-padding"), 0.5)
+  return scm_from_double (robust_scm2double (get_property (me, "bound-padding"), 0.5)
                           / 2.0);
 }
 
 MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
 SCM
 Hairpin::print (SCM smob)
 {
   Spanner *me = unsmob<Spanner> (smob);
 
-  SCM s = me->get_property ("grow-direction");
+  SCM s = get_property (me, "grow-direction");
   if (!is_direction (s))
     {
       me->suicide ();
       return SCM_EOL;
     }
 
   Direction grow_dir = to_dir (s);
-  Real padding = robust_scm2double (me->get_property ("bound-padding"), 0.5);
+  Real padding = robust_scm2double (get_property (me, "bound-padding"), 0.5);
 
   Drul_array<bool> broken;
   Drul_array<Item *> bounds;
   for (LEFT_and_RIGHT (d))
     {
       bounds[d] = me->get_bound (d);
       broken[d] = bounds[d]->break_status_dir () != CENTER;
     }
 
   if (broken[RIGHT])
     {
       Spanner *next = me->broken_neighbor (RIGHT);
       // Hairpin-parts suicide in after-line-breaking if they need not be drawn
       if (next)
         {
-          (void) next->get_property ("after-line-breaking");
+          (void) get_property (next, "after-line-breaking");
           broken[RIGHT] = next->is_live ();
         }
       else
         broken[RIGHT] = false;
     }
 
   Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
   Drul_array<Real> x_points;
 
   /*
     Use the height and thickness of the hairpin when making a circled tip
   */
-  bool circled_tip = ly_scm2bool (me->get_property ("circled-tip"));
-  Real height = robust_scm2double (me->get_property ("height"), 0.2)
+  bool circled_tip = ly_scm2bool (get_property (me, "circled-tip"));
+  Real height = robust_scm2double (get_property (me, "height"), 0.2)
                 * Staff_symbol_referencer::staff_space (me);
   /*
     FIXME: 0.525 is still just a guess...
   */
   Real rad = height * 0.525;
   Real thick = 1.0;
   if (circled_tip)
-    thick = robust_scm2double (me->get_property ("thickness"), 1.0)
+    thick = robust_scm2double (get_property (me, "thickness"), 1.0)
             * Staff_symbol_referencer::line_thickness (me);
-  Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
+  Drul_array<Real> shorten = robust_scm2interval (get_property (me, "shorten-pair"),
                                                   Interval (0, 0));
 
   for (LEFT_and_RIGHT (d))
     {
       Item *b = bounds[d];
       Interval e = Axis_group_interface::generic_bound_extent (b, common, X_AXIS);
 
       x_points[d] = b->relative_coordinate (common, X_AXIS);
       if (broken [d])
         {
           if (d == LEFT)
             x_points[d] = e[-d];
           else
             {
               Real broken_bound_padding
-                = robust_scm2double (me->get_property ("broken-bound-padding"), 0.0);
+                = robust_scm2double (get_property (me, "broken-bound-padding"), 0.0);
               extract_grob_set (me, "concurrent-hairpins", chp);
               for (vsize i = 0; i < chp.size (); i++)
                 {
                   Spanner *span_elt = dynamic_cast<Spanner *> (chp[i]);
                   if (span_elt->get_bound (RIGHT)->break_status_dir () == LEFT)
                     broken_bound_padding = std::max (broken_bound_padding,
-                                                     robust_scm2double (span_elt->get_property ("broken-bound-padding"), 0.0));
+                                                     robust_scm2double (get_property (span_elt, "broken-bound-padding"), 0.0));
                 }
               x_points[d] -= d * broken_bound_padding;
             }
         }
       else
         {
           if (has_interface<Text_interface> (b))
             {
               if (!e.is_empty ())
                 x_points[d] = e[-d] - d * padding;
@@ skipping 144 matching lines @@
                /* properties */
                "adjacent-spanners "
                "circled-tip "
                "concurrent-hairpins "
                "broken-bound-padding "
                "bound-padding "
                "grow-direction "
                "height "
                "shorten-pair "
               );