* input/regression/accidental-piano.ly (Module): new file.

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index c1fa6b9777e0e51bfc5cdce1447426c6471f8bef..7c8110f4e5986d18b8896bf013e3c6aa06b4231d 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,7 +25,7 @@ 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"); ly_c_pair_p (s); s = ly_cdr (s))
     {
       Grob * stem =  unsmob_grob (ly_car (s));
       common =  common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
@@ -43,7 +43,7 @@ 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"); ly_c_pair_p (s); s = ly_cdr (s))
     {
       Grob * stem = unsmob_grob (ly_car (s));
       Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
@@ -80,7 +80,7 @@ Arpeggio::print (SCM smob)
   if (dir)
     {
       arrow = fm->find_by_name ("scripts-arpeggio-arrow-" + to_string (dir));
-      heads[dir] -= dir * arrow.extent (Y_AXIS).length();
+      heads[dir] -= dir * arrow.extent (Y_AXIS).length ();
     }
   
   for (Real  y= heads[LEFT] ; y < heads[RIGHT];
@@ -104,7 +104,7 @@ 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"); ly_c_pair_p (s); s = ly_cdr (s))
     {
       Grob * stem =  unsmob_grob (ly_car (s));
       common =  common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
@@ -114,7 +114,7 @@ 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"); ly_c_pair_p (s); s = ly_cdr (s))
     {
       Grob * stem = unsmob_grob (ly_car (s));
       Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
@@ -123,14 +123,14 @@ Arpeggio::brew_chord_bracket (SCM smob)
       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_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
   Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
-  Real dy = heads.length() + sp;
+  Real dy = heads.length () + sp;
   Real x = 0.7;
 
   Stencil mol (Lookup::bracket (Y_AXIS, Interval (0, dy), lt, x, lt));
   mol.translate_axis (heads[LEFT] - sp/2.0, Y_AXIS);
-  return mol.smobbed_copy();
+  return mol.smobbed_copy ();
 }
 
 
@@ -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");