X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster-engraver.cc;h=bbf71cc175a3844e920bb971a060709b68efce12;hb=bcafa85b883969cd02a43f41ba71e1536aacec7f;hp=e5ed481f6a53d8e32820f4d96ff4ac424717291f;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index e5ed481f6a..bbf71cc175 100644
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -1,9 +1,21 @@
 /*
-  cluster-engraver.cc -- implement Cluster_engraver
-
-  (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 2002--2011 Juergen Reuter <reuter@ipd.uka.de>
   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"
@@ -28,7 +40,7 @@ protected:
   virtual void process_music ();
   virtual void finalize ();
 private:
-  vector<Stream_event*> cluster_notes_;
+  vector<Stream_event *> cluster_notes_;
   Item *beacon_;
 
   void typeset_grobs ();
@@ -55,7 +67,17 @@ Cluster_spanner_engraver::finalize ()
 void
 Cluster_spanner_engraver::typeset_grobs ()
 {
-  finished_spanner_ = 0;
+  if (finished_spanner_)
+    {
+      if (!finished_spanner_->get_bound (RIGHT))
+        {
+          finished_spanner_->set_bound (RIGHT,
+                                        finished_spanner_->get_bound (LEFT));
+
+        }
+
+      finished_spanner_ = 0;
+    }
   beacon_ = 0;
 }
 
@@ -78,19 +100,19 @@ Cluster_spanner_engraver::process_music ()
       int pmin = INT_MAX;
 
       for (vsize i = 0; i < cluster_notes_.size (); i++)
-	{
-	  Pitch *pit = unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
+        {
+          Pitch *pit = unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
 
-	  int p = (pit ? pit->steps () : 0) + c0;
+          int p = (pit ? pit->steps () : 0) + c0;
 
-	  pmax = max (pmax, p);
-	  pmin = min (pmin, p);
-	}
+          pmax = max (pmax, p);
+          pmin = min (pmin, p);
+        }
 
       beacon_ = make_item ("ClusterSpannerBeacon", cluster_notes_[0]->self_scm ());
       beacon_->set_property ("positions",
-			     scm_cons (scm_from_int (pmin),
-				       scm_from_int (pmax)));
+                             scm_cons (scm_from_int (pmin),
+                                       scm_from_int (pmax)));
     }
 
   if (beacon_ && !spanner_)
@@ -122,11 +144,17 @@ Cluster_spanner_engraver::acknowledge_note_column (Grob_info info)
 
 ADD_ACKNOWLEDGER (Cluster_spanner_engraver, note_column);
 ADD_TRANSLATOR (Cluster_spanner_engraver,
-		/* doc */
-		"Engraves a cluster using Spanner notation ",
-		/* create */
-		"ClusterSpanner "
-		"ClusterSpannerBeacon ",
-		/* read */ 	"",
-		/* write */	"");
+                /* doc */
+                "Engrave a cluster using @code{Spanner} notation.",
+
+                /* create */
+                "ClusterSpanner "
+                "ClusterSpannerBeacon ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );