X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmetronome-engraver.cc;h=24c5664f14ecc2f5cfd945ccdbde83c1debf678f;hb=1d4914c023a672e0e80b9b9eafc123605f4c0f00;hp=897948d88b652a8de29aea4fb368212692ab2a45;hpb=3f8485925e8c879fe4c9ae86acef9804126c3b91;p=lilypond.git

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 897948d88b..24c5664f14 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  mark-engraver.cc -- implement Metronome_mark_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1998--2007 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 <cctype>
@@ -16,23 +27,25 @@ using namespace std;
 #include "grob-array.hh"
 #include "item.hh"
 #include "stream-event.hh"
+#include "text-interface.hh"
+#include "time-signature.hh"
 
 #include "translator.icc"
 
-/**
-   put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
-   rehearsal marks.
-*/
 class Metronome_mark_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Metronome_mark_engraver);
+
 protected:
   Item *text_;
-  Grob *bar_line_;
+  Grob *support_;
 
   SCM last_duration_;
   SCM last_count_;
+  SCM last_text_;
+
+  DECLARE_ACKNOWLEDGER (break_aligned);
   
 protected:
   virtual void derived_mark () const;
@@ -43,8 +56,10 @@ protected:
 Metronome_mark_engraver::Metronome_mark_engraver ()
 {
   text_ = 0;
+  support_ = 0;
   last_duration_ = SCM_EOL;
   last_count_ = SCM_EOL;
+  last_text_ = SCM_EOL;
 }
 
 void
@@ -52,6 +67,15 @@ Metronome_mark_engraver::derived_mark () const
 {
   scm_gc_mark (last_count_);
   scm_gc_mark (last_duration_);
+  scm_gc_mark (last_text_);
+}
+
+void
+Metronome_mark_engraver::acknowledge_break_aligned (Grob_info inf)
+{
+  Grob *s = inf.grob ();
+  if (text_ && Time_signature::has_interface (s))
+    support_ = s;
 }
 
 void
@@ -59,9 +83,22 @@ Metronome_mark_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      Grob *mc = unsmob_grob (get_property ("currentMusicalColumn"));
-      text_->set_parent (mc, X_AXIS);
+      if (!support_)
+	{
+	  /*
+	    Gardner Read "Music Notation", p.278
+
+	    Align the metronome mark over the time signature (or the
+	    first notational element of the measure if no time
+	    signature is present in that measure).
+	  */
+	  Grob *mc = unsmob_grob (get_property ("currentMusicalColumn"));
+	  text_->set_parent (mc, X_AXIS);
+	}
+      text_->set_object ("side-support-elements",
+			 grob_list_to_grob_array (get_property ("stavesFound")));
       text_ = 0;
+      support_ = 0;
     }
 }
 
@@ -70,16 +107,19 @@ Metronome_mark_engraver::process_music ()
 {
   SCM count = get_property ("tempoUnitCount");
   SCM duration = get_property ("tempoUnitDuration");
-  
-  if (unsmob_duration (duration)
-      && scm_is_number (count)
+  SCM text = get_property ("tempoText");
+
+  if ( ( (unsmob_duration (duration) && scm_is_number (count))
+        || Text_interface::is_markup (text) )
       && !(ly_is_equal (count, last_count_)
-	   && ly_is_equal (duration, last_duration_)))
+	   && ly_is_equal (duration, last_duration_)
+	   && ly_is_equal (text, last_text_)))
     {
       text_ = make_item ("MetronomeMark", SCM_EOL);
 
       SCM proc = get_property ("metronomeMarkFormatter");
-      SCM result = scm_call_3 (proc,
+      SCM result = scm_call_4 (proc,
+			       text,
 			       duration,
 			       count,
 			       context ()->self_scm ());
@@ -89,21 +129,32 @@ Metronome_mark_engraver::process_music ()
 
   last_duration_ = duration;
   last_count_ = count;
+  last_text_ = text;
 }
 
+
+
+ADD_ACKNOWLEDGER (Metronome_mark_engraver, break_aligned);
+
 ADD_TRANSLATOR (Metronome_mark_engraver,
-		/* doc */ "Engrave metro nome marking. This delegates the formatting work "
-		"to the function in the metronomeMarkFormatter property. "
-		"The mark is put over all staves. "
-		"The staves are taken from the @code{stavesFound} property, "
-		"which is maintained by @code{@ref{Staff_collecting_engraver}}. ",
-		/* create */ "MetronomeMark",
+		/* doc */
+		"Engrave metronome marking.  This delegates the formatting"
+		" work to the function in the @code{metronomeMarkFormatter}"
+		" property.  The mark is put over all staves.  The staves are"
+		" taken from the @code{stavesFound} property, which is"
+		" maintained by @ref{Staff_collecting_engraver}.",
+
+		/* create */
+		"MetronomeMark ",
 
 		/* read */
 		"stavesFound "
 		"metronomeMarkFormatter "
 		"tempoUnitDuration "
 		"tempoUnitCount "
-		,
+		"tempoText "
+		"tempoHideNote ",
 
-		/* write */ "");
+		/* write */
+		""
+		);