Web-ja: update introduction

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 657efb9f225c1ad62d7a910dd240b88b9458fe7d..b96ef69182b2ceb80abdb3e141180ca45c1db2e8 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2015 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
@@ -23,7 +23,6 @@ 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"
@@ -55,11 +54,12 @@ protected:
   void stop_translation_timestep ();
   virtual void finalize ();
 
-  DECLARE_TRANSLATOR_LISTENER (mark);
-  DECLARE_ACKNOWLEDGER (break_alignment);
+  void listen_mark (Stream_event *);
+  void acknowledge_break_alignment (Grob_info);
 };
 
-Mark_engraver::Mark_engraver ()
+Mark_engraver::Mark_engraver (Context *c)
+  : Engraver (c)
 {
   text_ = 0;
   final_text_ = 0;
@@ -85,12 +85,12 @@ void
 Mark_engraver::stop_translation_timestep ()
 {
   if (text_)
-  {
-    text_->set_object ("side-support-elements",
-                      grob_list_to_grob_array (get_property ("stavesFound")));
-    final_text_ = text_;
-    text_ = 0;
-  }
+    {
+      text_->set_object ("side-support-elements",
+                         grob_list_to_grob_array (get_property ("stavesFound")));
+      final_text_ = text_;
+      text_ = 0;
+    }
   mark_ev_ = 0;
 }
 
@@ -99,7 +99,7 @@ Mark_engraver::finalize ()
 {
   if (final_text_)
     final_text_->set_property ("break-visibility",
-                              scm_c_make_vector (3, SCM_BOOL_T));
+                               scm_c_make_vector (3, SCM_BOOL_T));
   final_text_ = 0;
 }
 
@@ -112,7 +112,6 @@ Mark_engraver::create_items (Stream_event *ev)
   text_ = make_item ("RehearsalMark", ev->self_scm ());
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Mark_engraver, mark);
 void
 Mark_engraver::listen_mark (Stream_event *ev)
 {
@@ -130,58 +129,60 @@ Mark_engraver::process_music ()
       create_items (mark_ev_);
 
       /*
-       automatic marks.
+        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"));
-       }
+          && ly_is_procedure (proc))
+        {
+          if (!scm_is_number (m))
+            m = get_property ("rehearsalMark");
+
+          if (scm_is_number (m))
+            {
+              context ()->set_property ("rehearsalMark", scm_oneplus (m));
+              m = scm_call_2 (proc, m, context ()->self_scm ());
+            }
+          else
+            /* Score.rehearsalMark is initialized to #1 so we
+               never should see this case without user error */
+            mark_ev_->origin ()->warning
+              (_ ("rehearsalMark must have integer value"));
+        }
 
       if (Text_interface::is_markup (m))
-       text_->set_property ("text", m);
+        text_->set_property ("text", m);
       else
-       warning (_ ("mark label must be a markup object"));
+        mark_ev_->origin ()->warning (_ ("mark label must be a markup object"));
     }
 }
 
-ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
+
+void
+Mark_engraver::boot ()
+{
+  ADD_LISTENER (Mark_engraver, mark);
+  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 */
-               ""
-               );
+                /* 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 */
+                ""
+               );