X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=e0c459684e7d2a5e27e71825f439cc139c72168c;hb=0387f04497978e37b335a8b99eec905499d6ad0f;hp=98fed7723c33f49cb2a5bdd0f3e0a9a9a85e846d;hpb=2873636a53f0011f837aaf6e2072de602730d957;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 98fed7723c..8cd1b80515 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,52 +3,157 @@
 
   source file of the GNU LilyPond music typesetter
 
- (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
-#include "command-request.hh"
-#include "mark-engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "text-item.hh"
 
+#include <cctype>
+using namespace std;
 
-ADD_THIS_TRANSLATOR (Mark_engraver);
+#include "engraver.hh"
+
+#include "axis-group-interface.hh"
+#include "bar-line.hh"
+#include "context.hh"
+#include "grob-array.hh"
+#include "international.hh"
+#include "item.hh"
+#include "stream-event.hh"
+#include "text-interface.hh"
+#include "warn.hh"
+
+#include "translator.icc"
+
+/**
+   put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
+   rehearsal marks.
+*/
+class Mark_engraver : public Engraver
+{
+
+  void create_items (Stream_event *);
+  Item *text_;
+  Stream_event *mark_ev_;
+
+public:
+  TRANSLATOR_DECLARATIONS (Mark_engraver);
+
+protected:
+  void process_music ();
+  void stop_translation_timestep ();
+
+  DECLARE_TRANSLATOR_LISTENER (mark);
+  DECLARE_ACKNOWLEDGER (break_alignment);
+};
 
 Mark_engraver::Mark_engraver ()
 {
-  mark_req_l_ = 0;
-  axis_ = Y_AXIS;
-  type_ = "mark";
-  visibility_lambda_ = ly_ch_C_eval_scm ("mark-visibility");
+  text_ = 0;
+  mark_ev_ = 0;
 }
 
 void
-Mark_engraver::do_post_move_processing ()
+Mark_engraver::acknowledge_break_alignment (Grob_info inf)
 {
-  mark_req_l_ = 0;
+  Grob *s = inf.grob ();
+  if (text_
+      && dynamic_cast<Item *> (s))
+    {
+      text_->set_parent (s, X_AXIS);
+    }
 }
 
 
-bool
-Mark_engraver::do_try_music (Music* r_l)
+void
+Mark_engraver::stop_translation_timestep ()
 {
-  if (Mark_req *mr = dynamic_cast <Mark_req *> (r_l))
-    {
-      mark_req_l_ = mr;
-      return true;
-    }
-  return false;
+  if (text_)
+  {
+    text_->set_object ("side-support-elements",
+		       grob_list_to_grob_array (get_property ("stavesFound")));
+    text_ = 0;
+  }
+  mark_ev_ = 0;
+}
+
+void
+Mark_engraver::create_items (Stream_event *ev)
+{
+  if (text_)
+    return;
+
+  text_ = make_item ("RehearsalMark", ev->self_scm ());
+}
+
+IMPLEMENT_TRANSLATOR_LISTENER (Mark_engraver, mark);
+void
+Mark_engraver::listen_mark (Stream_event *ev)
+{
+  ASSIGN_EVENT_ONCE (mark_ev_, ev);
 }
 
+/*
+  TODO: make the increment function in Scheme.
+*/
 void
-Mark_engraver::do_process_requests ()
+Mark_engraver::process_music ()
 {
-  if (mark_req_l_)
+  if (mark_ev_)
     {
-      create_items (mark_req_l_);
-      text_p_->text_str_ = mark_req_l_->str_;
-      SCM st = gh_str02scm ((text_p_->text_str_.index_any_i ("0123456789")  >= 0 )
-			    ? "mark" : "large");
-      text_p_->set_elt_property ("style",  st);
+      create_items (mark_ev_);
+
+      /*
+	automatic marks.
+      */
+
+      SCM m = mark_ev_->get_property ("label");
+      SCM proc = get_property ("markFormatter");
+      if (!Text_interface::is_markup (m)
+	  && ly_is_procedure (proc))
+	{
+	  if (!scm_is_number (m))
+	    m = get_property ("rehearsalMark");
+
+	  if (scm_integer_p (m) == SCM_BOOL_T
+	      && scm_exact_p (m) == SCM_BOOL_T)
+	    {
+	      int mark_count = scm_to_int (m);
+	      mark_count++;
+	      context ()->set_property ("rehearsalMark",
+					scm_from_int (mark_count));
+	    }
+
+	  if (scm_is_number (m))
+	    m = scm_call_2 (proc, m, context ()->self_scm ());
+	  else
+	    /* FIXME: constant error message.  */
+	    warning (_ ("rehearsalMark must have integer value"));
+	}
+
+      if (Text_interface::is_markup (m))
+	text_->set_property ("text", m);
+      else
+	warning (_ ("mark label must be a markup object"));
     }
 }
 
+ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
+
+ADD_TRANSLATOR (Mark_engraver,
+		/* doc */
+		"Create @code{RehearsalMark} objects.  It puts them on top of"
+		" all staves (which is taken from the property"
+		" @code{stavesFound}).  If moving this engraver to a different"
+		" context, @ref{Staff_collecting_engraver} must move along,"
+		" otherwise all marks end up on the same Y@tie{}location.",
+		
+		/* create */
+		"RehearsalMark ",
+
+		/* read */
+		"markFormatter "
+		"rehearsalMark "
+		"stavesFound ",
+		
+		/* write */
+		""
+		);