X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmark-engraver.cc;h=e0c459684e7d2a5e27e71825f439cc139c72168c;hb=f390b03c03489ad550469328fcd50c4490121216;hp=71119e4eb63a05e0f967f5a6070d366c7eacc7c4;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 71119e4eb6..e0c459684e 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,82 +3,192 @@
 
   source file of the GNU LilyPond music typesetter
 
- (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "mark-engraver.hh"
-#include "text-def.hh"
-#include "script.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 "command-request.hh"
-#include "time-description.hh"
-#include "engraver-group.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_;
+};
+
+
+
 
-IMPLEMENT_IS_TYPE_B1 (Mark_engraver, Engraver);
-ADD_THIS_TRANSLATOR (Mark_engraver);
 
 Mark_engraver::Mark_engraver ()
 {
-  mark_req_l_ = 0;
-  script_p_ = 0;
+  text_ =0;
+  mark_req_ = 0;
 }
 
-bool
-Mark_engraver::do_try_request (Request* r_l)
+void
+Mark_engraver::acknowledge_grob (Grob_info inf)
 {
-  Command_req* c_l = dynamic_cast <Command_req *> (r_l);
-  if (!c_l || !dynamic_cast <Mark_req *> (c_l) || mark_req_l_) 
-    return false;
-
-  mark_req_l_ = dynamic_cast <Mark_req *> (c_l);
+  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);
+    }
+}
 
-  return true;
+void 
+Mark_engraver::stop_translation_timestep ()
+{
+  if (text_)
+    {
+      text_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
+      typeset_grob (text_);
+      text_ =0;
+    }
 }
 
+
 void
-Mark_engraver::do_process_requests ()
-{  
-  if (!mark_req_l_ || script_p_)
+Mark_engraver::create_items (Music *rq)
+{
+  if (text_)
     return;
 
-  script_p_ = new Script;
-  script_p_->breakable_b_ = true;
+  SCM s = get_property ("RehearsalMark");
+  text_ = new Item (s);
 
-  Text_def *td_p = new Text_def;
 
-  td_p->text_str_ = mark_req_l_->str_;
-  td_p->align_dir_ = CENTER;
+  announce_grob(text_, rq->self_scm());
+}
 
-  td_p->style_str_ = td_p->text_str_.index_any_i ("0123456789") >= 0 
-    ? "mark" : "Large";
 
-  script_p_->dir_ = LEFT;
-  script_p_->specs_p_ = td_p->clone ();
-  script_p_->postbreak_only_b_ = true;
-  
-  Scalar padding = get_property ("markScriptPadding");
-  if (padding.length_i() && padding.isnum_b ())
-    {
-      script_p_->padding_f_ = Real(padding);
-    }
-  Scalar break_priority = get_property ("markBreakPriority");
-  if (break_priority.length_i() && break_priority.isnum_b ())
-    {
-      script_p_->break_priority_i_ = int(break_priority);
-    }
+void
+Mark_engraver::start_translation_timestep ()
+{
+  mark_req_ = 0;
+}
 
-  
-  announce_element (Score_element_info (script_p_, mark_req_l_));
+
+bool
+Mark_engraver::try_music (Music* r)
+{
+  mark_req_ = r;
+  return true;
 }
 
-void 
-Mark_engraver::do_pre_move_processing ()
+
+/*
+
+  TODO: make the increment function in Scheme.
+
+*/
+void
+Mark_engraver::process_music ()
 {
-  if (script_p_) 
+  if (mark_req_)
     {
-      typeset_element (script_p_);
-      script_p_ = 0;
-      mark_req_l_ = 0;
+      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 */       "");