X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface.cc;h=52520280f2eba2cbe2cf0d9718991c1156df5f4f;hb=1567b963aac4dc442d08cd9d7032e9ebde3b4978;hp=717ae1945f127af9a1a143ab4e5b583f77e72535;hpb=207f71b8b2ab9ca550e841615bedce393e652ca6;p=lilypond.git

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 717ae1945f..52520280f2 100644
--- 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);
 
@@ -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
@@ -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 "