Don't let lyrics interfere with StaffGrouper.

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

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index 3e03d9b8e04199cd8fb42420ff23740282d081e9..223fd1f05a94298f53c1bb3d6b188b536fa22fda 100644 (file)
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -1,11 +1,22 @@
 /*
-  hyphen-engraver.cc -- implement Hyphen_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1999--2007 Glen Prideaux <glenprideaux@iname.com>,
+  Copyright (C) 1999--2010 Glen Prideaux <glenprideaux@iname.com>,
   Han-Wen Nienhuys <hanwen@xs4all.nl>,
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  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"
@@ -52,13 +63,13 @@ void
 Hyphen_engraver::acknowledge_lyric_syllable (Grob_info i)
 {
   Item *item = i.item ();
-  
+
   if (!hyphen_)
     hyphen_ = make_spanner ("LyricSpace", item->self_scm ());
 
   if (hyphen_)
     hyphen_->set_bound (LEFT, item);
-      
+
   if (finished_hyphen_)
     finished_hyphen_->set_bound (RIGHT, item);
 }
@@ -126,7 +137,7 @@ Hyphen_engraver::stop_translation_timestep ()
       finished_hyphen_ = 0;
       finished_ev_ = 0;
     }
-  
+
   if (finished_hyphen_ && hyphen_)
     {
       programming_error ("hyphen not finished yet");
@@ -139,7 +150,7 @@ Hyphen_engraver::stop_translation_timestep ()
       finished_hyphen_ = hyphen_;
       finished_ev_ = ev_;
     }
-  
+
   hyphen_ = 0;
   ev_ = 0;
 }
@@ -147,8 +158,16 @@ Hyphen_engraver::stop_translation_timestep ()
 ADD_ACKNOWLEDGER (Hyphen_engraver, lyric_syllable);
 
 ADD_TRANSLATOR (Hyphen_engraver,
-               /* doc */ "Create lyric hyphens and "
-               "distance constraints between words.",
-               /* create */ "LyricHyphen LyricSpace",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Create lyric hyphens and distance constraints between words.",
+
+               /* create */
+               "LyricHyphen "
+               "LyricSpace ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );