X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column-engraver.cc;h=481ffd14645b049bb523a3d04d02b99f08282791;hb=88e7690f21930c2a1fbbaa1d7a0b2fe85fdfa2be;hp=6a765628aa892424c8e9a81f94ad2d5eaeeb57b9;hpb=a6e270ce95375a0664531ca3a709957629f323eb;p=lilypond.git

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 6a765628aa..481ffd1464 100644
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -9,11 +9,14 @@
 #include "paper-column-engraver.hh"
 #include "system.hh"
 #include "international.hh"
+#include "accidental-placement.hh"
+#include "accidental-interface.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
 #include "note-spacing.hh"
 #include "paper-column.hh"
 #include "pointer-group-interface.hh"
+#include "separation-item.hh"
 #include "staff-spacing.hh"
 #include "system.hh"
 #include "warn.hh"
@@ -33,13 +36,13 @@ Paper_column_engraver::Paper_column_engraver ()
 void
 Paper_column_engraver::finalize ()
 {
-  if ((breaks_ % 8))
+  if (! (breaks_ % 8))
     progress_indication ("[" + to_string (breaks_) + "]");
 
   if (command_column_)
     {
-      command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow"));
-      command_column_->set_property ("page-turn-permission", ly_symbol2scm ("allow"));
+      if (!scm_is_symbol (command_column_->get_property ("line-break-permission")))
+	command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow"));
       system_->set_bound (RIGHT, command_column_);
     }
 }
@@ -116,6 +119,13 @@ Paper_column_engraver::listen_break (Stream_event *ev)
   break_events_.push_back (ev);
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Paper_column_engraver, label);
+void
+Paper_column_engraver::listen_label (Stream_event *ev)
+{
+  label_events_.push_back (ev);
+}
+
 void
 Paper_column_engraver::process_music ()
 {
@@ -150,6 +160,13 @@ Paper_column_engraver::process_music ()
 	command_column_->set_property (perm_str.c_str (), perm);
     }
 
+  for (vsize i = 0 ; i < label_events_.size () ; i ++)
+    {
+      SCM label = label_events_[i]->get_property ("page-label");
+      SCM labels = command_column_->get_property ("labels");
+      command_column_->set_property ("labels", scm_cons (label, labels));
+    }
+
   bool start_of_measure = (last_moment_.main_part_ != now_mom ().main_part_
 			   && !measure_position (context ()).main_part_);
 
@@ -178,22 +195,31 @@ Paper_column_engraver::stop_translation_timestep ()
   for (vsize i = 0; i < items_.size (); i++)
     {
       Item *elem = items_[i];
-      if (!elem->get_parent (X_AXIS)
-	  || !unsmob_grob (elem->get_object ("axis-group-parent-X")))
-	{
-	  bool br = Item::is_non_musical (elem);
-	  Axis_group_interface::add_element (br ? command_column_ : musical_column_, elem);
-	}
+      Grob *col = Item::is_non_musical (elem) ? command_column_ : musical_column_;
+
+      if (!elem->get_parent (X_AXIS))
+	elem->set_parent (col, X_AXIS);
+      if (!unsmob_grob (elem->get_object ("axis-group-parent-X")))
+	elem->set_object ("axis-group-parent-X", col->self_scm ());
+
+      if (Accidental_placement::has_interface (elem))
+	Separation_item::add_conditional_item (col, elem);
+      else if (!Accidental_interface::has_interface (elem))
+	Separation_item::add_item (col, elem);
     }
   items_.clear ();
 
-  if (to_boolean (get_property ("forbidBreak")))
+  if (to_boolean (get_property ("forbidBreak"))
+     && breaks_) /* don't honour forbidBreak if it occurs on the first moment of a score */
     {
       command_column_->set_property ("page-break-permission", SCM_EOL);
       command_column_->set_property ("line-break-permission", SCM_EOL);
-      if (break_events_.size ())
-	warning (_f ("break event at moment %d/%d was overridden by some other event, are you using bar checks?",
-		     now_mom ().num (), now_mom ().den ()));
+      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"))
+	    warning (_f ("forced break was overridden by some other event, should you be using bar checks?"));
+	}
     }
   else if (Paper_column::is_breakable (command_column_))
     {
@@ -207,7 +233,7 @@ Paper_column_engraver::stop_translation_timestep ()
 
   first_ = false;
   break_events_.clear ();
-
+  label_events_.clear ();
 
   SCM mpos = get_property ("measurePosition");
   SCM barnum = get_property ("internalBarNumber");