X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=4130dcbfd996bced7a949465434de500777d39f7;hb=ee9d99190ecd2a054322eabca66b1e0c2507474f;hp=d872f5cc53c05d47456e4e9447c5933f52a657d8;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index d872f5cc53..4130dcbfd9 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,11 +3,11 @@
 
   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.hh"
+#include "bar-line.hh"
 #include "command-request.hh"
 #include "staff-symbol.hh"
 #include "engraver-group-engraver.hh"
@@ -15,7 +15,6 @@
 #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"
@@ -28,27 +27,24 @@
 class Mark_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Mark_engraver ();
+  TRANSLATOR_DECLARATIONS(Mark_engraver);
 protected:
   Item* text_p_;
   
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
-  void create_items(Request*);
+  void create_items (Request*);
   virtual bool try_music (Music *req_l);
-  void deprecated_process_music ();
   virtual void start_translation_timestep ();
-  virtual void do_creation_processing ();
-  virtual void create_grobs ();
+  virtual void process_music ();
   
 private:
   Mark_req * mark_req_l_;
 };
 
 
-ADD_THIS_TRANSLATOR (Mark_engraver);
+
 
 
 Mark_engraver::Mark_engraver ()
@@ -57,26 +53,11 @@ Mark_engraver::Mark_engraver ()
   mark_req_l_ = 0;
 }
 
-void
-Mark_engraver::do_creation_processing ()
-{
-  daddy_trans_l_->set_property ("staffsFound", SCM_EOL); // ugh: sharing with barnumber grav.
-}
-
-
 void
 Mark_engraver::acknowledge_grob (Grob_info inf)
 {
-  Grob * s = inf.elem_l_;
-  if (Staff_symbol::has_interface (s)
-      || to_boolean (s->get_grob_property ("invisible-staff")))
-    {
-      SCM sts = get_property ("staffsFound");
-      SCM thisstaff = inf.elem_l_->self_scm ();
-      if (scm_memq (thisstaff, sts) == SCM_BOOL_F)
-	daddy_trans_l_->set_property ("staffsFound", gh_cons (thisstaff, sts));
-    }
-  else if (text_p_ && Bar::has_interface (s))
+  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
@@ -91,7 +72,7 @@ Mark_engraver::stop_translation_timestep ()
 {
   if (text_p_)
     {
-      text_p_->set_grob_property("side-support-elements" , get_property ("staffsFound"));
+      text_p_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
       typeset_grob (text_p_);
       text_p_ =0;
     }
@@ -108,9 +89,9 @@ Mark_engraver::create_items (Request *rq)
   text_p_ = new Item (s);
 
 
-  Side_position::set_axis (text_p_, Y_AXIS);
+  Side_position_interface::set_axis (text_p_, Y_AXIS);
 
-  announce_grob (text_p_, rq);
+  announce_grob(text_p_, rq->self_scm());
 }
 
 
@@ -136,14 +117,14 @@ Mark_engraver::try_music (Music* r_l)
   return false;
 }
 
-void
-Mark_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
 
+/*
+
+  TODO: make the increment function in Scheme.
+
+*/
 void
-Mark_engraver::deprecated_process_music ()
+Mark_engraver::process_music ()
 {
   if (mark_req_l_)
     {
@@ -156,51 +137,62 @@ Mark_engraver::deprecated_process_music ()
        */
       
       SCM m = mark_req_l_->get_mus_property ("label");
-      if (!gh_string_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))
+      if (gh_pair_p (m)) // markup text
+	text_p_->set_grob_property ("text",m);
+      else 
 	{
-	  t = ly_scm2string (m);
-	  String next;
-	  if (t.length_i ())
+	  if (!gh_string_p (m)) 
+	    m =  get_property ("rehearsalMark");
+	  ;
+	  
+	  if (gh_number_p (m))
 	    {
-	      char c = t[0];
-	      c++;
-	      next = to_str (c);
+	      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);
 	    }
-	  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()));
+	  daddy_trans_l_->set_property ("rehearsalMark", m);
+	  
+	  text_p_->set_grob_property ("text",
+				      ly_str02scm (t.ch_C ()));
 
-      String style = "mark";
-      for (int i=0; i < t.length_i(); i++)
-	{
-	  if (!isdigit(t[i])) 
+	  String style = "mark";
+	  for (int i=0; i < t.length_i (); i++)
 	    {
-	      style = "large";
-	      break;
+	      if (!isdigit (t[i])) 
+		{
+		  style = "large";
+		  break;
+		}
 	    }
+	  SCM st = ly_symbol2scm (style.ch_C ());
+	  text_p_->set_grob_property ("font-style",  st);
 	}
-      SCM st = ly_symbol2scm (style.ch_C());
-      text_p_->set_grob_property ("style",  st);
+
     }
 }
 
+ENTER_DESCRIPTION(Mark_engraver,
+/* descr */       "",
+/* creats*/       "RehearsalMark",
+/* acks  */       "bar-line-interface", 
+/* reads */       "rehearsalMark stavesFound",
+/* write */       "");