Doc-es: various updates.

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

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 717ae1945f127af9a1a143ab4e5b583f77e72535..ac6f85feb8e25bb810875d47567708194d762cd3 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
@@ -802,7 +797,7 @@ add_grobs_of_one_priority (Grob *me,
           last_end[dir] = x_extent[RIGHT];
 
           Skyline_pair *v_orig = unsmob<Skyline_pair> (elt->get_property ("vertical-skylines"));
-          if (v_orig->is_empty ())
+          if (!v_orig || v_orig->is_empty ())
             continue;
 
           // Find the riders associated with this grob, and merge their
@@ -951,7 +946,7 @@ Axis_group_interface::skyline_spacing (Grob *me)
       vector<Grob *> current_elts;
       current_elts.push_back (elements[i]);
       while (i + 1 < elements.size ()
-             && scm_is_eq (elements[i + 1]->get_property ("outside-staff-priority"), priority))
+             && ly_is_equal (elements[i + 1]->get_property ("outside-staff-priority"), priority))
         {
           if (!to_boolean (elements[i + 1]->get_property ("cross-staff")))
             current_elts.push_back (elements[i + 1]);
@@ -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 "