Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 1bc0c6b0e506f3a22f891029576f75fa9dc71c40..bef70f72a76e747ad47aef8ea160ae5686f9894a 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -11,7 +11,6 @@
 #include "international.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
-#include "item.hh"
 #include "note-spacing.hh"
 #include "paper-column.hh"
 #include "pointer-group-interface.hh"
@@ -205,9 +204,11 @@ Paper_column_engraver::stop_translation_timestep ()
 
 
   SCM mpos = get_property ("measurePosition");
-  if (unsmob_moment (mpos))
+  SCM barnum = get_property ("internalBarNumber");
+  if (unsmob_moment (mpos)
+      && scm_is_integer (barnum))
     {
-      SCM where = scm_cons (get_property ("internalBarNumber"),
+      SCM where = scm_cons (barnum,
                            mpos);
 
       command_column_->set_property ("rhythmic-location", where);
@@ -242,8 +243,6 @@ ADD_TRANSLATOR (Paper_column_engraver,
                /* create */
                "PaperColumn "
                "NonMusicalPaperColumn",
-               
-               /* accept */ "break-event",
                /* read */
                 "forbidBreak "
                ,