X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-interface.cc;h=d57b5cac0c2d060551d04f145b9dd6d84ff1dec0;hb=db4dd36b622417b5fe4c4a4660402e0ac7b5beb1;hp=eb5f8e975626707ed17ca8814e5cf0aae42080e0;hpb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;p=lilypond.git

diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index eb5f8e9756..d57b5cac0c 100644
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -12,7 +12,7 @@ source file of the GNU LilyPond music typesetter
 #include "grob.hh"
 #include "staff-symbol-referencer.hh"
 #include "lookup.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 
 
 Stencil
@@ -24,11 +24,11 @@ Line_interface::make_dashed_line (Real thick, Offset from, Offset to,
   Real off = dash_period - on;
   
   SCM at = scm_list_n (ly_symbol2scm ("dashed-line"),
-			gh_double2scm (thick), 
-			gh_double2scm (on),
-			gh_double2scm (off),
-			gh_double2scm (to[X_AXIS] - from[X_AXIS]),
-			gh_double2scm (to[Y_AXIS] - from[Y_AXIS]),
+			scm_make_real (thick), 
+			scm_make_real (on),
+			scm_make_real (off),
+			scm_make_real (to[X_AXIS] - from[X_AXIS]),
+			scm_make_real (to[Y_AXIS] - from[Y_AXIS]),
 			SCM_UNDEFINED);
   
   Box box;
@@ -47,11 +47,11 @@ Stencil
 Line_interface::make_line (Real th, Offset from, Offset to)
 {
   SCM at = scm_list_n (ly_symbol2scm ("draw-line"),
-			gh_double2scm (th), 
-			gh_double2scm (from[X_AXIS]),
-			gh_double2scm (from[Y_AXIS]),
-			gh_double2scm (to[X_AXIS]),
-			gh_double2scm (to[Y_AXIS]),
+			scm_make_real (th), 
+			scm_make_real (from[X_AXIS]),
+			scm_make_real (from[Y_AXIS]),
+			scm_make_real (to[X_AXIS]),
+			scm_make_real (to[Y_AXIS]),
 			SCM_UNDEFINED);
 
   Box box;
@@ -73,7 +73,7 @@ Line_interface::line (Grob *me, Offset from, Offset to)
   SCM type = me->get_property ("style");
 
   SCM dash_fraction = me->get_property ("dash-fraction");
-  if (gh_number_p (dash_fraction) || type == ly_symbol2scm ("dotted-line"))
+  if (scm_is_number (dash_fraction) || type == ly_symbol2scm ("dotted-line"))
     {
       
       Real fraction