source file of the GNU LilyPond music typesetter
- (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "engraver.hh"
#include "protected-scm.hh"
-#include "break-align-item.hh"
+#include "break-align-interface.hh"
#include "item.hh"
#include "align-interface.hh"
#include "axis-group-interface.hh"
class Break_align_engraver : public Engraver
{
- Item *align_l_;
+ Item *align_;
Protected_scm column_alist_;
+ Item *edge_;
+
+ void add_to_group (SCM,Item*);
protected:
virtual void finalize ();
- virtual void acknowledge_grob(Grob_info i);
+ virtual void acknowledge_grob (Grob_info i);
virtual void stop_translation_timestep ();
void add_column (SCM);
public:
- VIRTUAL_COPY_CONS(Translator);
- Break_align_engraver ();
+ TRANSLATOR_DECLARATIONS(Break_align_engraver);
};
-
-
-ADD_THIS_TRANSLATOR(Break_align_engraver);
-
void
Break_align_engraver::add_column (SCM smob)
{
Grob * e = unsmob_grob (smob);
- Break_align_interface::add_element (align_l_,e);
+ Break_align_interface::add_element (align_,e);
typeset_grob (e);
}
Break_align_engraver::stop_translation_timestep ()
{
SCM order = get_property ("breakAlignOrder");
- for (; gh_pair_p (order); order = gh_cdr (order))
+ for (; gh_pair_p (order); order = ly_cdr (order))
{
- SCM p = scm_assoc ( gh_car (order), column_alist_);
+ SCM p = scm_assoc (ly_car (order), column_alist_);
if (gh_pair_p (p))
{
- add_column (gh_cdr (p));
- column_alist_ = scm_assoc_remove_x (column_alist_, gh_car (order));
+ add_column (ly_cdr (p));
+ column_alist_ = scm_assoc_remove_x (column_alist_, ly_car (order));
}
}
- for (SCM p = column_alist_; gh_pair_p (p); p = gh_cdr (p))
+ for (SCM p = column_alist_; gh_pair_p (p); p = ly_cdr (p))
{
- SCM pair = gh_car (p);
- add_column (gh_cdr (pair));
+ SCM pair = ly_car (p);
+ add_column (ly_cdr (pair));
}
column_alist_ = SCM_EOL;
- if (align_l_)
+ if (align_)
{
- typeset_grob (align_l_);
- align_l_ = 0;
+ typeset_grob (align_);
+ align_ = 0;
+ }
+ if (edge_)
+ {
+ typeset_grob (edge_);
+ edge_ = 0;
}
}
Break_align_engraver::Break_align_engraver ()
{
column_alist_ = SCM_EOL;
- align_l_ =0;
+ edge_ = 0;
+ align_ = 0;
}
void
Break_align_engraver::acknowledge_grob (Grob_info inf)
{
- if (Item * item_l = dynamic_cast <Item *> (inf.elem_l_))
+ if (Item * item = dynamic_cast <Item *> (inf.grob_))
{
- if (item_l->empty_b (X_AXIS) || item_l->parent_l (X_AXIS))
+ /*
+ Removed check for item->empty (X_AXIS). --hwn 20/1/04
+ */
+ if (item->get_parent (X_AXIS))
return;
- SCM bp=item_l->get_grob_property ("breakable");
+ SCM bp=item->get_grob_property ("breakable");
bool breakable = (to_boolean (bp));
if (!breakable)
return ;
- SCM align_name = item_l->get_grob_property ("break-align-symbol");
+ SCM align_name = item->get_grob_property ("break-align-symbol");
if (!gh_symbol_p (align_name))
return ;
- if (!align_l_)
+ if (!align_)
{
- align_l_ = new Item (get_property ("BreakAlignment"));
- Break_align_interface::set_interface (align_l_);
- announce_grob (align_l_,0);
-
- SCM edge_sym = ly_symbol2scm ("Left_edge_item");
- Item * edge = new Item (get_property ("LeftEdge"));
+ align_ = make_item ("BreakAlignment");
-
+ announce_grob (align_, SCM_EOL);
- /*
- If the element is empty, it will be ignored in the break
- alignment stuff.
-
- TODO: switch off ignoring empty stuff?
- */
- edge->set_extent_callback (Grob::point_dimension_callback_proc, X_AXIS);
-
- /*
- We must have left-edge in the middle. Instrument-names
- are left to left-edge, so they don't enter the staff.
- */
- align_l_->set_grob_property ("self-alignment-X", edge->self_scm ());
-
- announce_grob (edge, 0);
- column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm ());
+ edge_ = make_item ("LeftEdge");
+ add_to_group (edge_->get_grob_property ("break-align-symbol"), edge_);
+ announce_grob(edge_, SCM_EOL);
}
+
+ add_to_group (align_name, item);
+ }
+}
- SCM s = scm_assoc (align_name, column_alist_);
-
- Item * group = 0;
-
- if (s != SCM_BOOL_F)
- {
- Grob *e = unsmob_grob (gh_cdr(s));
- group = dynamic_cast<Item*> (e);
- }
- else
- {
- group = new Item (get_property ("BreakAlignGroup"));
+void
+Break_align_engraver::add_to_group(SCM align_name, Item*item)
+{
+ SCM s = scm_assoc (align_name, column_alist_);
+ Item * group = 0;
- Axis_group_interface::set_interface (group);
- Axis_group_interface::set_axes (group, X_AXIS,X_AXIS);
+ if (s != SCM_BOOL_F)
+ {
+ Grob *e = unsmob_grob (ly_cdr (s));
+ group = dynamic_cast<Item*> (e);
+ }
+ else
+ {
+ group = make_item ("BreakAlignGroup");
- group->set_grob_property ("break-align-symbol", align_name);
- group->set_parent (align_l_, Y_AXIS);
- announce_grob (group, 0);
- column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
+ group->set_grob_property ("break-align-symbol", align_name);
+ group->set_parent (align_, Y_AXIS);
+ announce_grob(group, item->self_scm());
+
+ column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
- }
- Axis_group_interface::add_element (group, item_l);
}
+ Axis_group_interface::add_element (group, item);
}
+
+ENTER_DESCRIPTION(Break_align_engraver,
+/* descr */ "Align grobs with corresponding break-align-symbols into groups, and order the groups according to breakAlignOrder",
+/* creats*/ "BreakAlignment BreakAlignGroup LeftEdge",
+/* accepts */ "",
+/* acks */ "break-aligned-interface"
+,/* reads */ "breakAlignOrder",
+/* write */ "");
projects / lilypond.git / blobdiff