X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=ac4e9c72f01764195fb85fd9088351a1ea39541c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e2e7411b536b5c4cd55021167068cc40caf35ece;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git

diff --git a/lily/script-column.cc b/lily/script-column.cc
index e2e7411b53..ac4e9c72f0 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -3,30 +3,36 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "script-column.hh"
 
+#include "accidental-placement.hh"
+#include "arpeggio.hh"
+#include "directional-element-interface.hh"
 #include "side-position-interface.hh"
 #include "warn.hh"
+#include "grob.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",
 	   2, 0, 0, (SCM a, SCM b),
-	   "Compare two grobs by script priority. For internal use.")
+	   "Compare two grobs by script priority.  For internal use.")
 {
   Grob *i1 = unsmob_grob (a);
   Grob *i2 = unsmob_grob (b);
@@ -37,37 +43,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;
+  vector<Grob *> affect_all_grobs;
+  for (vsize i = 0; i < scripts.size (); i++)
+    {
+      Grob *sc = scripts[i];
+
+      /*
+	Don't want to consider scripts horizontally next to notes.
+      */
+      if (Accidental_placement::has_interface (sc)
+	  || Arpeggio::has_interface (sc))
+	{
+	  affect_all_grobs.push_back (sc);
+	}
+      else if (sc->get_property_data ("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++)
+    {
+      vector<Grob*> grobs  = (*i).second;
+
+      // this isn't right in all cases, but in general a safe assumption.
+      concat (grobs, affect_all_grobs);
+      order_grobs (grobs);
+    }
+
+  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_drul (SCM_EOL, SCM_EOL);
-  Link_array<Grob> staff_sided;
+  vector<Grob*> staff_sided;
 
   extract_grob_set (me, "scripts", scripts);
-  for (int i = 0; i < scripts.size (); i++)
+  for (vsize i = 0; i < scripts.size (); i++)
     {
       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 ("X-offset") !=
+	  Side_position_interface::x_aligned_side_proc)
+	staff_sided.push_back (sc);
     }
+  
+  order_grobs (staff_sided);
+  return SCM_UNSPECIFIED;
+}
 
-  for (int i = 0; i < staff_sided.size (); i++)
+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_from_int (d));
-	}
+      Grob *g = grobs[i];
+      Direction d = get_grob_direction (g);
 
       scripts_drul[d] = scm_cons (g->self_scm (), scripts_drul[d]);
     }
@@ -83,17 +133,30 @@ Script_column::before_line_breaking (SCM smob)
 	{
 	  Grob *g = unsmob_grob (scm_car (s));
 	  if (last)
-	    Side_position_interface::add_support (g, last);
+	    {
+	      SCM outside_staff = last->get_property ("outside-staff-priority");
+	      if (scm_is_number (outside_staff))
+		{
+		  /* we allow the outside-staff-priority ordering to override the
+		     script-priority ordering */
+		  if (!scm_is_number (g->get_property ("outside-staff-priority")))
+		    g->set_property ("outside-staff-priority",
+				     scm_from_double (scm_to_double (outside_staff) + 0.1));
+		}
+	      else
+		Side_position_interface::add_support (g, last);
+	    }
 
 	  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}",
-	       "");
+ADD_INTERFACE (Script_column,
+	       "An interface that sorts scripts according to their"
+	       " @code{script-priority}.",
+	       
+	       /* properties */
+	       ""
+	       );