X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=67ad8848248c6ac091ac73f23ba80efbedd1d973;hb=fe45a114c91a41aa55198886dccf0489ae729032;hp=404644f2cea633c6ede89df0f58ab6326aaf3903;hpb=ffe548cfbb3c3b37c8969f49b5aba04ef998d080;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 404644f2ce..67ad884824 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -1,61 +1,187 @@
 /*
-  mark-engraver.cc -- implement Mark_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <cctype>
+using namespace std;
+
+#include "engraver.hh"
+
+#include "axis-group-interface.hh"
+#include "bar-line.hh"
+#include "context.hh"
+#include "grob-array.hh"
+#include "international.hh"
+#include "item.hh"
+#include "stream-event.hh"
+#include "text-interface.hh"
+#include "warn.hh"
+
+#include "translator.icc"
+
+/**
+   put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
+   rehearsal marks.
 */
-#include "command-request.hh"
-#include "mark-engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "text-item.hh"
+class Mark_engraver : public Engraver
+{
+
+  void create_items (Stream_event *);
+  Item *text_;
+  Item *final_text_;
+  Stream_event *mark_ev_;
 
+public:
+  TRANSLATOR_DECLARATIONS (Mark_engraver);
 
-ADD_THIS_TRANSLATOR (Mark_engraver);
+protected:
+  void process_music ();
+  void start_translation_timestep ();
+  void stop_translation_timestep ();
+  virtual void finalize ();
+
+  DECLARE_TRANSLATOR_LISTENER (mark);
+  DECLARE_ACKNOWLEDGER (break_alignment);
+};
 
 Mark_engraver::Mark_engraver ()
 {
-  mark_req_l_ = 0;
-  axis_ = Y_AXIS;
-  type_ = "mark";
+  text_ = 0;
+  final_text_ = 0;
+  mark_ev_ = 0;
 }
 
 void
-Mark_engraver::do_post_move_processing ()
+Mark_engraver::acknowledge_break_alignment (Grob_info inf)
 {
-  mark_req_l_ = 0;
+  Grob *s = inf.grob ();
+  if (text_
+      && dynamic_cast<Item *> (s))
+    text_->set_parent (s, X_AXIS);
 }
 
+void
+Mark_engraver::start_translation_timestep ()
+{
+  final_text_ = 0;
+}
 
-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 (mark_req_l_ && mr->equal_b (mark_req_l_))
-	return true;
-      if (mark_req_l_)
-	return false;
-      mark_req_l_ = mr;
-      return true;
-    }
-  return false;
+  if (text_)
+  {
+    text_->set_object ("side-support-elements",
+		       grob_list_to_grob_array (get_property ("stavesFound")));
+    final_text_ = text_;
+    text_ = 0;
+  }
+  mark_ev_ = 0;
 }
 
 void
-Mark_engraver::do_process_requests ()
+Mark_engraver::finalize ()
 {
-  if (mark_req_l_)
+  if (final_text_)
+    final_text_->set_property ("break-visibility",
+			       scm_c_make_vector (3, SCM_BOOL_T));
+  final_text_ = 0;
+}
+
+void
+Mark_engraver::create_items (Stream_event *ev)
+{
+  if (text_)
+    return;
+
+  text_ = make_item ("RehearsalMark", ev->self_scm ());
+}
+
+IMPLEMENT_TRANSLATOR_LISTENER (Mark_engraver, mark);
+void
+Mark_engraver::listen_mark (Stream_event *ev)
+{
+  ASSIGN_EVENT_ONCE (mark_ev_, ev);
+}
+
+/*
+  TODO: make the increment function in Scheme.
+*/
+void
+Mark_engraver::process_music ()
+{
+  if (mark_ev_)
     {
-      create_items (mark_req_l_);
-
-      String t = mark_req_l_->str_;
-      text_p_->set_elt_property ("text",
-				 ly_str02scm ( t.ch_C()));
-      SCM st = ly_str02scm ((t.index_any_i ("0123456789")  >= 0 )
-			    ? "mark" : "large");
-      text_p_->set_elt_property ("style",  st);
+      create_items (mark_ev_);
+
+      /*
+	automatic marks.
+      */
+
+      SCM m = mark_ev_->get_property ("label");
+      SCM proc = get_property ("markFormatter");
+      if (!Text_interface::is_markup (m)
+	  && ly_is_procedure (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_from_int (mark_count));
+	    }
+
+	  if (scm_is_number (m))
+	    m = scm_call_2 (proc, m, context ()->self_scm ());
+	  else
+	    /* FIXME: constant error message.  */
+	    warning (_ ("rehearsalMark must have integer value"));
+	}
+
+      if (Text_interface::is_markup (m))
+	text_->set_property ("text", m);
+      else
+	warning (_ ("mark label must be a markup object"));
     }
 }
 
+ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
+
+ADD_TRANSLATOR (Mark_engraver,
+		/* doc */
+		"Create @code{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@tie{}location.",
+		
+		/* create */
+		"RehearsalMark ",
+
+		/* read */
+		"markFormatter "
+		"rehearsalMark "
+		"stavesFound ",
+		
+		/* write */
+		""
+		);