Fix 1214: Don't crash with \relative c' \new Voice {...}

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

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 4fef353a4638cc1a0133a3f13fe98bcfa10a5f60..d02a985cf23b88b72f0d0929ba9e6013ad4b4910 100644 (file)
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  rhythmic-column-engraver.cc -- implement Rhythmic_column_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -42,7 +53,7 @@
 
 class Rhythmic_column_engraver : public Engraver
 {
-  vector<Grob*> rheads_;
+  vector<Grob *> rheads_;
   Grob *stem_;
   Grob *note_column_;
   Grob *dotcol_;
@@ -66,18 +77,17 @@ Rhythmic_column_engraver::Rhythmic_column_engraver ()
   arpeggio_ = 0;
 }
 
-
 void
 Rhythmic_column_engraver::process_acknowledged ()
 {
   if (rheads_.size ())
     {
       if (!note_column_)
-       note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ());
+        note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ());
 
       for (vsize i = 0; i < rheads_.size (); i++)
-       if (!rheads_[i]->get_parent (X_AXIS))
-         Note_column::add_head (note_column_, rheads_[i]);
+        if (!rheads_[i]->get_parent (X_AXIS))
+          Note_column::add_head (note_column_, rheads_[i]);
 
       rheads_.resize (0);
     }
@@ -85,17 +95,14 @@ Rhythmic_column_engraver::process_acknowledged ()
   if (note_column_)
     {
       if (stem_
-         && !stem_->get_parent (X_AXIS))
-       {
-         Note_column::set_stem (note_column_, stem_);
-         stem_ = 0;
-       }
+          && !stem_->get_parent (X_AXIS))
+        {
+          Note_column::set_stem (note_column_, stem_);
+          stem_ = 0;
+        }
 
       if (arpeggio_)
-       {
-         Pointer_group_interface::add_grob (note_column_, ly_symbol2scm ("elements"), arpeggio_);
-         note_column_->set_object ("arpeggio", arpeggio_->self_scm ());
-       }
+        note_column_->set_object ("arpeggio", arpeggio_->self_scm ());
     }
 }
 
@@ -130,16 +137,16 @@ ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head);
 ADD_ACKNOWLEDGER (Rhythmic_column_engraver, arpeggio);
 
 ADD_TRANSLATOR (Rhythmic_column_engraver,
-               /* doc */
-               "Generate @code{NoteColumn}, an object that groups stems,"
-               " note heads, and rests.",
+                /* doc */
+                "Generate @code{NoteColumn}, an object that groups stems,"
+                " note heads, and rests.",
 
-               /* create */
-               "NoteColumn ",
+                /* create */
+                "NoteColumn ",
 
-               /* read */
-               "",
+                /* read */
+                "",
 
-               /* write */
-               ""
-               );
+                /* write */
+                ""
+               );