new file, move from

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

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 2f91fd7aa5328d49834871f1e8be8c477b49546d..9dc4562539484b949974bd9be0f065eedf08079d 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -12,7 +12,7 @@
 #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"
@@ -31,21 +31,21 @@ zigzag_stencil (Grob *me,
   Real dy = dz[Y_AXIS];
 
   Real thick = Staff_symbol_referencer::line_thickness (me);
-  thick *= robust_scm2double (me->get_grob_property ("thickness"), 1.0); // todo: staff sym referencer? 
+  thick *= robust_scm2double (me->get_property ("thickness"), 1.0); // todo: staff sym referencer? 
   
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
-  double w = robust_scm2double (me->get_grob_property ("zigzag-width"), 1)*staff_space;
-  double l = robust_scm2double ( me->get_grob_property ("zigzag-length"), 1)* w;
-  double h = l>w/2 ? sqrt(l*l-w*w/4) : 0;
+  double w = robust_scm2double (me->get_property ("zigzag-width"), 1)*staff_space;
+  double l = robust_scm2double ( me->get_property ("zigzag-length"), 1)* w;
+  double h = l>w/2 ? sqrt (l*l-w*w/4) : 0;
   
   SCM list = scm_list_n (ly_symbol2scm ("zigzag-line"),
-                     gh_bool2scm (true),
-                     gh_double2scm (w),
-                     gh_double2scm (h),
-                     gh_double2scm (thick),
-                     gh_double2scm (dx),
-                     gh_double2scm (dy),
+                     ly_bool2scm (true),
+                     scm_make_real (w),
+                     scm_make_real (h),
+                     scm_make_real (thick),
+                     scm_make_real (dx),
+                     scm_make_real (dy),
                      SCM_UNDEFINED);
   Box b;
   b.add_point (Offset (0,0));
@@ -56,7 +56,7 @@ zigzag_stencil (Grob *me,
   return Stencil (b, list);
 }
 
-MAKE_SCHEME_CALLBACK(Line_spanner, after_line_breaking, 1);
+MAKE_SCHEME_CALLBACK (Line_spanner, after_line_breaking, 1);
 SCM
 Line_spanner::after_line_breaking (SCM  g)
 {
@@ -78,13 +78,13 @@ Line_spanner::after_line_breaking (SCM  g)
     --hwn.
     
    */
-  if (sp->get_bound (LEFT)->break_status_dir()
-      && !sp->get_bound (RIGHT)->break_status_dir())
+  if (sp->get_bound (LEFT)->break_status_dir ()
+      && !sp->get_bound (RIGHT)->break_status_dir ())
     {
       /*
        Can't do suicide, since this mucks up finding the trend.
        */
-      me->set_grob_property ("print-function", SCM_EOL);
+      me->set_property ("print-function", SCM_EOL);
       
     }
   return SCM_EOL;
@@ -97,8 +97,8 @@ Line_spanner::line_stencil (Grob *me,
                             Offset to)
 {
   Offset dz = to -from ; 
-  SCM type = me->get_grob_property ("style");
-  if (gh_symbol_p (type)
+  SCM type = me->get_property ("style");
+  if (ly_c_symbol_p (type)
       && (type == ly_symbol2scm ("line")
          || type == ly_symbol2scm ("dashed-line")
          || type == ly_symbol2scm ("dotted-line")
@@ -109,17 +109,17 @@ Line_spanner::line_stencil (Grob *me,
        ? zigzag_stencil (me, from, to)
        : Line_interface::line (me, from, to);
     }
-  else if (gh_symbol_p (type)
+  else if (ly_c_symbol_p (type)
           && type == ly_symbol2scm ("trill"))
     {
-      SCM alist_chain = Font_interface::font_alist_chain (me);
-      SCM style_alist = scm_list_n (gh_cons (ly_symbol2scm ("font-family"),
-                                            ly_symbol2scm ("music")),
+      SCM alist_chain = Font_interface::text_font_alist_chain (me);
+      SCM style_alist = scm_list_n (scm_cons (ly_symbol2scm ("font-encoding"),
+                                            ly_symbol2scm ("fetaMusic")),
                                    SCM_UNDEFINED);
       
       Font_metric *fm = select_font (me->get_paper (),
-                                                 gh_cons (style_alist,
-                                                          alist_chain));
+                                    scm_cons (style_alist,
+                                             alist_chain));
       Stencil m = fm->find_by_name ("scripts-trill-element");
       Stencil mol;
 
@@ -139,7 +139,7 @@ Line_spanner::line_stencil (Grob *me,
       mol.translate (from);
       return mol;
     }
-  return Stencil();
+  return Stencil ();
 }
 
 /*
@@ -182,7 +182,7 @@ Line_spanner::print (SCM smob)
                            me->get_bound (RIGHT));
   
   
-  Real gap = robust_scm2double (me->get_grob_property ("gap"), 0.0);
+  Real gap = robust_scm2double (me->get_property ("gap"), 0.0);
 
   Offset ofxy (gap, 0); /*offset from start point to start of line*/
   Offset dxy ;
@@ -190,13 +190,13 @@ Line_spanner::print (SCM smob)
   Offset his_off;
   
 
-  if (bound[RIGHT]->break_status_dir())
+  if (bound[RIGHT]->break_status_dir ())
     {
       if (bound[LEFT]->break_status_dir ())
        {
          programming_error ("line-spanner with two broken ends. Farewell sweet world.");
 
-         me->suicide();
+         me->suicide ();
          return SCM_EOL;
        }
 
@@ -216,7 +216,7 @@ Line_spanner::print (SCM smob)
        {
          programming_error ("no note heads for the line spanner on next line?"
                             " Confused.");
-         me->suicide();
+         me->suicide ();
          return SCM_EOL;
        }
             
@@ -245,7 +245,7 @@ Line_spanner::print (SCM smob)
       dz = (dz.length () - 2*gap) *dir;
       
   
-      Stencil l (line_stencil (me, Offset(0, 0), dz));
+      Stencil l (line_stencil (me, Offset (0, 0), dz));
 
       l.translate (dir * gap +  p1
                   - Offset (me->relative_coordinate (commonx, X_AXIS),
@@ -290,10 +290,12 @@ Line_spanner::print (SCM smob)
 
 
 ADD_INTERFACE (Line_spanner, "line-spanner-interface",
-  "Generic line drawn between two objects, eg. for use with glissandi.\n"
-"gap is measured in staff-spaces.\n"
-"The property 'type is one of: line, dashed-line, trill, dotted-line or zigzag.\n"
-"\n",
-  "gap zigzag-width zigzag-length thickness");
+              "Generic line drawn between two objects, e.g. for use with glissandi.\n"
+              "The property @code{style} can be @code{line}, "
+              "@code{dashed-line}, @code{trill}, \n"
+              "@code{dotted-line} or @code{zigzag}.\n"
+              "\n"
+              ,
+              "gap zigzag-width zigzag-length thickness");