* tex/lilyponddefs.tex (\lyitem): Don't use \topalign to make

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 59966272ac48e47783e5d483200b625442761cc5..3b9fcc2ff0eddf98796e98fd3f4399843db98b83 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -7,7 +7,7 @@
  */
 
 #include "stencil.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "arpeggio.hh"
 #include "grob.hh"
 #include "stem.hh"
@@ -25,9 +25,9 @@ Arpeggio::print (SCM smob)
   Grob *me = unsmob_grob (smob);
   
   Grob * common = me;
-  for (SCM s = me->get_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+  for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * stem =  unsmob_grob (ly_car (s));
+      Grob * stem =  unsmob_grob (scm_car (s));
       common =  common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
                                 Y_AXIS);
     }
@@ -43,9 +43,9 @@ Arpeggio::print (SCM smob)
   Interval heads;
   Real my_y = me->relative_coordinate (common, Y_AXIS);
       
-  for (SCM s = me->get_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+  for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * stem = unsmob_grob (ly_car (s));
+      Grob * stem = unsmob_grob (scm_car (s));
       Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
       Interval iv =Stem::head_positions (stem);
       iv *= Staff_symbol::staff_space (ss)/2.0;
@@ -104,9 +104,9 @@ Arpeggio::brew_chord_bracket (SCM smob)
   Grob *me = unsmob_grob (smob);
   
   Grob * common = me;
-  for (SCM s = me->get_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+  for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * stem =  unsmob_grob (ly_car (s));
+      Grob * stem =  unsmob_grob (scm_car (s));
       common =  common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
                                 Y_AXIS);
     }
@@ -114,16 +114,16 @@ Arpeggio::brew_chord_bracket (SCM smob)
   Interval heads;
   Real my_y = me->relative_coordinate (common, Y_AXIS);
       
-  for (SCM s = me->get_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+  for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * stem = unsmob_grob (ly_car (s));
+      Grob * stem = unsmob_grob (scm_car (s));
       Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
       Interval iv = Stem::head_positions (stem);
       iv *= Staff_symbol::staff_space (ss)/2.0;      
       heads.unite (iv  +  ss->relative_coordinate (common, Y_AXIS)  -  my_y);
     }
 
-  Real lt =  me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+  Real lt =  me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
   Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
   Real dy = heads.length () + sp;
   Real x = 0.7;
@@ -143,7 +143,7 @@ SCM
 Arpeggio::width_callback (SCM smob, SCM axis)
 {
   Grob * me = unsmob_grob (smob);
-  Axis a = (Axis)gh_scm2int (axis);
+  Axis a = (Axis)scm_to_int (axis);
   assert (a == X_AXIS);
   Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");