* lily/note-collision.cc (check_meshing_chords): Do not remove

dots (from down head) when merging similar heads (thanks Matthias
Kilian).  Simplify merge_possible tests and other cleanups

* input/regression/collision-merge-differently-dotted.ly: Add test
for disappearing dots on similar heads for both voices.

diff --git a/ChangeLog b/ChangeLog
index 536bbe1b53be2d155fa68dd04adb1a068f6dad28..0b8359b1320a366b04a34c6671759397a8100e30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-31  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/note-collision.cc (check_meshing_chords): Do not remove
+       dots (from down head) when merging similar heads (thanks Matthias
+       Kilian).  Simplify merge_possible tests and other cleanups
+
+       * input/regression/collision-merge-differently-dotted.ly: Add test
+       for disappearing dots on similar heads for both voices.
+
 2004-01-30  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * Documentation/user/invoking.itexi (Invoking lilypond): Document

diff --git a/THANKS b/THANKS
index a34e55b3f6ef8912722bf0e7847de944d931699c..7404cba212034a69634ebe058e8c509a09d7dc4c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -12,7 +12,7 @@ Thomas Willhalm
 Werner Lemberg
 Nicolas Sceaux 
 Nick Busigin
-
+Matthias Kilian
 
 Release 2.0
 ***********

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 5cad99b20249e49b6e23c237e38edd1e290b58a3..c8e34d3a29d35aa5db6e6615283bbe4179e35b1c 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -8,24 +8,24 @@ if the black note heads are from 8th or shorter notes.
 "
     
 }
-    \paper { raggedright= ##t }
 
+\paper { raggedright= ##t }
 
-\score { \notes \context Staff\relative c''<<
- {
-    c2 c8 c4.
-    
-    \property Staff.NoteCollision \override #'merge-differently-headed = ##t
-    c2
-    c8 c4.
-    c2
-}\\
- {
-    c8 c4.
-    c2
-    c8 c4.
-    c2
-    c4
-}
+
+\score {
+    \context Staff \notes \relative c'' <<
+       {
+           c2 c8 c4.
+           
+           \property Staff.NoteCollision \override #'merge-differently-headed = ##t
+           c2 c8 c4.
+           c2
+       }\\
+       {
+           c8 c4. c2
+           
+           c8 c4. c2
+           c4
+       }
     >>
-        }
+}

diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly
index a9dea658125bbf2f31f316ef2556322f28121898..b6050de2aae4ffc1378f5e0abed661496ac5b3ed 100644 (file)
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -1,21 +1,31 @@
 \version "2.1.7"
 \header {
+    
+    texidoc = "If NoteCollision has merge-differently-dotted = \\#t note
+heads that have differing dot counts may be merged anyway.  Dots
+should not disappear when merging similar note heads."
+    
+}
 
-texidoc = "If NoteCollision has merge-differently-dotted set, note
-heads that have differing dot counts may be merged anyway."
-
- }
-    \paper { raggedright= ##t }
-
-
+\paper { raggedright= ##t }
        
-\score { \notes {
-  \context Staff <<
-  \new Voice { \voiceOne g'8 g'8 
-     \property Staff.NoteCollision \override #'merge-differently-dotted = ##t
-     g'8 g'8
-     }
-  \new Voice { \voiceTwo  g'8.[ f16]  g'8.[ f'16] } 
-  >>
-}}
+\score {
+    \context Staff \notes\relative c'' <<
+       {
+           g8[ g8]
+           \property Staff.NoteCollision
+           \override #'merge-differently-dotted = ##t
+           g8[ g8]
+           g4. r8 g8. g16
+           g8 g4 r8 g4
+       }
+       \\
+       {
+           g8.[ f16]
+           g8.[ f16]
+           g8 g4 r8 g4
+           g4. r8 g8. g16
+       }
+    >>
+}
 

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 50958af832b8d4360f6f30c884f2f4bf110e97ce..01364cb838cff207228101158db8f718fbbf922e 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -1,4 +1,3 @@
-
 /*
   collision.cc -- implement Collision
 
@@ -39,23 +38,62 @@ Note_collision_interface::force_shift_callback (SCM element_smob, SCM axis)
 
 
 void
-check_meshing_chords (Grob*me,
+check_meshing_chords (Grob *me,
                      Drul_array< Array < Real > > *offsets,
                      Drul_array< Array < Slice > > const &extents,
                      Drul_array<Link_array<Grob> > const &clash_groups)
        
 {
   if (!extents[UP].size () || ! extents[DOWN].size ())
-    return ;
+    return;
   
+  Grob *cu = clash_groups[UP][0];
+  Grob *cd = clash_groups[DOWN][0];
+
+  /* Every note column should have a stem, but avoid a crash. */
+  if (!Note_column::get_stem (cu) || !Note_column::get_stem (cd))
+    return;
+
+  Grob *nu = Note_column::first_head (cu);
+  Grob *nd = Note_column::first_head (cd);
+
+  Array<int> ups = Stem::note_head_positions (Note_column::get_stem (cu));
+  Array<int> dps = Stem::note_head_positions (Note_column::get_stem (cd));
+
+  /* Too far apart to collide.  */
+  if (ups[0] > dps.top () + 1)
+    return; 
+
+  // FIXME: what's this?
+  bool merge_possible = (ups[0] >= dps[0]) && (ups.top () >= dps.top ());
+
+  int upball_type = Note_head::get_balltype (nu);
+  int dnball_type = Note_head::get_balltype (nd);
   
-  Grob *cu =clash_groups[UP][0];
-  Grob *cd =clash_groups[DOWN][0];
+  /* Do not merge whole notes (or longer, like breve, longa, maxima).  */
+  if (merge_possible && (upball_type <= 0 || dnball_type <= 0))
+    merge_possible = false;
+
+  if (merge_possible
+      && Rhythmic_head::dot_count (nu) != Rhythmic_head::dot_count (nd)
+      && !to_boolean (me->get_grob_property ("merge-differently-dotted")))
+    merge_possible = false;
+
+  /* Can only merge different heads if merge-differently-headed is
+     set. */
+  if (merge_possible
+      && upball_type != dnball_type
+      && !to_boolean (me->get_grob_property ("merge-differently-headed")))
+    merge_possible = false;
+
+  /* Can never merge quarter and half notes. */
+  if (merge_possible
+      && ((Rhythmic_head::duration_log (nu) == 1
+          && Rhythmic_head::duration_log (nd) == 2)
+         || (Rhythmic_head::duration_log (nu) == 2
+            && Rhythmic_head::duration_log (nd) == 1)))
+    merge_possible = false;
 
-  Grob * nu= Note_column::first_head (cu);
-  Grob * nd = Note_column::first_head (cd);
-      
-     
 
   /*
     this case (distant half collide), 
@@ -76,71 +114,19 @@ check_meshing_chords (Grob*me,
     
    */
   
-  bool close_half_collide = false;
-  bool distant_half_collide = false;  
-  bool full_collide = false;  
-
-  /*
-    Let's not crash. 
-   */
-  if (!Note_column::get_stem (cu)
-      || !Note_column::get_stem (cd))
-    return ;
-  
-  
-  /*
-    TODO:
-
-    filter out the 'o's in this configuration, since they're no part
-    in the collision.
+  /* TODO: filter out the 'o's in this configuration, since they're no
+  part in the collision.
 
      |
     x|o
     x|o
     x
-
-    
-   */
-  Array<int> ups = Stem::note_head_positions (Note_column::get_stem (cu));
-  Array<int> dps = Stem::note_head_positions (Note_column::get_stem (cd));
-
-  /*
-    they're too far apart to collide. 
     
    */
-
-  if (ups[0] > dps.top () + 1)
-    return ; 
-
-  bool touch = (ups[0] - dps.top () >= 0);
-  
-  bool merge_possible = (ups[0] >= dps[0]) && (ups.top () >= dps.top ());
-
-  /*
-    don't merge whole notes (or longer, like breve, longa, maxima) 
-   */
-
-  int upball_type = Note_head::get_balltype (nu);
-  int dnball_type = Note_head::get_balltype (nd);
   
-  merge_possible = merge_possible && (upball_type > 0);
-
-  if (!to_boolean (me->get_grob_property ("merge-differently-dotted")))
-    merge_possible = merge_possible && Rhythmic_head::dot_count (nu) == Rhythmic_head::dot_count (nd);
-
-  
-  if (!to_boolean (me->get_grob_property ("merge-differently-headed")))
-    merge_possible = merge_possible &&
-      upball_type == dnball_type;
-  else
-    /*
-      Can't merge quarter and half notes.
-     */
-    merge_possible = merge_possible &&
-      !((Rhythmic_head::duration_log (nu) == 1
-        && Rhythmic_head::duration_log (nd) == 2)
-       ||(Rhythmic_head::duration_log (nu) == 2
-          && Rhythmic_head::duration_log (nd) == 1));
+  bool close_half_collide = false;
+  bool distant_half_collide = false;  
+  bool full_collide = false;  
 
   int i = 0, j=0;
   while (i < ups.size () && j < dps.size ())
@@ -178,6 +164,7 @@ check_meshing_chords (Grob*me,
   
   Real shift_amount = 1;
 
+  bool touch = (ups[0] - dps.top () >= 0);
   if (touch)
     shift_amount *= -1;
 
@@ -189,21 +176,25 @@ check_meshing_chords (Grob*me,
        && full_collide))
     shift_amount = 1;
 
-  /*
-    TODO: these numbers are magic; should devise a set of grob props
-    to tune this behavior.  */
-  
   if (merge_possible)
     {
-      shift_amount *= 0.0;
-      Grob *wipe_ball = 0;
+      shift_amount = 0;
+
+      /* Wipe shortest head, or head with smallest amount of dots.
+        Note: when merging different heads, dots on shortest
+        disappear. */
+      
+      Grob *wipe_ball = nu;
       
-      if (upball_type  <  dnball_type)
+      if (upball_type == dnball_type)
+       {
+         if (Rhythmic_head::dot_count (nd) < Rhythmic_head::dot_count (nu))
+           wipe_ball = nd;
+       }
+      else if (dnball_type > upball_type)
        wipe_ball = nd;
-      else if (upball_type > dnball_type)
-       wipe_ball = nu;
 
-      if (wipe_ball && wipe_ball->live ())
+      if (wipe_ball->live ())
        {
          wipe_ball->set_grob_property ("transparent", SCM_BOOL_T);
          wipe_ball->set_grob_property ("molecule", SCM_EOL);
@@ -211,13 +202,9 @@ check_meshing_chords (Grob*me,
          if (Grob *d = unsmob_grob (wipe_ball->get_grob_property ("dot")))
            d->suicide ();
        }
-
-      if (wipe_ball == 0
-         && unsmob_grob (nd->get_grob_property ("dot")))
-       {
-         unsmob_grob (nd->get_grob_property ("dot"))->suicide ();
-       }
     }
+  /* TODO: these numbers are magic; should devise a set of grob props
+     to tune this behavior.  */
   else if (close_half_collide && !touch)
     shift_amount *= 0.52;
   else if (distant_half_collide && !touch)
@@ -225,9 +212,7 @@ check_meshing_chords (Grob*me,
   else if (distant_half_collide || close_half_collide || full_collide)
     shift_amount *= 0.5;
   
-  /*
-    we're meshing.
-  */
+  /* we're meshing.  */
   else if (Rhythmic_head::dot_count (nu) || Rhythmic_head::dot_count (nd))
     shift_amount *= 0.1;
   else