X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=e0c459684e7d2a5e27e71825f439cc139c72168c;hb=b9c7ee617ca458cd8494f96175acea8b1a5bbddf;hp=1c4b966a4fa7d139629ff5c84b3abd2e1ad20fb2;hpb=4bbc3761de1012c805f55bc957cb9c7c35ef3ddc;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 1c4b966a4f..e0c459684e 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,50 +3,192 @@
 
   source file of the GNU LilyPond music typesetter
 
- (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
-#include "command-request.hh"
-#include "mark-engraver.hh"
+
+#include <ctype.h>
+#include "bar-line.hh"
+
+#include "staff-symbol.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 "text-item.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_;
+  
+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 void process_music ();
+  
+private:
+  Music * mark_req_;
+};
+
+
+
 
-ADD_THIS_TRANSLATOR (Mark_engraver);
 
 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_req_ = 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))
+    {
+      /*
+	Ugh. Figure out how to do this right at beginning of line, (without
+	creating class Bar_script : public Item).
+      */
+      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_)
     {
-      mark_req_l_ = mr;
-      return true;
+      text_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
+      typeset_grob (text_);
+      text_ =0;
     }
-  return false;
 }
 
+
+void
+Mark_engraver::create_items (Music *rq)
+{
+  if (text_)
+    return;
+
+  SCM s = get_property ("RehearsalMark");
+  text_ = new Item (s);
+
+
+  announce_grob(text_, rq->self_scm());
+}
+
+
 void
-Mark_engraver::do_process_requests ()
+Mark_engraver::start_translation_timestep ()
 {
-  if (mark_req_l_)
+  mark_req_ = 0;
+}
+
+
+bool
+Mark_engraver::try_music (Music* r)
+{
+  mark_req_ = r;
+  return true;
+}
+
+
+/*
+
+  TODO: make the increment function in Scheme.
+
+*/
+void
+Mark_engraver::process_music ()
+{
+  if (mark_req_)
     {
-      create_items (mark_req_l_);
-      text_p_->text_str_ = mark_req_l_->str_;
-      text_p_->style_str_ = text_p_->text_str_.index_any_i ("0123456789") >= 0 
-	? "mark" : "Large";
+      create_items (mark_req_);
+
+      String t;
+
+      /*
+	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 
+	{
+	  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_string (mark_count);
+	      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 ());
+	    }
+	  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);
+	}
     }
 }
+
+ENTER_DESCRIPTION(Mark_engraver,
+/* descr */       "",
+/* creats*/       "RehearsalMark",
+/* accepts */     "mark-event",
+/* acks  */       "bar-line-interface",
+/* reads */       "rehearsalMark stavesFound",
+/* write */       "");