* scm/lily.scm (define-scheme-options): add clip-systems option.

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

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index d3602d732a3b9c49b4c74ad036f72432197b88af..1bc0c6b0e506f3a22f891029576f75fa9dc71c40 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -7,6 +7,8 @@
 */
 
 #include "paper-column-engraver.hh"
+#include "system.hh"
+#include "international.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
 #include "item.hh"
@@ -27,8 +29,6 @@ Paper_column_engraver::Paper_column_engraver ()
   breaks_ = 0;
   system_ = 0;
   first_ = true;
-  last_breakable_column_ = 0;
-  last_breakable_moment_ = Moment (-1);
 }
 
 void
@@ -40,6 +40,7 @@ Paper_column_engraver::finalize ()
   if (command_column_)
     {
       command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow"));
+      command_column_->set_property ("page-turn-permission", ly_symbol2scm ("allow"));
       system_->set_bound (RIGHT, command_column_);
     }
 }
@@ -84,6 +85,7 @@ Paper_column_engraver::acknowledge_staff_spacing (Grob_info gi)
                                     ly_symbol2scm ("spacing-wishes"),
                                     gi.grob ());
 }
+
 void
 Paper_column_engraver::acknowledge_note_spacing (Grob_info gi)
 {
@@ -191,29 +193,26 @@ Paper_column_engraver::stop_translation_timestep ()
   else if (Paper_column::is_breakable (command_column_))
     {
       breaks_++;
-      last_breakable_column_ = command_column_;
-      last_breakable_moment_ = now_mom ();
+
       if (! (breaks_%8))
        progress_indication ("[" + to_string (breaks_) + "]");
     }
 
-  SCM page_br = get_property ("allowPageTurn");
-  if (scm_is_pair (page_br) && last_breakable_moment_ >= Rational (0))
-    {
-      SCM pen = scm_cdr (page_br);
-      Moment *m = unsmob_moment (scm_car (page_br));
-      if (m && scm_is_number (pen) && *m <= last_breakable_moment_)
-       {
-         last_breakable_column_->set_property ("page-turn-permission", ly_symbol2scm ("allow"));
-         last_breakable_column_->set_property ("page-turn-penalty", pen);
-       }
-    }
-
   context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak"));
-  context ()->get_score_context ()->unset_property (ly_symbol2scm ("allowPageTurn"));
 
   first_ = false;
   break_events_.clear ();
+
+
+  SCM mpos = get_property ("measurePosition");
+  if (unsmob_moment (mpos))
+    {
+      SCM where = scm_cons (get_property ("internalBarNumber"),
+                           mpos);
+
+      command_column_->set_property ("rhythmic-location", where);
+      musical_column_->set_property ("rhythmic-location", where);
+    }
 }
 
 void
@@ -247,9 +246,9 @@ ADD_TRANSLATOR (Paper_column_engraver,
                /* accept */ "break-event",
                /* read */
                 "forbidBreak "
-                "allowPageTurn",
+               ,
                /* write */
                 "forbidBreak "
-                "allowPageTurn "
                "currentCommandColumn "
-               "currentMusicalColumn");
+               "currentMusicalColumn "
+               );