(get_default_dir): new algorithm for

tuplet direction.

diff --git a/ChangeLog b/ChangeLog
index 643b316d6f055ba0cccbc7114e0c1148db2f91cd..f1af5ba50129d23932534fa45e96ce9ee693be45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-01-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/tuplet-bracket.cc (get_default_dir): new algorithm for
+       tuplet direction.
+
        * mf/parmesan-heads.mf (overdone_heads): enlarge harmonic head.
 
 2004-01-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 18e21a57df169a950532ec424632b43a1b5c2f94..bfd22d886e77e408d5d836bba07c0b53aacba738 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -495,22 +495,21 @@ Tuplet_bracket::after_line_breaking (SCM smob)
 
 
 /*
-  similar to slur.
+  similar to beam ? 
  */
 Direction
 Tuplet_bracket::get_default_dir (Grob*me)
 {
-  Direction d = UP;
+  Drul_array<int> dirs(0,0);  
   for (SCM s = me->get_grob_property ("note-columns"); gh_pair_p (s); s = ly_cdr (s))
     {
       Grob * nc = unsmob_grob (ly_car (s));
-      if (Note_column::dir (nc) < 0) 
-       {
-         d = DOWN;
-         break;
-       }
+
+      
+      dirs[Note_column::dir (nc)]++;
     }
-  return d;
+
+  return dirs[UP] >= dirs[DOWN] ? UP : DOWN;
 }
 
 void