new file.

[lilypond.git] / lily / side-position-interface.cc

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index d40648c7519d958a71558ab01985c02a772deefb..371f13fe5a8a6c5b79d33707c3c003ffbd52b5d1 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -1,15 +1,15 @@
 /*   
-  staff-side.cc --  implement Staff_side_element
+  side-position-interface.cc -- implement Side_position_interface
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "side-position-interface.hh"
 
-#include <cmath>               // ceil.
+#include <math.h>              // ceil.
 
 #include "note-head.hh"
 #include "warn.hh"
@@ -52,7 +52,7 @@ Side_position_interface::get_direction (Grob*me)
 }
   
 
-MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_support_extents, 2);
+MAKE_SCHEME_CALLBACK (Side_position_interface, aligned_on_support_extents, 2);
 SCM
 Side_position_interface::aligned_on_support_extents (SCM element_smob, SCM axis)
 {
@@ -92,7 +92,7 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
        else
          {
            Real x = e->relative_coordinate (common, a);
-           dim.unite (Interval (x,x));
+           dim.unite (Interval (x, x));
          }
     }
 
@@ -114,15 +114,21 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
 
   /* FIXME: 100CM should relate to paper size.  */
   if (fabs (total_off) > 100 CM)
-    programming_error (String_convert::form_string ("Improbable offset for grob %s: %f%s", me->name (), total_off, INTERNAL_UNIT));
-  
+    {
+      String msg
+       =  String_convert::form_string ("Improbable offset for grob %s: %f%s",
+                                       me->name ().to_str0 (), total_off,
+                                       INTERNAL_UNIT);
+      
+      programming_error (msg);
+    }
   return scm_make_real (total_off);
 }
 
 /*
   Cut & paste (ugh.)
  */
-MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_support_refpoints,2);
+MAKE_SCHEME_CALLBACK (Side_position_interface, aligned_on_support_refpoints, 2);
 SCM
 Side_position_interface::aligned_on_support_refpoints (SCM smob, SCM axis)
 {
@@ -150,7 +156,7 @@ directed_round (Real f, Direction d)
 
   Only rounds when we're inside the staff, as determined by
   Staff_symbol_referencer::staff_radius () */
-MAKE_SCHEME_CALLBACK (Side_position_interface,quantised_position,2);
+MAKE_SCHEME_CALLBACK (Side_position_interface, quantised_position, 2);
 SCM
 Side_position_interface::quantised_position (SCM element_smob, SCM)
 {
@@ -168,7 +174,7 @@ Side_position_interface::quantised_position (SCM element_smob, SCM)
 
       Grob *head = me->get_parent (X_AXIS);
        
-      if (Staff_symbol_referencer::on_staffline (me,ip)
+      if (Staff_symbol_referencer::on_staffline (me, ip)
          && ((abs (ip) <= rad)
              || (Note_head::has_interface (head)
                  && sign (Staff_symbol_referencer::get_position (head))
@@ -187,7 +193,7 @@ Side_position_interface::quantised_position (SCM element_smob, SCM)
 /*
   Position next to support, taking into account my own dimensions and padding.
  */
-MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_side,2);
+MAKE_SCHEME_CALLBACK (Side_position_interface, aligned_side, 2);
 SCM
 Side_position_interface::aligned_side (SCM element_smob, SCM axis)
 {
@@ -196,7 +202,7 @@ Side_position_interface::aligned_side (SCM element_smob, SCM axis)
   
   Direction d = Side_position_interface::get_direction (me);
   
-  Real o = scm_to_double (aligned_on_support_extents (element_smob,axis));
+  Real o = scm_to_double (aligned_on_support_extents (element_smob, axis));
 
   Interval iv =  me->extent (me, a);
 
@@ -219,7 +225,7 @@ Side_position_interface::aligned_side (SCM element_smob, SCM axis)
   if (st && a == Y_AXIS
       && scm_is_number (me->get_property ("staff-padding")))
     {
-      Real padding=
+      Real padding =
       Staff_symbol_referencer::staff_space (me)
       * scm_to_double (me->get_property ("staff-padding"));
   
@@ -252,7 +258,7 @@ Side_position_interface::get_axis (Grob*me)
 }
 
 
-ADD_INTERFACE (Side_position_interface,"side-position-interface",
+ADD_INTERFACE (Side_position_interface, "side-position-interface",
               "Position a victim object (this one) next to other objects (the "
               "support).   The property @code{direction} signifies where to put the  "
               "victim object relative to the support (left or right, up or down?)\n\n "