resolve merge

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

diff --git a/lily/script-column.cc b/lily/script-column.cc
index b3371e9fd5c81b0e6b1be104bd772e7ecfdd9511..b9c9e178f4bc65ddf3e28d3a9ceb76fd0d694bda 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,9 +1,20 @@
 /*
-  script-column.cc -- implement Script_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "script-column.hh"
@@ -66,7 +77,7 @@ Script_column::row_before_line_breaking (SCM smob)
          affect_all_grobs.push_back (sc);
        }
       else if (sc->get_property_data ("Y-offset") !=
-              Side_position_interface::x_aligned_side_proc)
+              Side_position_interface::y_aligned_side_proc)
        {
          head_scripts_map[sc->get_parent (Y_AXIS)].push_back (sc);
        }
@@ -105,7 +116,7 @@ Script_column::before_line_breaking (SCM smob)
          Side_position_interface::x_aligned_side_proc)
        staff_sided.push_back (sc);
     }
-  
+
   order_grobs (staff_sided);
   return SCM_UNSPECIFIED;
 }
@@ -128,26 +139,39 @@ Script_column::order_grobs (vector<Grob*> grobs)
       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;
-      for (SCM s = ss; scm_is_pair (s); s = scm_cdr (s))
+      Grob *g = 0;  // current grob in list
+      Grob *last = 0; // previous grob in list
+      SCM initial_outside_staff = SCM_EOL;  // initial outside_staff_priority of current grob
+      SCM last_initial_outside_staff = SCM_EOL;  // initial outside_staff_priority of previous grob
+
+      //  loop over all grobs in script column (already sorted by script_priority)
+      for (SCM s = ss; scm_is_pair (s);
+           s = scm_cdr (s), last = g, last_initial_outside_staff = initial_outside_staff)
        {
-         Grob *g = unsmob_grob (scm_car (s));
-         if (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
+         g = unsmob_grob (scm_car (s));
+          initial_outside_staff = g->get_property ("outside-staff-priority");
+          if (last)    //not the first grob in the list
+            {
+             SCM last_outside_staff = last->get_property ("outside-staff-priority");
+              /*
+                if outside_staff_priority is missing for previous grob, just
+                use it as a support for the current grob
+              */
+             if (!scm_is_number (last_outside_staff))
                Side_position_interface::add_support (g, last);
+              /*
+                if outside_staff_priority is missing or is equal to original
+                outside_staff_priority of previous grob, set new
+                outside_staff_priority to just higher than outside_staff_priority
+                of previous grob in order to preserve ordering.
+              */
+              else if ((!scm_is_number (initial_outside_staff)) ||
+                       (fabs (scm_to_double (initial_outside_staff) -
+                             robust_scm2double (last_initial_outside_staff, 0)) < 0.001))
+                g->set_property ("outside-staff-priority",
+                                    scm_from_double (
+                                       scm_to_double (last_outside_staff) + 0.1));
            }
-
-         last = g;
        }
     }
   while (flip (&d) != DOWN);
@@ -155,8 +179,8 @@ Script_column::order_grobs (vector<Grob*> grobs)
 
 ADD_INTERFACE (Script_column,
               "An interface that sorts scripts according to their"
-              " @code{script-priority}.",
-              
+              " @code{script-priority} and @code{outside-staff-priority}.",
+
               /* properties */
               ""
               );