LSR Update

[lilypond.git] / lily / pure-from-neighbor-engraver.cc

diff --git a/lily/pure-from-neighbor-engraver.cc b/lily/pure-from-neighbor-engraver.cc
index 413bfe5215d2b5c29e8b08e7799981071aa32bab..e147f53ccadb3a5da4663b83cf59616d518911f4 100644 (file)
--- a/lily/pure-from-neighbor-engraver.cc
+++ b/lily/pure-from-neighbor-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2011--2012 Mike Solomon <mike@apollinemike.com>
+  Copyright (C) 2011--2015 Mike Solomon <mike@mikesolomon.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
@@ -26,6 +26,8 @@
 #include "pure-from-neighbor-interface.hh"
 #include "engraver.hh"
 
+#include "translator.icc"
+
 class Pure_from_neighbor_engraver : public Engraver
 {
   vector<Grob *> pure_relevants_;
@@ -46,9 +48,7 @@ Pure_from_neighbor_engraver::Pure_from_neighbor_engraver ()
 void
 Pure_from_neighbor_engraver::acknowledge_item (Grob_info i)
 {
-  SCM pure_relevant_p = ly_lily_module_constant ("pure-relevant?");
-  if (!Pure_from_neighbor_interface::has_interface (i.item ())
-      && to_boolean (scm_call_1 (pure_relevant_p, i.item ()->self_scm ())))
+  if (!has_interface<Pure_from_neighbor_interface> (i.item ()))
     pure_relevants_.push_back (i.item ());
 }
 
@@ -124,20 +124,18 @@ Pure_from_neighbor_engraver::finalize ()
           for (vsize k = 0;
                k < need_pure_heights_from_neighbors[pos[j]].size ();
                k++)
-            if (!in_same_column(need_pure_heights_from_neighbors[pos[j]][k],
-                                pure_relevants_[i]))
+            if (!in_same_column (need_pure_heights_from_neighbors[pos[j]][k],
+                                 pure_relevants_[i]))
               Pointer_group_interface::add_grob
-                (need_pure_heights_from_neighbors[pos[j]][k],
-                 ly_symbol2scm ("neighbors"),
-                 pure_relevants_[i]);
+              (need_pure_heights_from_neighbors[pos[j]][k],
+               ly_symbol2scm ("neighbors"),
+               pure_relevants_[i]);
     }
 
   need_pure_heights_from_neighbors_.clear ();
   pure_relevants_.clear ();
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Pure_from_neighbor_engraver, item);
 ADD_ACKNOWLEDGER (Pure_from_neighbor_engraver, pure_from_neighbor);
 ADD_TRANSLATOR (Pure_from_neighbor_engraver,