Adds beam collision engraver

Adds beam collision engraver


Merge branch 'master' of git://git.sv.gnu.org/lilypond


Merge branch 'master' of git://git.sv.gnu.org/lilypond


Merge branch 'master' of git://git.sv.gnu.org/lilypond

Conflicts:
	scm/define-grobs.scm

Merge branch 'master' of git://git.sv.gnu.org/lilypond


Merge branch 'master' of git://git.sv.gnu.org/lilypond


foo

[hanwen-google, 2011-02-07 14:30:07]

looks like this patch grew some erroneous edits from other commits.

[mikesol_ufl.edu, 2011-02-07 14:43:47]

Yikes!  Sorry...

http://codereview.appspot.com/4080057 is the real deal.

Cheers,
MS

On Feb 7, 2011, at 9:30 AM, hanwen@google.com wrote:

> looks like this patch grew some erroneous edits from other commits.
> 
> http://codereview.appspot.com/4128059/

[hanwenn, 2011-02-07 15:00:40]

On Mon, Feb 7, 2011 at 12:43 PM, Mike Solomon <mikesol@ufl.edu> wrote:
> Yikes!  Sorry...
>
> http://codereview.appspot.com/4080057 is the real deal.

This still adds noteheads from the same voice as the beam.

-- 
Han-Wen Nienhuys - hanwen@xs4all.nl - http://www.xs4all.nl/~hanwen

[mikesol_ufl.edu, 2011-02-07 15:03:12]

On Feb 7, 2011, at 10:00 AM, Han-Wen Nienhuys wrote:

> On Mon, Feb 7, 2011 at 12:43 PM, Mike Solomon <mikesol@ufl.edu> wrote:
>> Yikes!  Sorry...
>> 
>> http://codereview.appspot.com/4080057 is the real deal.
> 
> This still adds noteheads from the same voice as the beam.

+  for (vsize i=0; i < covered_grobs_.size (); i++)
+    for (vsize j=0; j < active_beams_.size (); j++)
+      {
+        bool my_beam = false;
+        if (Grob *stem = unsmob_grob (covered_grobs_.at (i)->get_object
("stem")))
+          if (Grob *beam = unsmob_grob (stem->get_object ("beam")))
+            if (beam == active_beams_.at (j))
+              my_beam = true;
+        if (!my_beam)
+          Pointer_group_interface::add_grob (active_beams_.at (j),
ly_symbol2scm ("covered-grobs"), covered_grobs_.at (i));
+      }

I thought that did the trick...am I missing something?

Cheers,
MS

[hanwenn, 2011-02-07 15:08:33]

On Mon, Feb 7, 2011 at 1:03 PM, Mike Solomon <mikesol@ufl.edu> wrote:

> http://codereview.appspot.com/4080057 is the real deal.
>
>
> This still adds noteheads from the same voice as the beam.
>
>
> + for (vsize i=0; i < covered_grobs_.size (); i++) + for (vsize j=0; j <
> active_beams_.size (); j++) + { + bool my_beam = false; + if (Grob *stem =
> unsmob_grob (covered_grobs_.at (i)->get_object ("stem"))) + if (Grob *beam
> = unsmob_grob (stem->get_object ("beam"))) + if (beam == active_beams_.at
> (j)) + my_beam = true; + if (!my_beam) + Pointer_group_interface::add_grob
> (active_beams_.at (j), ly_symbol2scm ("covered-grobs"), covered_grobs_.at
> (i)); + }
>
> I thought that did the trick...am I missing something?
>

My bad; it does.  I was expecting code to look at the originating context in
acknowledge_note_head.



-- 
Han-Wen Nienhuys - hanwen@xs4all.nl - http://www.xs4all.nl/~hanwen