X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=0213ff3440cce0e09e0e91957845e1698e490da8;hb=266a1dfe19ef50999bec6543f261ce340f2bc808;hp=e0c459684e7d2a5e27e71825f439cc139c72168c;hpb=f390b03c03489ad550469328fcd50c4490121216;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index e0c459684e..0213ff3440 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,22 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <ctype.h>
-#include "bar-line.hh"
+#include <cctype>
 
-#include "staff-symbol.hh"
+#include "bar-line.hh"
+#include "context.hh"
 #include "engraver-group-engraver.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"
+#include "warn.hh"
 #include "text-item.hh"
 
 /**
@@ -28,20 +22,18 @@
 class Mark_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Mark_engraver);
+  TRANSLATOR_DECLARATIONS (Mark_engraver);
 protected:
-  Item* text_;
-  
+  Item *text_;
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
   void create_items (Music*);
-  virtual bool try_music (Music *req);
-  virtual void start_translation_timestep ();
+  virtual bool try_music (Music *ev);
   virtual void process_music ();
   
 private:
-  Music * mark_req_;
+  Music * mark_ev_;
 };
 
 
@@ -50,8 +42,8 @@ private:
 
 Mark_engraver::Mark_engraver ()
 {
-  text_ =0;
-  mark_req_ = 0;
+  text_ = 0;
+  mark_ev_ = 0;
 }
 
 void
@@ -61,8 +53,9 @@ Mark_engraver::acknowledge_grob (Grob_info inf)
   if (text_ && Bar_line::has_interface (s))
     {
       /*
-	Ugh. Figure out how to do this right at beginning of line, (without
-	creating class Bar_script : public Item).
+      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);
     }
@@ -73,122 +66,87 @@ Mark_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
-      typeset_grob (text_);
-      text_ =0;
+      SCM lst = get_property ("stavesFound");
+      text_->set_property ("side-support-elements" , lst);
+      text_ = 0;
     }
+  mark_ev_ = 0;
 }
 
 
 void
-Mark_engraver::create_items (Music *rq)
+Mark_engraver::create_items (Music *ev)
 {
   if (text_)
     return;
 
-  SCM s = get_property ("RehearsalMark");
-  text_ = new Item (s);
-
-
-  announce_grob(text_, rq->self_scm());
-}
-
-
-void
-Mark_engraver::start_translation_timestep ()
-{
-  mark_req_ = 0;
+  text_ = make_item ("RehearsalMark", ev->self_scm ());
 }
 
 
 bool
 Mark_engraver::try_music (Music* r)
 {
-  mark_req_ = r;
+  mark_ev_ = r;
   return true;
 }
 
 
 /*
-
   TODO: make the increment function in Scheme.
-
 */
 void
 Mark_engraver::process_music ()
 {
-  if (mark_req_)
+  if (mark_ev_)
     {
-      create_items (mark_req_);
-
-      String t;
+      create_items (mark_ev_);
 
       /*
 	automatic marks.
        */
+
       
-      SCM m = mark_req_->get_mus_property ("label");
-      if (gh_pair_p (m) || new_markup_p (m))
-	{
-	  text_->set_grob_property ("text",m);
-	}
-      else 
+      SCM m = mark_ev_->get_property ("label");
+      SCM proc = get_property ("markFormatter");
+      if (!Text_interface::markup_p (m) &&
+	  ly_c_procedure_p (proc))
 	{
-	  if (!gh_string_p (m) && !gh_number_p (m)) 
+	  if (!scm_is_number (m)) 
 	    m =  get_property ("rehearsalMark");
-	  
-	  if (gh_number_p (m))
+
+	  if (scm_integer_p (m) == SCM_BOOL_T
+	      && scm_exact_p (m) == SCM_BOOL_T)
 	    {
-	      int mark_count = gh_scm2int (m);
-	      t = to_string (mark_count);
+	      int mark_count = scm_to_int (m);
 	      mark_count ++;
-	      m = gh_int2scm (mark_count);
-	    }
-	  else if (gh_string_p (m))
-	    {
-	      t = ly_scm2string (m);
-	      String next;
-	      if (t.length ())
-		{
-		  char c = t[0];
-		  c++;
-		  next = to_string (c);
-		}
-	      m = scm_makfrom0str (next.to_str0 ());
+	      context ()->set_property ("rehearsalMark",
+					    scm_int2num (mark_count));
 	    }
+
+	  if (scm_is_number (m))
+	    m = scm_call_2 (proc, m, context ()->self_scm ());
 	  else
-	    {
-	      m = gh_int2scm (1);
-	    }
-	  
-	  daddy_trans_->set_property ("rehearsalMark", m);
-	  
-	  text_->set_grob_property ("text",
-				      scm_makfrom0str (t.to_str0 ()));
-
-	  SCM series = SCM_EOL;
-	  SCM family = ly_symbol2scm ("number");
-	  for (int i=0; i < t.length (); i++)
-	    {
-	      if (!isdigit (t[i])) 
-		{
-		  series = ly_symbol2scm ("bold");
-		  family = ly_symbol2scm ("roman");
-		  break;
-		}
-	    }
-	  if (gh_symbol_p (series))
-	    text_->set_grob_property ("font-series",  series);
-	  if (gh_symbol_p (family))
-	    text_->set_grob_property ("font-family",  family);
+	    warning ("rehearsalMark does not have integer value.");
 	}
+
+      if (Text_interface::markup_p (m))
+	text_->set_property ("text", m);
+      else
+	warning ("Mark label should be markup object.");
     }
 }
 
-ENTER_DESCRIPTION(Mark_engraver,
-/* descr */       "",
+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 stavesFound",
+/* reads */       "rehearsalMark markFormatter stavesFound",
 /* write */       "");