*** empty log message ***

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

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 38efaaaf2d644c9d0f2a725fc0a45e6cf5c73bf1..d3602d732a3b9c49b4c74ad036f72432197b88af 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -7,15 +7,14 @@
 */
 
 #include "paper-column-engraver.hh"
-#include "system.hh"
+#include "axis-group-interface.hh"
+#include "context.hh"
 #include "item.hh"
-#include "paper-column.hh"
-#include "staff-spacing.hh"
 #include "note-spacing.hh"
+#include "paper-column.hh"
 #include "pointer-group-interface.hh"
-#include "context.hh"
-#include "score-context.hh"
-#include "axis-group-interface.hh"
+#include "staff-spacing.hh"
+#include "system.hh"
 #include "warn.hh"
 
 #include "translator.icc"
@@ -53,10 +52,11 @@ Paper_column_engraver::make_columns ()
   */
   Paper_column *p1 = make_paper_column ("NonMusicalPaperColumn");
   Paper_column *p2 = make_paper_column ("PaperColumn");
-
-  SCM m = now_mom ().smobbed_copy ();
-  p1->set_property ("when", m);
-  p2->set_property ("when", m);
+  /* 
+     The columns are timestamped with now_mom () in
+     stop_translation_timestep. Cannot happen now, because the
+     first column is sometimes created before now_mom is initialised.
+  */
 
   set_columns (p1, p2);
 }
@@ -108,12 +108,11 @@ Paper_column_engraver::set_columns (Paper_column *new_command,
   system_->add_column (musical_column_);
 }
 
-bool
-Paper_column_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Paper_column_engraver, break);
+void
+Paper_column_engraver::listen_break (Stream_event *ev)
 {
-  break_events_.push_back (m);
-
-  return true;
+  break_events_.push_back (ev);
 }
 
 void
@@ -122,18 +121,17 @@ Paper_column_engraver::process_music ()
   for (vsize i = 0; i < break_events_.size (); i++)
     {
       string prefix;
-      SCM name = break_events_[i]->get_property ("name");
-      if (name == ly_symbol2scm ("LineBreakEvent"))
-       prefix = "line-break";
-      else if (name == ly_symbol2scm ("PageBreakEvent"))
-       prefix = "page-break";
-      else if (name == ly_symbol2scm ("PageTurnEvent"))
-       prefix = "page-turn";
+      SCM name_sym = break_events_[i]->get_property ("class");
+      string name = ly_scm2string (scm_symbol_to_string (name_sym));
+      size_t end = name.rfind ("-event");
+      if (end)
+       prefix = name.substr (0, end);
       else
        {
          programming_error ("Paper_column_engraver doesn't know about this break-event");
          return;
        }
+
       string perm_str = prefix + "-permission";
       string pen_str = prefix + "-penalty";
 
@@ -172,6 +170,10 @@ Paper_column_engraver::process_music ()
 void
 Paper_column_engraver::stop_translation_timestep ()
 {
+  SCM m = now_mom ().smobbed_copy ();
+  command_column_->set_property ("when", m);
+  musical_column_->set_property ("when", m);
+
   for (vsize i = 0; i < items_.size (); i++)
     {
       Item *elem = items_[i];
@@ -186,11 +188,8 @@ Paper_column_engraver::stop_translation_timestep ()
 
   if (to_boolean (get_property ("forbidBreak")))
     command_column_->set_property ("line-break-permission", SCM_EOL);
-  else
+  else if (Paper_column::is_breakable (command_column_))
     {
-      if (!Paper_column::is_breakable (command_column_))
-       command_column_->set_property ("line-break-permission", ly_symbol2scm ("allow"));
-      
       breaks_++;
       last_breakable_column_ = command_column_;
       last_breakable_moment_ = now_mom ();