Run grand replace for 2015.

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

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index 8d8e2bce3f178227e68bd3f7b02be8fadff26b36..58dfa4106a6b6c9081951fe67d36ff7fda320476 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  fingering-engraver.cc -- implement Fingering_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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 "engraver.hh"
@@ -13,13 +24,14 @@
 #include "side-position-interface.hh"
 #include "stem.hh"
 #include "stream-event.hh"
+#include "item.hh"
 
 #include "translator.icc"
 
 class Fingering_engraver : public Engraver
 {
-  vector<Stream_event*> events_;
-  vector<Item*> fingerings_;
+  vector<Stream_event *> events_;
+  vector<Item *> fingerings_;
 
 public:
   TRANSLATOR_DECLARATIONS (Fingering_engraver);
@@ -29,6 +41,7 @@ protected:
   DECLARE_TRANSLATOR_LISTENER (fingering);
   DECLARE_ACKNOWLEDGER (rhythmic_head);
   DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (flag);
 
 private:
   void make_script (Direction, Stream_event *, int);
@@ -48,6 +61,13 @@ Fingering_engraver::acknowledge_stem (Grob_info inf)
     Side_position_interface::add_support (fingerings_[i], inf.grob ());
 }
 
+void
+Fingering_engraver::acknowledge_flag (Grob_info inf)
+{
+  for (vsize i = 0; i < fingerings_.size (); i++)
+    Side_position_interface::add_support (fingerings_[i], inf.grob ());
+}
+
 void
 Fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 {
@@ -56,7 +76,7 @@ Fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
       Grob *t = fingerings_[i];
       Side_position_interface::add_support (t, inf.grob ());
       if (!t->get_parent (X_AXIS))
-       t->set_parent (inf.grob (), X_AXIS);
+        t->set_parent (inf.grob (), X_AXIS);
     }
 }
 
@@ -81,7 +101,7 @@ Fingering_engraver::make_script (Direction d, Stream_event *r, int i)
     junkme.
   */
   SCM pitch = r->get_property ("pitch");
-  if (unsmob_pitch (pitch))
+  if (Pitch::is_smob (pitch))
     fingering->set_property ("pitch", pitch);
 
   /*
@@ -89,8 +109,7 @@ Fingering_engraver::make_script (Direction d, Stream_event *r, int i)
     fingerings for chords need different settings.
   */
   Side_position_interface::set_axis (fingering, Y_AXIS);
-  Self_alignment_interface::set_align_self (fingering, X_AXIS);
-  Self_alignment_interface::set_center_parent (fingering, X_AXIS);
+  Self_alignment_interface::set_aligned_on_parent (fingering, X_AXIS);
 
   // Hmm
   int priority = 200;
@@ -103,16 +122,10 @@ Fingering_engraver::make_script (Direction d, Stream_event *r, int i)
 
   fingering->set_property ("script-priority", scm_from_int (priority));
 
-  if (!is_direction (fingering->get_property_data (ly_symbol2scm ("direction"))))
-    {
-      if (d)
-       fingering->set_property ("direction", scm_from_int (d));
-      else
-       fingering->set_property ("direction", scm_from_int (RIGHT));
-    }
-
-  SCM dig = r->get_property ("digit");
-  fingering->set_property ("text", scm_number_to_string (dig, scm_from_int (10)));
+  if (d)
+    fingering->set_property ("direction", scm_from_int (d));
+  else if (!is_direction (fingering->get_property_data ("direction")))
+    fingering->set_property ("direction", scm_from_int (UP));
 
   fingerings_.push_back (fingering);
 }
@@ -120,9 +133,6 @@ Fingering_engraver::make_script (Direction d, Stream_event *r, int i)
 void
 Fingering_engraver::stop_translation_timestep ()
 {
-  if (!fingerings_.size ())
-    return;
-
   fingerings_.clear ();
   events_.clear ();
 }
@@ -133,9 +143,18 @@ Fingering_engraver::Fingering_engraver ()
 
 ADD_ACKNOWLEDGER (Fingering_engraver, rhythmic_head);
 ADD_ACKNOWLEDGER (Fingering_engraver, stem);
+ADD_ACKNOWLEDGER (Fingering_engraver, flag);
+
 ADD_TRANSLATOR (Fingering_engraver,
-               /* doc */ "Create fingering-scripts",
-               /* create */ "Fingering",
-               /* accept */ "fingering-event",
-               /* read */ "",
-               /* write */ "");
+                /* doc */
+                "Create fingering scripts.",
+
+                /* create */
+                "Fingering ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );