Housekeeping; 2005->2006, remove "notes for 2.6"

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

diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 680deae2bf7ed41ec8c450fca576b431b444a189..517d1c565333b3188f440bd1bdd056d432db71a8 100644 (file)
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column-engraver.hh"
@@ -21,6 +21,7 @@
 
 Paper_column_engraver::Paper_column_engraver ()
 {
+  last_moment_.main_part_ = Rational (-1,1); 
   command_column_ = 0;
   musical_column_ = 0;
   breaks_ = 0;
@@ -71,7 +72,7 @@ Paper_column_engraver::initialize ()
 void
 Paper_column_engraver::acknowledge_item (Grob_info gi)
 {
-  items_.push (gi.item ());
+  items_.push_back (gi.item ());
 }
 
 void
@@ -96,14 +97,10 @@ Paper_column_engraver::set_columns (Paper_column *new_command,
   command_column_ = new_command;
   musical_column_ = new_musical;
   if (new_command)
-    {
-      context ()->set_property ("currentCommandColumn", new_command->self_scm ());
-    }
+    context ()->set_property ("currentCommandColumn", new_command->self_scm ());
 
   if (new_musical)
-    {
-      context ()->set_property ("currentMusicalColumn", new_musical->self_scm ());
-    }
+    context ()->set_property ("currentMusicalColumn", new_musical->self_scm ());
 
   system_->add_column (command_column_);
   system_->add_column (musical_column_);
@@ -172,7 +169,7 @@ Paper_column_engraver::process_music ()
 void
 Paper_column_engraver::stop_translation_timestep ()
 {
-  for (int i = 0; i < items_.size (); i++)
+  for (vsize i = 0; i < items_.size (); i++)
     {
       Item *elem = items_[i];
       if (!elem->get_parent (X_AXIS)
@@ -218,7 +215,13 @@ ADD_TRANSLATOR (Paper_column_engraver,
                "Score_engraver::forbid_breaks to stop linebreaks.  In practice, this "
                "means that you can make a breakpoint by creating a barline (assuming "
                "that there are no beams or notes that prevent a breakpoint.) ",
-               /* create */ "PaperColumn NonMusicalPaperColumn",
+               
+               /* create */
+               "PaperColumn "
+               "NonMusicalPaperColumn",
+               
                /* accept */ "break-event",
                /* read */ "",
-               /* write */ "currentCommandColumn currentMusicalColumn");
+               /* write */
+               "currentCommandColumn "
+               "currentMusicalColumn");