Imported Upstream version 2.14.2

[lilypond.git] / lily / melody-engraver.cc

diff --git a/lily/melody-engraver.cc b/lily/melody-engraver.cc
index 86e637ca3687ee79754fbbb6f5158b50bf416dec..96873d3293b778f2cdfb21bf7633cf3b382b4c67 100644 (file)
--- a/lily/melody-engraver.cc
+++ b/lily/melody-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  melody-engraver.cc -- implement Melody_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--2006 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/>.
 */
 
 
@@ -43,7 +54,8 @@ Melody_engraver::process_music ()
 void
 Melody_engraver::stop_translation_timestep ()
 {
-  if (stem_)
+  if (stem_
+      && !is_direction (stem_->get_property_data ("neutral-direction")))
     {
       extract_grob_set (stem_, "rests", rests);
       if (rests.size ())
@@ -61,9 +73,8 @@ Melody_engraver::stop_translation_timestep ()
 
 
 void
-Melody_engraver::acknowledge_slur (Grob_info info)
+Melody_engraver::acknowledge_slur (Grob_info /* info */)
 {
-  (void)info;
   melody_item_ = 0;
 }
 
@@ -82,9 +93,17 @@ ADD_ACKNOWLEDGER (Melody_engraver, stem);
 ADD_ACKNOWLEDGER (Melody_engraver, slur);
 
 ADD_TRANSLATOR (Melody_engraver,
-               "Create information for context dependent typesetting decisions. ",
-               "MelodyItem",
-               "",
+               /* doc */
+               "Create information for context dependent typesetting"
+               " decisions.",
+
+               /* create */
+               "MelodyItem ",
+
+               /* read */
                "",
-               "");
+
+               /* write */
+               ""
+               );