Release: bump Welcome versions.

[lilypond.git] / lily / script-column.cc

diff --git a/lily/script-column.cc b/lily/script-column.cc
index dbe638fcf912ea468ed3c627eb5af427a39f07f3..a12560bf8e19426eaec8f254b782a8e6108ccefb 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -29,9 +29,6 @@
 
 #include <map>
 
-using std::map;
-using std::vector;
-
 typedef map<Grob *, vector <Grob *> > Grob_scripts_map;
 
 void
@@ -80,8 +77,8 @@ Script_column::row_before_line_breaking (SCM smob)
         {
           affect_all_grobs.push_back (sc);
         }
-      else if (sc->get_property_data ("Y-offset")
-               != Side_position_interface::y_aligned_side_proc)
+      else if (!scm_is_eq (sc->get_property_data ("Y-offset"),
+                           Side_position_interface::y_aligned_side_proc))
         {
           head_scripts_map[sc->get_parent (Y_AXIS)].push_back (sc);
         }
@@ -115,8 +112,8 @@ Script_column::before_line_breaking (SCM smob)
       /*
         Don't want to consider scripts horizontally next to notes.
       */
-      if (sc->get_property_data ("X-offset")
-          != Side_position_interface::x_aligned_side_proc)
+      if (!scm_is_eq (sc->get_property_data ("X-offset"),
+                      Side_position_interface::x_aligned_side_proc))
         staff_sided.push_back (sc);
     }