X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=f495cf9501ad1abc195d302edc49d595b794b704;hb=f9efd2c54b174591fa42889557686c7aea356547;hp=92752b2d9b60e8bfb7a6fa090a4810e00641e3e2;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 92752b2d9b..f495cf9501 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,55 +3,193 @@
 
   source file of the GNU LilyPond music typesetter
 
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
+
+#include <ctype.h>
+#include "bar-line.hh"
 #include "command-request.hh"
-#include "mark-engraver.hh"
+#include "staff-symbol.hh"
 #include "engraver-group-engraver.hh"
-#include "text-item.hh"
+#include "engraver.hh"
+#include "lily-guile.hh"
+#include "paper-column.hh"
+#include "paper-def.hh"
+#include "side-position-interface.hh"
+#include "staff-symbol-referencer.hh"
+#include "item.hh"
+#include "group-interface.hh"
+
+/**
+  put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
+  rehearsal marks.
+ */
+class Mark_engraver : public Engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS(Mark_engraver);
+protected:
+  Item* text_p_;
+  
+protected:
+  virtual void stop_translation_timestep ();
+  virtual void acknowledge_grob (Grob_info);
+  void create_items (Request*);
+  virtual bool try_music (Music *req_l);
+  virtual void start_translation_timestep ();
+  virtual void process_music ();
+  
+private:
+  Mark_req * mark_req_l_;
+};
+
+
 
 
-ADD_THIS_TRANSLATOR (Mark_engraver);
 
 Mark_engraver::Mark_engraver ()
 {
+  text_p_ =0;
   mark_req_l_ = 0;
-  axis_ = Y_AXIS;
-  type_ = "mark";
-  visibility_lambda_ = ly_eval_str ("mark-visibility");
 }
 
 void
-Mark_engraver::do_post_move_processing ()
+Mark_engraver::acknowledge_grob (Grob_info inf)
+{
+  Grob * s = inf.grob_l_;
+  if (text_p_ && Bar_line::has_interface (s))
+    {
+      /*
+	Ugh. Figure out how to do this right at beginning of line, (without
+	creating class Bar_script : public Item).
+      */
+      text_p_->set_parent (s, X_AXIS);
+    }
+}
+
+void 
+Mark_engraver::stop_translation_timestep ()
+{
+  if (text_p_)
+    {
+      text_p_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
+      typeset_grob (text_p_);
+      text_p_ =0;
+    }
+}
+
+
+void
+Mark_engraver::create_items (Request *rq)
+{
+  if (text_p_)
+    return;
+
+  SCM s = get_property ("RehearsalMark");
+  text_p_ = new Item (s);
+
+
+  announce_grob(text_p_, rq->self_scm());
+}
+
+
+void
+Mark_engraver::start_translation_timestep ()
 {
   mark_req_l_ = 0;
 }
 
 
 bool
-Mark_engraver::do_try_music (Music* r_l)
+Mark_engraver::try_music (Music* r_l)
 {
   if (Mark_req *mr = dynamic_cast <Mark_req *> (r_l))
     {
+      if (mark_req_l_ && mr->equal_b (mark_req_l_))
+	return true;
+      if (mark_req_l_)
+	return false;
       mark_req_l_ = mr;
       return true;
     }
   return false;
 }
 
+
+/*
+
+  TODO: make the increment function in Scheme.
+
+*/
 void
-Mark_engraver::do_process_requests ()
+Mark_engraver::process_music ()
 {
   if (mark_req_l_)
     {
       create_items (mark_req_l_);
 
-      String t = mark_req_l_->str_;
-      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);
+      String t;
+
+      /*
+	automatic marks.
+       */
+      
+      SCM m = mark_req_l_->get_mus_property ("label");
+      if (gh_pair_p (m)) // markup text
+	text_p_->set_grob_property ("text",m);
+      else 
+	{
+	  if (!gh_string_p (m) && !gh_number_p (m)) 
+	    m =  get_property ("rehearsalMark");
+	  
+	  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))
+	    {
+	      t = ly_scm2string (m);
+	      String next;
+	      if (t.length_i ())
+		{
+		  char c = t[0];
+		  c++;
+		  next = to_str (c);
+		}
+	      m = ly_str02scm (next.ch_C ());
+	    }
+	  else
+	    {
+	      m = gh_int2scm (1);
+	    }
+	  
+	  daddy_trans_l_->set_property ("rehearsalMark", m);
+	  
+	  text_p_->set_grob_property ("text",
+				      ly_str02scm (t.ch_C ()));
+
+	  String style = "mark-number";
+	  for (int i=0; i < t.length_i (); i++)
+	    {
+	      if (!isdigit (t[i])) 
+		{
+		  style = "mark-letter";
+		  break;
+		}
+	    }
+	  SCM st = ly_symbol2scm (style.ch_C ());
+	  text_p_->set_grob_property ("font-style",  st);
+	}
+
     }
 }
 
+ENTER_DESCRIPTION(Mark_engraver,
+/* descr */       "",
+/* creats*/       "RehearsalMark",
+/* acks  */       "bar-line-interface", 
+/* reads */       "rehearsalMark stavesFound",
+/* write */       "");