Emit not-quite-cross-staff beams in the right context.

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

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index bce6febc435a83459b00cbcd992bf7c29869ff36..8b2b550f2f460891acb13dc46d2a36d3a1e15d14 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--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2011 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
@@ -42,6 +42,7 @@ Paper_column_engraver::Paper_column_engraver ()
   breaks_ = 0;
   system_ = 0;
   first_ = true;
+  made_columns_ = false;
 }
 
 void
@@ -50,6 +51,14 @@ Paper_column_engraver::finalize ()
   if (! (breaks_ % 8))
     progress_indication ("[" + to_string (breaks_) + "]");
 
+  if (!made_columns_)
+    {
+      make_columns ();
+      SCM m = now_mom ().smobbed_copy ();
+      command_column_->set_property ("when", m);
+      musical_column_->set_property ("when", m);
+    }
+
   if (command_column_)
     {
       if (!scm_is_symbol (command_column_->get_property ("line-break-permission")))
@@ -199,6 +208,9 @@ Paper_column_engraver::process_music ()
 void
 Paper_column_engraver::stop_translation_timestep ()
 {
+  if (to_boolean (get_property ("skipTypesetting")))
+    return;
+
   SCM m = now_mom ().smobbed_copy ();
   command_column_->set_property ("when", m);
   musical_column_->set_property ("when", m);
@@ -264,11 +276,11 @@ Paper_column_engraver::stop_translation_timestep ()
 void
 Paper_column_engraver::start_translation_timestep ()
 {
-  /*
-    TODO: don't make columns when skipTypesetting is true.
-  */
-  if (!first_)
-    make_columns ();
+  if (!first_ && !to_boolean (get_property ("skipTypesetting")))
+    {
+      make_columns ();
+      made_columns_ = true;
+    }
 }
 
 ADD_ACKNOWLEDGER (Paper_column_engraver, item);