Issue 4947: Link notes to dynamics in Dynamic_performer rather than

[lilypond.git] / lily / axis-group-interface.cc

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 7c11cb7e979458f67317b37ed9a4164aa4f81549..38a193caf63dfc4659dc10a1245d2c9ab2785c69 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -40,11 +40,6 @@
 #include "warn.hh"
 #include "unpure-pure-container.hh"
 
-using std::multimap;
-using std::pair;
-using std::string;
-using std::vector;
-
 static bool
 pure_staff_priority_less (Grob *const &g1, Grob *const &g2);
 
@@ -86,7 +81,7 @@ Axis_group_interface::has_axis (Grob *me, Axis a)
 {
   SCM axes = me->get_property ("axes");
 
-  return (SCM_BOOL_F != scm_memq (scm_from_int (a), axes));
+  return scm_is_true (scm_memq (scm_from_int (a), axes));
 }
 
 Interval
@@ -1048,7 +1043,6 @@ ADD_INTERFACE (Axis_group_interface,
                "bound-alignment-interfaces "
                "default-staff-staff-spacing "
                "elements "
-               "max-stretch "
                "no-alignment "
                "nonstaff-nonstaff-spacing "
                "nonstaff-relatedstaff-spacing "