-/*
- separating-group-spanner.cc -- implement Separating_group_spanner
-
+/*
+ separating-group-spanner.cc -- implement Separating_group_spanner
+
source file of the GNU LilyPond music typesetter
-
- (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
#include "separating-group-spanner.hh"
+
#include "separation-item.hh"
#include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "dimensions.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
void
-Separating_group_spanner::find_rods (Item * r, SCM next)
+Separating_group_spanner::find_rods (Item *r,
+ Link_array<Grob> const &separators,
+ int idx,
+ Real padding)
{
- Interval ri (Separation_item::my_width (r));
- if (ri.empty_b ())
- return;
/*
- This is an inner loop, however, in most cases, the interesting L
- will just be the first entry of NEXT, making it linear in most of
- the cases. */
- for(; gh_pair_p (next); next = ly_cdr (next))
+ This is an inner loop: look for the first normal (unbroken) Left
+ grob. This looks like an inner loop (ie. quadratic total), but in
+ most cases, the interesting L will just be the first entry of
+ NEXT, making it linear in most of the cases.
+ */
+ for (; idx >= 0; idx--)
{
- Item *l = dynamic_cast<Item*> (unsmob_grob (ly_car( next)));
+ Item *l = dynamic_cast<Item *> (separators[idx]);
Item *lb = l->find_prebroken_piece (RIGHT);
if (lb)
{
- Interval li (Separation_item::my_width (lb));
-
- if (!li.empty_b ())
+ Interval li (Separation_item::width (lb));
+ Interval ri (Separation_item::conditional_width (r, lb));
+ if (!li.is_empty () && !ri.is_empty ())
{
Rod rod;
- rod.item_l_drul_[LEFT] = lb;
- rod.item_l_drul_[RIGHT] = r;
+ rod.item_drul_[LEFT] = lb;
+ rod.item_drul_[RIGHT] = r;
- rod.distance_f_ = li[RIGHT] - ri[LEFT];
-
- rod.columnize ();
+ rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
rod.add_to_cols ();
}
}
- Interval li (Separation_item::my_width (l));
- if (!li.empty_b ())
+ Interval li (Separation_item::width (l));
+ Interval ri (Separation_item::conditional_width (r, l));
+ if (!li.is_empty () && !ri.is_empty ())
{
Rod rod;
- rod.item_l_drul_[LEFT] =l;
- rod.item_l_drul_[RIGHT]=r;
+ rod.item_drul_[LEFT] = l;
+ rod.item_drul_[RIGHT] = r;
- rod.distance_f_ = li[RIGHT] - ri[LEFT];
-
- rod.columnize ();
- rod.add_to_cols ();
+ rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
+ if (rod.distance_ > 0.0)
+ rod.add_to_cols ();
break;
}
- else
- /*
- this grob doesn't cause a constraint. We look further until we
- find one that does. */
- ;
+
+ /*
+ this grob doesn't cause a constraint. We look further until we
+ find one that does.
+ */
}
}
-MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods_and_seqs,1);
+MAKE_SCHEME_CALLBACK (Separating_group_spanner, set_spacing_rods, 1);
SCM
-Separating_group_spanner::set_spacing_rods_and_seqs (SCM smob)
+Separating_group_spanner::set_spacing_rods (SCM smob)
{
- set_spacing_rods (smob);
+ Grob *me = unsmob_grob (smob);
- return SCM_UNSPECIFIED;
-}
+ /*
+ Ugh: padding is added doubly, also for SeparationItem
+ */
+ Real padding = robust_scm2double (me->get_property ("padding"), 0.1);
-MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods,1);
-SCM
-Separating_group_spanner::set_spacing_rods (SCM smob)
-{
- Grob*me = unsmob_grob (smob);
-
- for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s) && gh_pair_p (ly_cdr (s)); s = ly_cdr (s))
+ extract_grob_set (me, "elements", elts);
+ for (int i = elts.size ();
+ i-- > 1;)
{
- /*
- Order of elements is reversed!
- */
- SCM elt = ly_car (s);
- Item *r = unsmob_item (elt);
-
+ Item *r = dynamic_cast<Item *> (elts[i]);
if (!r)
continue;
+ if (Separation_item::width (r).is_empty ())
+ continue;
+
Item *rb
- = dynamic_cast<Item*> (r->find_prebroken_piece (LEFT));
-
- find_rods (r, ly_cdr (s));
+ = dynamic_cast<Item *> (r->find_prebroken_piece (LEFT));
+
+ find_rods (r, elts, i - 1, padding);
if (rb)
- find_rods (rb, ly_cdr (s));
+ find_rods (rb, elts, i - 1, padding);
}
-#if 0
- /*
- TODO; restore this.
- */
- /*
- We've done our job, so we get lost.
- */
- for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s); s = ly_cdr (s))
- {
- Item * it =dynamic_cast<Item*> (unsmob_grob (ly_car (s)));
- if (it && it->broken_b ())
- {
- it->find_prebroken_piece (LEFT) ->suicide ();
- it->find_prebroken_piece (RIGHT)->suicide ();
- }
- it->suicide ();
- }
- me->suicide ();
-#endif
- return SCM_UNSPECIFIED ;
+ return SCM_UNSPECIFIED;
}
void
-Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i)
+Separating_group_spanner::add_spacing_unit (Grob *me, Item *i)
{
Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), i);
- me->add_dependency (i);
}
+ADD_INTERFACE (Separating_group_spanner, "separation-spanner-interface",
+ "A spanner that calculates spacing constraints (\"rods\") "
+ "using the @code{separation-item-interface} grobs in @code{elements}.",
-
-
-
-ADD_INTERFACE (Separating_group_spanner,"separation-spanner-interface",
- "Spanner that containing @code{separation-item-interface} grobs to calculate rods",
- "");
+ /* properties */
+ "elements "
+ "padding");
projects / lilypond.git / blobdiff