*** empty log message ***

[lilypond.git] / lily / arpeggio.cc

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 69a5a1f6cb374caf918e8b5e5a4cf8c76b75f99e..e14e551dd8bf29b9a3ad792bd2bcc113c3c0f181 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -6,10 +6,9 @@
   (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "stencil.hh"
-#include "output-def.hh"
 #include "arpeggio.hh"
-#include "grob.hh"
+
+#include "output-def.hh"
 #include "stem.hh"
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"
@@ -25,9 +24,9 @@ Arpeggio::print (SCM smob)
   Grob *me = unsmob_grob (smob);
   
   Grob * common = me;
-  for (SCM s = me->get_property ("stems"); scm_is_pair (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,11 +42,11 @@ Arpeggio::print (SCM smob)
   Interval heads;
   Real my_y = me->relative_coordinate (common, Y_AXIS);
       
-  for (SCM s = me->get_property ("stems"); scm_is_pair (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);
+      Interval iv = Stem::head_positions (stem);
       iv *= Staff_symbol::staff_space (ss)/2.0;
       
       heads.unite (iv + ss->relative_coordinate (common, Y_AXIS)
@@ -73,17 +72,17 @@ Arpeggio::print (SCM smob)
     }
   
   Stencil mol;
-  Font_metric *fm =Font_interface::get_default_font (me);
-  Stencil squiggle = fm->find_by_name ("scripts-arpeggio");
+  Font_metric *fm = Font_interface::get_default_font (me);
+  Stencil squiggle = fm->find_by_name ("scripts.arpeggio");
 
   Stencil arrow ;  
   if (dir)
     {
-      arrow = fm->find_by_name ("scripts-arpeggio-arrow-" + to_string (dir));
+      arrow = fm->find_by_name ("scripts.arpeggio.arrow." + to_string (dir));
       heads[dir] -= dir * arrow.extent (Y_AXIS).length ();
     }
   
-  for (Real  y= heads[LEFT] ; y < heads[RIGHT];
+  for (Real  y = heads[LEFT] ; y < heads[RIGHT];
        y+= squiggle. extent (Y_AXIS).length ())
       mol.add_at_edge (Y_AXIS, UP,squiggle, 0.0, 0);
 
@@ -104,9 +103,9 @@ Arpeggio::brew_chord_bracket (SCM smob)
   Grob *me = unsmob_grob (smob);
   
   Grob * common = me;
-  for (SCM s = me->get_property ("stems"); scm_is_pair (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 +113,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"); scm_is_pair (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_dimension (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;
@@ -145,7 +144,7 @@ Arpeggio::width_callback (SCM smob, SCM axis)
   Grob * me = unsmob_grob (smob);
   Axis a = (Axis)scm_to_int (axis);
   assert (a == X_AXIS);
-  Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");
+  Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts.arpeggio");
 
   return ly_interval2scm (arpeggio.extent (X_AXIS));
 }