*** empty log message ***

[lilypond.git] / lily / mark-engraver.cc

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index b3f9bf9f0c93f76fec4ea6fcd92ba1798d3cd9e9..0213ff3440cce0e09e0e91957845e1698e490da8 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,81 +3,150 @@
 
   source file of the GNU LilyPond music typesetter
 
- (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "mark-engraver.hh"
-#include "text-def.hh"
-#include "script.hh"
-#include "paper-def.hh"
-#include "command-request.hh"
-#include "time-description.hh"
-#include "engraver-group.hh"
+#include <cctype>
+
+#include "bar-line.hh"
+#include "context.hh"
+#include "engraver-group-engraver.hh"
+#include "item.hh"
+#include "warn.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 *ev);
+  virtual void process_music ();
+  
+private:
+  Music * mark_ev_;
+};
+
+
 
 
-ADD_THIS_TRANSLATOR (Mark_engraver);
 
 Mark_engraver::Mark_engraver ()
 {
-  mark_req_l_ = 0;
-  script_p_ = 0;
+  text_ = 0;
+  mark_ev_ = 0;
 }
 
-bool
-Mark_engraver::do_try_music (Music* r_l)
+void
+Mark_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Mark_req *mr = dynamic_cast <Mark_req *> (r_l))
+  Grob * s = inf.grob_;
+  if (text_ && Bar_line::has_interface (s))
     {
-      mark_req_l_ = mr;
-      return true;
+      /*
+      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);
     }
-  return false;
 }
 
-void
-Mark_engraver::do_process_requests ()
-{  
-  if (!mark_req_l_ || script_p_)
-    return;
-
-  script_p_ = new Script;
-  //  script_p_->breakable_b_ = true;
+void 
+Mark_engraver::stop_translation_timestep ()
+{
+  if (text_)
+    {
+      SCM lst = get_property ("stavesFound");
+      text_->set_property ("side-support-elements" , lst);
+      text_ = 0;
+    }
+  mark_ev_ = 0;
+}
 
-  Text_def *td_p = new Text_def;
 
-  td_p->text_str_ = mark_req_l_->str_;
-  td_p->align_dir_ = CENTER;
+void
+Mark_engraver::create_items (Music *ev)
+{
+  if (text_)
+    return;
 
-  td_p->style_str_ = td_p->text_str_.index_any_i ("0123456789") >= 0 
-    ? "mark" : "Large";
+  text_ = make_item ("RehearsalMark", ev->self_scm ());
+}
 
-  script_p_->dir_ = UP;
-  script_p_->specs_p_ = td_p->clone ();
-  // script_p_->postbreak_only_b_ = false;
-  
-  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);
-    }
 
-  
-  announce_element (Score_element_info (script_p_, mark_req_l_));
+bool
+Mark_engraver::try_music (Music* r)
+{
+  mark_ev_ = 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_ev_)
     {
-      typeset_element (script_p_);
-      script_p_ = 0;
-      mark_req_l_ = 0;
+      create_items (mark_ev_);
+
+      /*
+       automatic marks.
+       */
+
+      
+      SCM m = mark_ev_->get_property ("label");
+      SCM proc = get_property ("markFormatter");
+      if (!Text_interface::markup_p (m) &&
+         ly_c_procedure_p (proc))
+       {
+         if (!scm_is_number (m)) 
+           m =  get_property ("rehearsalMark");
+
+         if (scm_integer_p (m) == SCM_BOOL_T
+             && scm_exact_p (m) == SCM_BOOL_T)
+           {
+             int mark_count = scm_to_int (m);
+             mark_count ++;
+             context ()->set_property ("rehearsalMark",
+                                           scm_int2num (mark_count));
+           }
+
+         if (scm_is_number (m))
+           m = scm_call_2 (proc, m, context ()->self_scm ());
+         else
+           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.");
     }
 }
 
+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 markFormatter stavesFound",
+/* write */       "");