Uniformize, internalize.

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index 0ac50e5e852d6e3db21fe0df046fbb8c7cd7d83c..569aa220ad9cc9ec0cc35afe8b150a5000337e2b 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -3,23 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <math.h>
 
+#include "tie.hh"
+
+#include <math.h>
 
 #include "spanner.hh"
 #include "lookup.hh"
-#include "paper-def.hh"
-#include "tie.hh"
+#include "output-def.hh"
 #include "rhythmic-head.hh"
 #include "bezier.hh"
 #include "paper-column.hh"
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
-#include "stencil.hh"
-#include "bezier-bow.hh"
+#include "bezier.hh"
 #include "stem.hh"
 #include "note-head.hh"
 #include "tie-column.hh"
@@ -38,9 +38,9 @@
 
 
 void
-Tie::set_head (Grob*me,Direction d, Grob * h)
+Tie::set_head (Grob*me, Direction d, Grob * h)
 {
-  assert (!head (me,d));
+  assert (!head (me, d));
   index_set_cell (me->get_property ("head-pair"), d, h->self_scm ());
   
   dynamic_cast<Spanner*> (me)->set_bound (d, h);
@@ -59,17 +59,29 @@ Tie::head (Grob*me, Direction d)
 {
   SCM c = me->get_property ("head-pair");
 
-  if (ly_c_pair_p (c))
+  if (scm_is_pair (c))
     return unsmob_grob (index_get_cell (c, d));
   else
     return 0;
 }
 
+int
+Tie::get_column_rank (Grob *me, Direction d)
+{
+  Spanner *span = dynamic_cast<Spanner*> (me); 
+  Grob * h = head (me, d);
+  if (!h)
+    h = span->get_bound (d);
+
+  Grob *col = dynamic_cast<Item*> (h)->get_column ();
+  return Paper_column::get_rank (col);
+}
+
 Real
 Tie::get_position (Grob*me) 
 {
-  Direction d = head (me,LEFT) ? LEFT:RIGHT;
-  return Staff_symbol_referencer::get_position (head (me,d));
+  Direction d = head (me, LEFT) ? LEFT:RIGHT;
+  return Staff_symbol_referencer::get_position (head (me, d));
 }
 
 
@@ -87,8 +99,8 @@ Tie::get_position (Grob*me)
 Direction
 Tie::get_default_dir (Grob*me) 
 {
-  Item * sl =  head (me,LEFT) ? Rhythmic_head::get_stem (head (me,LEFT)) :0;
-  Item * sr =  head (me,RIGHT) ? Rhythmic_head::get_stem (head (me,RIGHT)) :0;  
+  Item * sl =  head (me, LEFT) ? Rhythmic_head::get_stem (head (me, LEFT)) :0;
+  Item * sr =  head (me, RIGHT) ? Rhythmic_head::get_stem (head (me, RIGHT)) :0;  
   if (sl && sr)
     {
       if (get_grob_direction (sl) == UP
@@ -128,9 +140,9 @@ Tie::get_control_points (SCM smob)
 {  
   Spanner*me = unsmob_spanner (smob);
   Direction headdir = CENTER; 
-  if (head (me,LEFT))
+  if (head (me, LEFT))
     headdir = LEFT;
-  else if (head (me,RIGHT))
+  else if (head (me, RIGHT))
     headdir = RIGHT;
   else
     {
@@ -182,7 +194,7 @@ Tie::get_control_points (SCM smob)
   if (Note_head::has_interface (l) && Note_head::has_interface (r))
     {
       width = 
-       + r->extent (commonx,X_AXIS)[LEFT]
+       + r->extent (commonx, X_AXIS)[LEFT]
        - l->extent (commonx, X_AXIS)[RIGHT]
        -2 * x_gap_f;
     }
@@ -204,10 +216,10 @@ Tie::get_control_points (SCM smob)
   SCM details = me->get_property ("details");
 
   SCM lim // groetjes aan de chirurgendochter.
-    = scm_assq (ly_symbol2scm ("height-limit"),details);
+    = scm_assq (ly_symbol2scm ("height-limit"), details);
   
-  Real h_inf = ly_scm2double (ly_cdr (lim)) *  staff_space;
-  Real r_0 = ly_scm2double (ly_cdr (scm_assq (ly_symbol2scm ("ratio"),details)));
+  Real h_inf = scm_to_double (scm_cdr (lim)) *  staff_space;
+  Real r_0 = scm_to_double (scm_cdr (scm_assq (ly_symbol2scm ("ratio"), details)));
 
   Bezier b  = slur_shape (width, h_inf, r_0);
   
@@ -220,7 +232,7 @@ Tie::get_control_points (SCM smob)
   */
 
   Real ypos = Tie::get_position (me) * staff_space/2
-    + dir * ly_scm2double (me->get_property ("y-offset"));;
+    + dir * scm_to_double (me->get_property ("y-offset"));;
 
   /*
     Make sure we don't start on a dots
@@ -242,7 +254,7 @@ Tie::get_control_points (SCM smob)
     todo: tie / stem collision
    */
 
-  b = slur_shape (width,h_inf, r_0);
+  b = slur_shape (width, h_inf, r_0);
   b.scale (1, dir);
   b.translate (Offset (left_x, ypos));
   
@@ -256,7 +268,7 @@ Tie::get_control_points (SCM smob)
 
     TODO: doesn't work when on staff with even number of lines.
    */
-  Array<Real> horizontal (b.solve_derivative (Offset (1,0)));
+  Array<Real> horizontal (b.solve_derivative (Offset (1, 0)));
   if (horizontal.size ())
     {
       /*
@@ -268,7 +280,7 @@ Tie::get_control_points (SCM smob)
       Real diff = ry - y;
       Real newy = y;
 
-      Real clear = staff_space * ly_scm2double (me->get_property ("staffline-clearance"));
+      Real clear = staff_space * scm_to_double (me->get_property ("staffline-clearance"));
 
       if (fabs (y) <=
          Staff_symbol_referencer::staff_radius (me) * staff_space + clear
@@ -313,26 +325,26 @@ Tie::get_control_points (SCM smob)
 
 
   SCM controls = SCM_EOL;
-  for (int i= 4; i--;)
+  for (int i = 4; i--;)
     controls = scm_cons (ly_offset2scm (b.control_[i]), controls);
   return controls;
 }
 
 
-MAKE_SCHEME_CALLBACK (Tie,print,1);
+MAKE_SCHEME_CALLBACK (Tie, print, 1);
 SCM
 Tie::print (SCM smob) 
 {
   Grob*me = unsmob_grob (smob);
 
   SCM cp = me->get_property ("control-points");
-  if (!ly_c_pair_p (cp))               // list is more accurate
+  if (!scm_is_pair (cp))               // list is more accurate
     {
       cp = get_control_points (smob);
       me->set_property ("control-points", cp);
     }
 
-  if (!ly_c_pair_p (cp))
+  if (!scm_is_pair (cp))
     return Stencil ().smobbed_copy ();
   
   Real thick
@@ -341,9 +353,9 @@ Tie::print (SCM smob)
 
   Bezier b;
   int i = 0;
-  for (SCM s= cp; s != SCM_EOL; s = ly_cdr (s))
+  for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s))
     {
-      b.control_[i] = ly_scm2offset (ly_car (s));
+      b.control_[i] = ly_scm2offset (scm_car (s));
       i++;
     }
   
@@ -354,7 +366,7 @@ Tie::print (SCM smob)
 
 
 
-ADD_INTERFACE (Tie,"tie-interface",
+ADD_INTERFACE (Tie, "tie-interface",
               "A tie connecting two noteheads.\n"
               ,
   "y-offset staffline-clearance control-points head-pair details thickness x-gap direction minimum-length");