*** empty log message ***

[lilypond.git] / lily / line-spanner.cc

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 854a641f63c038113130c2caa25fa9e6c6793f9f..1359f318104ff0036c779b870a31c458e5501d8d 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -3,16 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "line-spanner.hh"
+
 #include <math.h>
 
-#include "stencil.hh"
-#include "item.hh"
 #include "spanner.hh"
-#include "line-spanner.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "paper-column.hh"
 #include "staff-symbol-referencer.hh"
 #include "font-interface.hh"
@@ -98,7 +97,7 @@ Line_spanner::line_stencil (Grob *me,
 {
   Offset dz = to -from ; 
   SCM type = me->get_property ("style");
-  if (is_symbol (type)
+  if (scm_is_symbol (type)
       && (type == ly_symbol2scm ("line")
          || type == ly_symbol2scm ("dashed-line")
          || type == ly_symbol2scm ("dotted-line")
@@ -109,7 +108,7 @@ Line_spanner::line_stencil (Grob *me,
        ? zigzag_stencil (me, from, to)
        : Line_interface::line (me, from, to);
     }
-  else if (is_symbol (type)
+  else if (scm_is_symbol (type)
           && type == ly_symbol2scm ("trill"))
     {
       SCM alist_chain = Font_interface::text_font_alist_chain (me);
@@ -117,10 +116,10 @@ Line_spanner::line_stencil (Grob *me,
                                             ly_symbol2scm ("fetaMusic")),
                                    SCM_UNDEFINED);
       
-      Font_metric *fm = select_font (me->get_paper (),
+      Font_metric *fm = select_font (me->get_layout (),
                                     scm_cons (style_alist,
                                              alist_chain));
-      Stencil m = fm->find_by_name ("scripts-trill-element");
+      Stencil m = fm->find_by_name ("scripts.trill_element");
       Stencil mol;
 
       do
@@ -169,9 +168,12 @@ line_spanner_common_parent (Grob *me)
   routine, via stencil_extent. At this point, the staves aren't
   separated yet, so it doesn't work cross-staff.
 
+  (huh? crossable staves have fixed distance? --hwn)
+  
 */
 
 
+
 MAKE_SCHEME_CALLBACK (Line_spanner, print, 1);
 SCM
 Line_spanner::print (SCM smob) 
@@ -203,7 +205,7 @@ Line_spanner::print (SCM smob)
       /*
        This is hairy. For the normal case, we simply find common
        parents, and draw a line between the bounds. When two note
-       heads are on different lines, there is no common parent
+       heads are on different systems, there is no common parent
        anymore. We have to find the piano-staff object.
       */
       
@@ -272,7 +274,7 @@ Line_spanner::print (SCM smob)
            + bound[RIGHT]->extent (common[X_AXIS], ax).center ()
            - bound[LEFT]->extent (common[X_AXIS], ax).center ();
 
-         my_off[ax] =me->relative_coordinate (common[a], ax);
+         my_off[ax] = me->relative_coordinate (common[a], ax);
          his_off[ax] = bound[LEFT]->relative_coordinate (common[a], ax);
          
        }