* configure.in: Test for and accept lmodern if EC fonts not found.

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index 4e935c95552d435c92874ceb56df9da0714f81d7..36db5cb037b18e36539f6fee6538f066147eb824 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -3,23 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <math.h>
 
+#include "tie.hh"
+
+#include <cmath>
 
 #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 "molecule.hh"
-#include "bezier-bow.hh"
+#include "bezier.hh"
 #include "stem.hh"
 #include "note-head.hh"
 #include "tie-column.hh"
@@ -41,7 +41,7 @@ void
 Tie::set_head (Grob*me,Direction d, Grob * h)
 {
   assert (!head (me,d));
-  index_set_cell (me->get_grob_property ("head-pair"), d, h->self_scm ());
+  index_set_cell (me->get_property ("head-pair"), d, h->self_scm ());
   
   dynamic_cast<Spanner*> (me)->set_bound (d, h);
   me->add_dependency (h);
@@ -50,17 +50,19 @@ Tie::set_head (Grob*me,Direction d, Grob * h)
 void
 Tie::set_interface (Grob*me)
 {
-  me->set_grob_property ("head-pair", gh_cons (SCM_EOL, SCM_EOL));
+  me->set_property ("head-pair", scm_cons (SCM_EOL, SCM_EOL));
 }
 
 
 Grob*
 Tie::head (Grob*me, Direction d) 
 {
-  SCM c = me->get_grob_property ("head-pair");
-  c = index_get_cell (c, d);
+  SCM c = me->get_property ("head-pair");
 
-  return unsmob_grob (c);
+  if (scm_is_pair (c))
+    return unsmob_grob (index_get_cell (c, d));
+  else
+    return 0;
 }
 
 Real
@@ -134,7 +136,7 @@ Tie::get_control_points (SCM smob)
     {
       programming_error ("Tie without heads.");
       me->suicide ();
-      return SCM_UNSPECIFIED;
+      return SCM_EOL;
     }
 
   set_direction (me);
@@ -143,7 +145,7 @@ Tie::get_control_points (SCM smob)
   
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
-  Real x_gap_f = robust_scm2double (me->get_grob_property ("x-gap"), 0);
+  Real x_gap_f = robust_scm2double (me->get_property ("x-gap"), 0);
 
   Grob* l = me->get_bound (LEFT);
   Grob* r = me->get_bound (RIGHT);  
@@ -199,13 +201,13 @@ Tie::get_control_points (SCM smob)
   
 
 
-  SCM details = me->get_grob_property ("details");
+  SCM details = me->get_property ("details");
 
   SCM lim // groetjes aan de chirurgendochter.
     = scm_assq (ly_symbol2scm ("height-limit"),details);
   
-  Real h_inf = gh_scm2double (ly_cdr (lim)) *  staff_space;
-  Real r_0 = gh_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);
   
@@ -218,7 +220,7 @@ Tie::get_control_points (SCM smob)
   */
 
   Real ypos = Tie::get_position (me) * staff_space/2
-    + dir * gh_scm2double (me->get_grob_property ("y-offset"));;
+    + dir * scm_to_double (me->get_property ("y-offset"));;
 
   /*
     Make sure we don't start on a dots
@@ -226,7 +228,7 @@ Tie::get_control_points (SCM smob)
   if (Note_head::has_interface (l) && Rhythmic_head::get_dots (l))
     {
       Grob* dots = Rhythmic_head::get_dots (l);
-      if(fabs (staff_space * Staff_symbol_referencer::get_position (dots) /2
+      if (fabs (staff_space * Staff_symbol_referencer::get_position (dots) /2
               - ypos) < 0.5)
        {
          ypos += 0.5 * dir ;
@@ -266,7 +268,7 @@ Tie::get_control_points (SCM smob)
       Real diff = ry - y;
       Real newy = y;
 
-      Real clear = staff_space * gh_scm2double (me->get_grob_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
@@ -312,37 +314,40 @@ Tie::get_control_points (SCM smob)
 
   SCM controls = SCM_EOL;
   for (int i= 4; i--;)
-    controls = gh_cons (ly_offset2scm (b.control_[i]), controls);
+    controls = scm_cons (ly_offset2scm (b.control_[i]), controls);
   return controls;
 }
 
 
-MAKE_SCHEME_CALLBACK (Tie,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Tie,print,1);
 SCM
-Tie::brew_molecule (SCM smob) 
+Tie::print (SCM smob) 
 {
   Grob*me = unsmob_grob (smob);
 
-  SCM cp = me->get_grob_property ("control-points");
-  if (cp == SCM_EOL)
+  SCM cp = me->get_property ("control-points");
+  if (!scm_is_pair (cp))               // list is more accurate
     {
       cp = get_control_points (smob);
-      me->set_grob_property ("control-points", cp);
+      me->set_property ("control-points", cp);
     }
+
+  if (!scm_is_pair (cp))
+    return Stencil ().smobbed_copy ();
   
   Real thick
     = Staff_symbol_referencer::line_thickness (me)
-    *  robust_scm2double (me->get_grob_property ("thickness"), 1);
+    *  robust_scm2double (me->get_property ("thickness"), 1);
 
   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++;
     }
   
-   Molecule a = Lookup::slur (b, get_grob_direction (me) * thick, thick);
+   Stencil a = Lookup::slur (b, get_grob_direction (me) * thick, thick);
    
    return a.smobbed_copy ();
 }
@@ -350,6 +355,6 @@ Tie::brew_molecule (SCM smob)
 
 
 ADD_INTERFACE (Tie,"tie-interface",
-  "A tie connecting two noteheads.\n"
-"direction = Forced direction for all ties",
+              "A tie connecting two noteheads.\n"
+              ,
   "y-offset staffline-clearance control-points head-pair details thickness x-gap direction minimum-length");