* Documentation/topdocs/NEWS.tely (Top): add note for

[lilypond.git] / lily / script-column.cc

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 37051bd6a477635116c2ef05d90d1678d703e587..0710cd483ac83cfbc350e2e6c5f3d3567e0f5a0c 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -3,25 +3,28 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "script-column.hh"
 
+#include "directional-element-interface.hh"
 #include "side-position-interface.hh"
 #include "warn.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
+
+#include <map>
+
+typedef map<Grob*, vector <Grob*> > Grob_scripts_map;
 
 void
-Script_column::add_staff_sided (Grob *me, Item *i)
+Script_column::add_side_positioned (Grob *me, Grob *script)
 {
-  SCM p = i->get_property ("script-priority");
+  SCM p = script->get_property ("script-priority");
   if (!scm_is_number (p))
     return;
 
-  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"), i);
-
-  me->add_dependency (i);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"), script);
 }
 
 LY_DEFINE (ly_grob_script_priority_less, "ly:grob-script-priority-less",
@@ -37,44 +40,81 @@ LY_DEFINE (ly_grob_script_priority_less, "ly:grob-script-priority-less",
   return scm_to_int (p1) < scm_to_int (p2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
+MAKE_SCHEME_CALLBACK (Script_column, row_before_line_breaking, 1);
+SCM
+Script_column::row_before_line_breaking (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  vector<Grob*> horizontal_grobs;
+  extract_grob_set (me, "scripts", scripts);
+
+  Grob_scripts_map head_scripts_map;
+  for (vsize i = 0; i < scripts.size (); i++)
+    {
+      Grob *sc = scripts[i];
+
+      /*
+       Don't want to consider scripts horizontally next to notes.
+      */
+      if (sc->get_property_data (ly_symbol2scm ("Y-offset")) !=
+         Side_position_interface::x_aligned_side_proc)
+       {
+         head_scripts_map[sc->get_parent (Y_AXIS)].push_back (sc);
+       }
+    }
+
+  for (Grob_scripts_map::const_iterator i (head_scripts_map.begin ());
+       i != head_scripts_map.end ();
+       i++)
+    {
+      order_grobs ((*i).second);
+    }
+
+  return SCM_UNSPECIFIED;
+}
+
+
 MAKE_SCHEME_CALLBACK (Script_column, before_line_breaking, 1);
 SCM
 Script_column::before_line_breaking (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Drul_array<SCM> scripts (SCM_EOL, SCM_EOL);
-  Link_array<Grob> staff_sided;
+  vector<Grob*> staff_sided;
 
-  for (SCM s = me->get_property ("scripts"); scm_is_pair (s); s = scm_cdr (s))
+  extract_grob_set (me, "scripts", scripts);
+  for (vsize i = 0; i < scripts.size (); i++)
     {
-      Grob *sc = unsmob_grob (scm_car (s));
+      Grob *sc = scripts[i];
 
       /*
        Don't want to consider scripts horizontally next to notes.
       */
-      if (!sc->has_offset_callback (Side_position_interface::aligned_side_proc,
-                                   X_AXIS))
-       staff_sided.push (sc);
+      if (sc->get_property_data (ly_symbol2scm ("X-offset")) !=
+         Side_position_interface::x_aligned_side_proc)
+       staff_sided.push_back (sc);
     }
 
-  for (int i = 0; i < staff_sided.size (); i++)
+  order_grobs (staff_sided);
+  return SCM_UNSPECIFIED;
+
+}
+
+void
+Script_column::order_grobs (vector<Grob*> grobs)
+{
+  Drul_array<SCM> scripts_drul (SCM_EOL, SCM_EOL);
+  for (vsize i = 0; i < grobs.size (); i++)
     {
-      Grob *g = staff_sided[i];
-      Direction d = Side_position_interface::get_direction (g);
-      if (!d)
-       {
-         programming_error ("No direction for script?");
-         d = DOWN;
-         g->set_property ("direction", scm_int2num (d));
-       }
+      Grob *g = grobs[i];
+      Direction d = get_grob_direction (g);
 
-      scripts[d] = scm_cons (g->self_scm (), scripts[d]);
+      scripts_drul[d] = scm_cons (g->self_scm (), scripts_drul[d]);
     }
 
   Direction d = DOWN;
   do
     {
-      SCM ss = scm_reverse_x (scripts[d], SCM_EOL);
+      SCM ss = scm_reverse_x (scripts_drul[d], SCM_EOL);
       ss = scm_stable_sort_x (ss, ly_grob_script_priority_less_proc);
 
       Grob *last = 0;
@@ -86,14 +126,12 @@ Script_column::before_line_breaking (SCM smob)
 
          last = g;
        }
-
     }
   while (flip (&d) != DOWN);
-
-  return SCM_UNSPECIFIED;
 }
 
 ADD_INTERFACE (Script_column, "script-column-interface",
               "An interface that sorts scripts "
               "according to their @code{script-priority}",
+              
               "");