Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 31e1daf1f8f4570336d04c32a7dfcfc97219d053..e8384f18554e820e28462d678093ed8396c2a54a 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -3,23 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "tie-column.hh"
+
+#include <cmath>
+
+#include "output-def.hh"
+#include "skyline.hh"
+#include "warn.hh"
 #include "paper-column.hh"
 #include "spanner.hh"
 #include "pointer-group-interface.hh"
 #include "tie.hh"
 #include "directional-element-interface.hh"
-#include "rhythmic-head.hh"
+#include "tie-column-format.hh"
+#include "tie-formatting-problem.hh"
+#include "tie-configuration.hh"
+
+using namespace std;
 
-/*
-  tie dir depends on what Tie_column does.
-*/
-/*
-  TODO: this doesn't follow standard pattern. Regularize.
-*/
 void
 Tie_column::add_tie (Grob *me, Grob *tie)
 {
@@ -35,113 +39,6 @@ Tie_column::add_tie (Grob *me, Grob *tie)
 
   tie->set_parent (me, Y_AXIS);
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), tie);
-  tie->add_dependency (me);
-}
-
-void
-Tie_column::set_directions (Grob *me)
-{
-  werner_directions (me);
-}
-
-int
-tie_compare (Grob *const &s1,
-            Grob *const &s2)
-{
-  return sign (Tie::get_position (s1) - Tie::get_position (s2));
-}
-
-#if 0
-/*
-  Werner:
-
-  . The algorithm to choose the direction of the ties doesn't work
-  properly.  I suggest the following for applying ties sequentially
-  from top to bottom:
-
-  + The topmost tie is always `up'.
-
-  + If there is a vertical gap to the last note above larger than
-  or equal to a fifth (or sixth?), the tie is `up', otherwise it
-  is `down'.
-
-  + The bottommost tie is always `down'.
-*/
-void
-Tie_column::werner_directions (Grob *me)
-{
-  extract_grob_set (me, "ties", ro_ties);
-  Link_array<Grob> ties (ro_ties);
-  if (!ties.size ())
-    return;
-
-  ties.sort (tie_compare);
-
-  Direction d = get_grob_direction (me);
-  if (d)
-    {
-      for (int i = ties.size (); i--;)
-       {
-         Grob *t = ties[i];
-         if (!get_grob_direction (t))
-           set_grob_direction (t, d);
-       }
-      return;
-    }
-
-  if (ties.size () == 1)
-    {
-      Grob *t = ties[0];
-      if (t->is_live ()
-         && !get_grob_direction (t))
-       set_grob_direction (t, Tie::get_default_dir (t));
-      return;
-    }
-
-  Real last_down_pos = 10000;
-  if (!get_grob_direction (ties[0]))
-    set_grob_direction (ties[0], DOWN);
-
-  /*
-    Go downward.
-  */
-  Grob *last_tie = 0;
-  for (int i = ties.size (); i--;)
-    {
-      Grob *t = ties[i];
-
-      Direction d = get_grob_direction (t);
-      Real p = Tie::get_position (t);
-      if (!d)
-       {
-         if (last_tie
-             && Tie::get_column_rank (t, LEFT)
-             < Tie::get_column_rank (last_tie, LEFT))
-           d = DOWN;
-         else if (last_down_pos - p > 5)
-           d = UP;
-         else
-           d = DOWN;
-
-         set_grob_direction (t, d);
-       }
-
-      if (d == DOWN)
-       last_down_pos = p;
-
-      last_tie = t;
-    }
-
-  return;
-}
-#endif
-
-MAKE_SCHEME_CALLBACK (Tie_column, after_line_breaking, 1);
-SCM
-Tie_column::after_line_breaking (SCM smob)
-{
-  werner_directions (unsmob_grob (smob));
-  return SCM_UNSPECIFIED;
 }
 
 /*
@@ -164,11 +61,76 @@ Tie_column::before_line_breaking (SCM smob)
        }
       while (flip (&dir) != LEFT);
     }
+  
   return SCM_UNSPECIFIED;
 }
 
+MAKE_SCHEME_CALLBACK(Tie_column, calc_positioning_done, 1)
+SCM
+Tie_column::calc_positioning_done (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  extract_grob_set (me, "ties", ro_ties);
+  vector<Grob*> ties (ro_ties);
+  if (!ties.size ())
+    return SCM_BOOL_T;
+
+  if (ties.size() == 1)
+    {
+      /*
+       Already handled by standard mechanisms.
+       */
+      return SCM_BOOL_T;
+    }
+  
+  vector_sort (ties, &Tie::compare);
+
+  Tie_formatting_problem problem;
+  problem.from_ties (ties);
+
+  SCM manual_configs = me->get_property ("tie-configuration");
+  problem.set_manual_tie_configuration (manual_configs);
+
+
+  Ties_configuration base = problem.generate_optimal_chord_configuration ();
+
+  for (vsize i = 0; i < base.size(); i++)
+    {
+      Tie::set_control_points (ties[i], problem.common_x_refpoint (),
+                              base[i],
+                              problem.details_);
+      set_grob_direction (ties[i],
+                         base[i].dir_);
+
+#if DEBUG_TIE_SCORING
+      if (to_boolean (me->layout ()
+                     ->lookup_variable (ly_symbol2scm ("debug-tie-scoring"))))
+       {
+         string card = to_string ("%d (%.2f): ", base[i].position_, base[i].delta_y_)
+           + base[i].card () + base.tie_card (i);
+
+         
+         if (i == 0)
+           card += base.card ();
+         if (i == base.size () - 1)
+           card += to_string ("TOTAL=%.2f", base.score ());
+         
+         ties[i]->set_property ("quant-score",
+                                scm_makfrom0str (card.c_str ()));
+       }
+#endif
+      
+    }
+  return SCM_BOOL_T;
+}
+
+
+
 ADD_INTERFACE (Tie_column, "tie-column-interface",
               "Object that sets directions of multiple ties in a tied chord",
-              "direction");
 
+              /* properties */
+              "positioning-done "
+              "tie-configuration "
+              );