/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2011 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
#include "pure-from-neighbor-interface.hh"
#include "engraver.hh"
+#include "translator.icc"
+
class Pure_from_neighbor_engraver : public Engraver
{
vector<Grob *> pure_relevants_;
public:
TRANSLATOR_DECLARATIONS (Pure_from_neighbor_engraver);
protected:
- DECLARE_ACKNOWLEDGER (pure_from_neighbor);
- DECLARE_ACKNOWLEDGER (item);
+ void acknowledge_pure_from_neighbor (Grob_info);
+ void acknowledge_item (Grob_info);
void finalize ();
};
-Pure_from_neighbor_engraver::Pure_from_neighbor_engraver ()
+Pure_from_neighbor_engraver::Pure_from_neighbor_engraver (Context *c)
+ : Engraver (c)
{
}
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 ());
}
+bool
+in_same_column (Grob *g1, Grob *g2)
+{
+ return (g1->spanned_rank_interval ()[LEFT]
+ == g2->spanned_rank_interval ()[LEFT])
+ && (g1->spanned_rank_interval ()[RIGHT]
+ == g2->spanned_rank_interval ()[RIGHT])
+ && (g1->spanned_rank_interval ()[LEFT]
+ == g1->spanned_rank_interval ()[RIGHT]);
+}
+
void
Pure_from_neighbor_engraver::acknowledge_pure_from_neighbor (Grob_info i)
{
temp.push_back (need_pure_heights_from_neighbors_[l]);
for (;
(l < need_pure_heights_from_neighbors_.size () - 1
- && (need_pure_heights_from_neighbors_[l]->spanned_rank_interval ()[LEFT]
- == need_pure_heights_from_neighbors_[l + 1]->spanned_rank_interval ()[LEFT]));
+ && ((need_pure_heights_from_neighbors_[l]
+ ->spanned_rank_interval ()[LEFT])
+ == (need_pure_heights_from_neighbors_[l + 1]
+ ->spanned_rank_interval ()[LEFT])));
l++)
temp.push_back (need_pure_heights_from_neighbors_[l + 1]);
need_pure_heights_from_neighbors.push_back (temp);
int pos[2] = { -1, 0};
for (vsize i = 0; i < pure_relevants_.size (); i++)
{
- if (pos[1] < (int) need_pure_heights_from_neighbors.size ()
- && (pure_relevants_[i]->spanned_rank_interval ()[LEFT]
- > need_pure_heights_from_neighbors[pos[1]][0]->spanned_rank_interval ()[LEFT]))
+ while (pos[1] < (int) need_pure_heights_from_neighbors.size ()
+ && (pure_relevants_[i]->spanned_rank_interval ()[LEFT]
+ > (need_pure_heights_from_neighbors[pos[1]][0]
+ ->spanned_rank_interval ()[LEFT])))
{
pos[0] = pos[1];
pos[1]++;
}
for (int j = 0; j < 2; j++)
- if (pos[j] >= 0 && pos[j] < (int) need_pure_heights_from_neighbors.size ())
- for (vsize k = 0; k < need_pure_heights_from_neighbors[pos[j]].size (); k++)
- Pointer_group_interface::add_grob (need_pure_heights_from_neighbors[pos[j]][k], ly_symbol2scm ("neighbors"), pure_relevants_[i]);
+ if (pos[j] >= 0 && pos[j]
+ < (int) need_pure_heights_from_neighbors.size ())
+ 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]))
+ Pointer_group_interface::add_grob
+ (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"
+void
+Pure_from_neighbor_engraver::boot ()
+{
+ ADD_ACKNOWLEDGER (Pure_from_neighbor_engraver, item);
+ ADD_ACKNOWLEDGER (Pure_from_neighbor_engraver, pure_from_neighbor);
+}
-ADD_ACKNOWLEDGER (Pure_from_neighbor_engraver, item);
-ADD_ACKNOWLEDGER (Pure_from_neighbor_engraver, pure_from_neighbor);
ADD_TRANSLATOR (Pure_from_neighbor_engraver,
/* doc */
"Coordinates items that get their pure heights from their neighbors.",