Doc: Issue 4349: Clarify where changes to beatStructure should be placed

[lilypond.git] / lily / paper-column-engraver.cc

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 97884e26432f9342824efd2185e682e9c2c3423c..a2d046b9fb16bbf3463d937a31de94639e4a182e 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 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
@@ -239,7 +239,7 @@ Paper_column_engraver::stop_translation_timestep ()
 
       if (!elem->get_parent (X_AXIS))
         elem->set_parent (col, X_AXIS);
-      if (!Grob::unsmob (elem->get_object ("axis-group-parent-X")))
+      if (!Grob::is_smob (elem->get_object ("axis-group-parent-X")))
         elem->set_object ("axis-group-parent-X", col->self_scm ());
 
       if (Accidental_placement::has_interface (elem)
@@ -259,7 +259,8 @@ Paper_column_engraver::stop_translation_timestep ()
       for (vsize i = 0; i < break_events_.size (); i++)
         {
           SCM perm = break_events_[i]->get_property ("break-permission");
-          if (perm == ly_symbol2scm ("force") || perm == ly_symbol2scm ("allow"))
+          if (scm_is_eq (perm, ly_symbol2scm ("force"))
+              || scm_is_eq (perm, ly_symbol2scm ("allow")))
             warning (_ ("forced break was overridden by some other event, "
                         "should you be using bar checks?"));
         }
@@ -279,7 +280,7 @@ Paper_column_engraver::stop_translation_timestep ()
 
   SCM mpos = get_property ("measurePosition");
   SCM barnum = get_property ("internalBarNumber");
-  if (Moment::unsmob (mpos)
+  if (Moment::is_smob (mpos)
       && scm_is_integer (barnum))
     {
       SCM where = scm_cons (barnum,