remove PDF related files

[lilypond.git] / lily / separating-group-spanner.cc

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 250fcade9265f4a65f70f659cdf4a21e222be72c..05c5264b1da57550f1752859a0727c1c94262263 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -3,11 +3,12 @@
   
   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 "separating-group-spanner.hh"
+
 #include "separation-item.hh"
 #include "paper-column.hh"
 #include "output-def.hh"
@@ -28,9 +29,9 @@ Separating_group_spanner::find_rods (Item * r, SCM next, Real padding)
     return; 
 
 
-  for (; ly_c_pair_p (next); next = ly_cdr (next))
+  for (; scm_is_pair (next); next = scm_cdr (next))
     {
-      Item *l = dynamic_cast<Item*> (unsmob_grob (ly_car ( next)));
+      Item *l = dynamic_cast<Item*> (unsmob_grob (scm_car ( next)));
       Item *lb = l->find_prebroken_piece (RIGHT);
 
       if (lb)
@@ -55,8 +56,8 @@ Separating_group_spanner::find_rods (Item * r, SCM next, Real padding)
        {
          Rod rod;
 
-         rod.item_l_drul_[LEFT] =l;
-         rod.item_l_drul_[RIGHT]=r;
+         rod.item_l_drul_[LEFT] = l;
+         rod.item_l_drul_[RIGHT]= r;
 
          rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
        
@@ -72,7 +73,7 @@ Separating_group_spanner::find_rods (Item * r, SCM next, Real padding)
     }
 }
 
-MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods,1);
+MAKE_SCHEME_CALLBACK (Separating_group_spanner, set_spacing_rods, 1);
 SCM
 Separating_group_spanner::set_spacing_rods (SCM smob)
 {
@@ -83,12 +84,12 @@ Separating_group_spanner::set_spacing_rods (SCM smob)
    */
   Real padding = robust_scm2double (me->get_property ("padding"), 0.1);
   
-  for (SCM s = me->get_property ("elements"); ly_c_pair_p (s) && ly_c_pair_p (ly_cdr (s)); s = ly_cdr (s))
+  for (SCM s = me->get_property ("elements"); scm_is_pair (s) && scm_is_pair (scm_cdr (s)); s = scm_cdr (s))
     {
       /*
        Order of elements is reversed!
        */
-      SCM elt = ly_car (s);
+      SCM elt = scm_car (s);
       Item *r = unsmob_item (elt);
 
       if (!r)
@@ -97,16 +98,16 @@ Separating_group_spanner::set_spacing_rods (SCM smob)
       Item *rb
        = dynamic_cast<Item*> (r->find_prebroken_piece (LEFT));
       
-      find_rods (r, ly_cdr (s), padding);
+      find_rods (r, scm_cdr (s), padding);
       if (rb)
-       find_rods (rb, ly_cdr (s), padding);
+       find_rods (rb, scm_cdr (s), padding);
     }
 
   return SCM_UNSPECIFIED ;
 }
 
 void
-Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i)
+Separating_group_spanner::add_spacing_unit (Grob* me , Item*i)
 {
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), i);
   me->add_dependency (i);
@@ -116,7 +117,7 @@ Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i)
 
 
 
-ADD_INTERFACE (Separating_group_spanner,"separation-spanner-interface",
+ADD_INTERFACE (Separating_group_spanner, "separation-spanner-interface",
               "A spanner that calculates spacing constraints (\"rods\") "
               "using the @code{separation-item-interface} grobs in @code{elements}.",
               "elements padding");