Run grand replace for 2015.

[lilypond.git] / lily / break-align-engraver.cc

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 922978f2b1ca458c2a5ec6e29b09930c1997f01b..6da5ba603e104c894063ed85dfec098e1e397e83 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  break-align-engraver.cc -- implement Break_align_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2009 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"
 #include "protected-scm.hh"
@@ -58,6 +69,13 @@ Break_align_engraver::derived_mark () const
 void
 Break_align_engraver::acknowledge_break_alignable (Grob_info inf)
 {
+  /*
+    Special case for MetronomeMark: filter out items which will be aligned
+    on note heads rather than prefatory material
+  */
+  if (!Item::is_non_musical (inf.item ()))
+    return;
+
   if (!align_)
     create_alignment (inf);
 
@@ -73,20 +91,20 @@ Break_align_engraver::acknowledge_break_aligned (Grob_info inf)
   if (Item *item = dynamic_cast<Item *> (inf.grob ()))
     {
       /*
-       Removed check for item->empty (X_AXIS). --hwn 20/1/04
+        Removed check for item->empty (X_AXIS). --hwn 20/1/04
       */
       if (item->get_parent (X_AXIS))
-       return;
+        return;
 
       if (!Item::is_non_musical (item))
-       return;
+        return;
 
       SCM align_name = item->get_property ("break-align-symbol");
       if (!scm_is_symbol (align_name))
-       return;
-         
+        return;
+
       if (!align_)
-       create_alignment (inf);
+        create_alignment (inf);
 
       add_to_group (align_name, item);
     }
@@ -100,7 +118,7 @@ Break_align_engraver::create_alignment (Grob_info inf)
   Context *origin = inf.origin_contexts (this)[0];
 
   Translator_group *tg = origin->implementation ();
-  Engraver *random_source = dynamic_cast<Engraver *> (unsmob_translator (scm_car (tg->get_simple_trans_list ())));
+  Engraver *random_source = dynamic_cast<Engraver *> (Translator::unsmob (scm_car (tg->get_simple_trans_list ())));
   if (!random_source)
     random_source = this;
 
@@ -109,7 +127,7 @@ Break_align_engraver::create_alignment (Grob_info inf)
   */
   left_edge_ = random_source->make_item ("LeftEdge", SCM_EOL);
   add_to_group (left_edge_->get_property ("break-align-symbol"),
-               left_edge_);
+                left_edge_);
 }
 
 void
@@ -120,7 +138,7 @@ Break_align_engraver::add_to_group (SCM align_name, Item *item)
 
   if (s != SCM_BOOL_F)
     {
-      Grob *e = unsmob_grob (scm_cdr (s));
+      Grob *e = Grob::unsmob (scm_cdr (s));
       group = dynamic_cast<Item *> (e);
     }
   else
@@ -140,20 +158,20 @@ Break_align_engraver::add_to_group (SCM align_name, Item *item)
 ADD_ACKNOWLEDGER (Break_align_engraver, break_aligned);
 ADD_ACKNOWLEDGER (Break_align_engraver, break_alignable);
 ADD_TRANSLATOR (Break_align_engraver,
-               /* doc */
-               "Align grobs with corresponding @code{break-align-symbols}"
-               " into groups, and order the groups according to"
-               " @code{breakAlignOrder}.  The left edge of the alignment gets"
-               " a separate group, with a symbol @code{left-edge}.",
-
-               /* create */
-               "BreakAlignment "
-               "BreakAlignGroup "
-               "LeftEdge ",
-
-               /* read */
-               "",
-
-               /* write */
-               ""
-               );
+                /* doc */
+                "Align grobs with corresponding @code{break-align-symbols}"
+                " into groups, and order the groups according to"
+                " @code{breakAlignOrder}.  The left edge of the alignment gets"
+                " a separate group, with a symbol @code{left-edge}.",
+
+                /* create */
+                "BreakAlignment "
+                "BreakAlignGroup "
+                "LeftEdge ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );