X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=084af60a3eddb46049e911148a278ae74a6a248f;hb=388121aed1734e9e536ede58bd3de98b68367842;hp=3c3777d5e85aa36944ada32057eb8a3f4ddde1ed;hpb=02ad2d3bb642d9228c4ae69efc71a74bd222575f;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 3c3777d5e8..084af60a3e 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,106 +3,150 @@
 
   source file of the GNU LilyPond music typesetter
 
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "command-request.hh"
-#include "bar-script-engraver.hh"
+#include <cctype>
+
+#include "bar-line.hh"
+#include "context.hh"
 #include "engraver-group-engraver.hh"
+#include "item.hh"
+#include "warn.hh"
 #include "text-item.hh"
 
-/**Print rehearsal marks.
-  */
-class Mark_engraver : public Bar_script_engraver 
+/**
+  put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
+  rehearsal marks.
+ */
+class Mark_engraver : public Engraver
 {
 public:
-  Mark_engraver ();
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS (Mark_engraver);
+protected:
+  Item *text_;
 protected:
-  virtual bool do_try_music (Music *req_l);
-  virtual void do_process_requests ();
-  virtual void do_post_move_processing ();
+  virtual void stop_translation_timestep ();
+  virtual void acknowledge_grob (Grob_info);
+  void create_items (Music*);
+  virtual bool try_music (Music *ev);
+  virtual void process_music ();
+  
 private:
-  Mark_req * mark_req_l_;
+  Music * mark_ev_;
 };
 
 
-ADD_THIS_TRANSLATOR (Mark_engraver);
+
+
 
 Mark_engraver::Mark_engraver ()
 {
-  mark_req_l_ = 0;
-  axis_ = Y_AXIS;
-  type_ = "mark";
+  text_ = 0;
+  mark_ev_ = 0;
 }
 
 void
-Mark_engraver::do_post_move_processing ()
+Mark_engraver::acknowledge_grob (Grob_info inf)
 {
-  mark_req_l_ = 0;
+  Grob * s = inf.grob_;
+  if (text_ && Bar_line::has_interface (s))
+    {
+      /*
+      TODO: make this configurable. RehearsalMark cannot be
+      break-aligned, since the width of the object should not be taken
+      into alignment considerations.
+      */
+      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))
+  if (text_)
     {
-      if (mark_req_l_ && mr->equal_b (mark_req_l_))
-	return true;
-      if (mark_req_l_)
-	return false;
-      mark_req_l_ = mr;
-      return true;
+      SCM lst = get_property ("stavesFound");
+      text_->set_property ("side-support-elements" , lst);
+      text_ = 0;
     }
-  return false;
+  mark_ev_ = 0;
 }
 
+
 void
-Mark_engraver::do_process_requests ()
+Mark_engraver::create_items (Music *ev)
+{
+  if (text_)
+    return;
+
+  text_ = make_item ("RehearsalMark", ev->self_scm ());
+}
+
+
+bool
+Mark_engraver::try_music (Music* r)
 {
-  if (mark_req_l_)
+  mark_ev_ = r;
+  return true;
+}
+
+
+/*
+  TODO: make the increment function in Scheme.
+*/
+void
+Mark_engraver::process_music ()
+{
+  if (mark_ev_)
     {
-      create_items (mark_req_l_);
+      create_items (mark_ev_);
 
-      String t;
+      /*
+	automatic marks.
+       */
 
-      SCM m = (mark_req_l_->mark_label_ == SCM_UNDEFINED)
-	? get_property ("rehearsalMark")
-	: SCM(mark_req_l_->mark_label_);
       
-      if (gh_number_p (m))
-	{
-	  int mark_count = gh_scm2int (m);
-	  t = to_str (mark_count);
-	  mark_count ++;
-	  m = gh_int2scm (mark_count);
-	}
-      else if (gh_string_p (m))
+      SCM m = mark_ev_->get_property ("label");
+      SCM proc = get_property ("markFormatter");
+      if (!Text_interface::markup_p (m) &&
+	  ly_c_procedure_p (proc))
 	{
-	  t = ly_scm2string (m);
-	  String next;
-	  if (t.length_i ())
+	  if (!scm_is_number (m)) 
+	    m =  get_property ("rehearsalMark");
+
+	  if (scm_integer_p (m) == SCM_BOOL_T
+	      && scm_exact_p (m) == SCM_BOOL_T)
 	    {
-	      char c = t[0];
-	      c++;
-	      next = to_str (c);
+	      int mark_count = scm_to_int (m);
+	      mark_count ++;
+	      context ()->set_property ("rehearsalMark",
+					    scm_int2num (mark_count));
 	    }
-	  m = ly_str02scm (next.ch_C());
-	}
-      else
-	{
-	  m = gh_int2scm (1);
+
+	  if (scm_is_number (m))
+	    m = scm_call_2 (proc, m, context ()->self_scm ());
+	  else
+	    warning ("rehearsalMark does not have integer value.");
 	}
-	  
-      daddy_trans_l_->set_property ("rehearsalMark", m);
 
-      
-      text_p_->set_elt_property ("text",
-				 ly_str02scm ( t.ch_C()));
-      SCM st = ly_str02scm ((t.index_any_i ("0123456789")  >= 0 )
-			    ? "mark" : "large");
-      text_p_->set_elt_property ("style",  st);
+      if (Text_interface::markup_p (m))
+	text_->set_property ("text", m);
+      else
+	warning ("Mark label should be markup object.");
     }
 }
 
+ADD_TRANSLATOR (Mark_engraver,
+/* descr */       "This engraver will create 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-location"
+		   ,
+/* creats*/       "RehearsalMark",
+/* accepts */     "mark-event",
+/* acks  */       "bar-line-interface",
+/* reads */       "rehearsalMark markFormatter stavesFound",
+/* write */       "");