X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=3b9fcc2ff0eddf98796e98fd3f4399843db98b83;hb=4f5b668a1d61ca95adb60d56f1c771748b5a6446;hp=4eef3d8cafd3a54b66c8f344f5b3ad55a7f8bdec;hpb=48189914f51eb9c2f1c14931c72d267a25d5f812;p=lilypond.git

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 4eef3d8caf..3b9fcc2ff0 100644
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "stencil.hh"
+#include "output-def.hh"
 #include "arpeggio.hh"
 #include "grob.hh"
 #include "stem.hh"
@@ -18,16 +18,16 @@
 #include "lookup.hh"
 
 
-MAKE_SCHEME_CALLBACK (Arpeggio, brew_molecule, 1);
+MAKE_SCHEME_CALLBACK (Arpeggio, print, 1);
 SCM 
-Arpeggio::brew_molecule (SCM smob) 
+Arpeggio::print (SCM smob) 
 {
   Grob *me = unsmob_grob (smob);
   
   Grob * common = me;
-  for (SCM s = me->get_grob_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::brew_molecule (SCM smob)
   Interval heads;
   Real my_y = me->relative_coordinate (common, Y_AXIS);
       
-  for (SCM s = me->get_grob_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;
@@ -65,22 +65,22 @@ Arpeggio::brew_molecule (SCM smob)
       return SCM_EOL;
     }
 
-  SCM ad = me->get_grob_property ("arpeggio-direction");
+  SCM ad = me->get_property ("arpeggio-direction");
   Direction dir = CENTER;
   if (is_direction (ad))
     {
       dir = to_dir (ad);
     }
   
-  Molecule mol;
+  Stencil mol;
   Font_metric *fm =Font_interface::get_default_font (me);
-  Molecule squiggle = fm->find_by_name ("scripts-arpeggio");
+  Stencil squiggle = fm->find_by_name ("scripts-arpeggio");
 
-  Molecule arrow ;  
+  Stencil arrow ;  
   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,9 +104,9 @@ Arpeggio::brew_chord_bracket (SCM smob)
   Grob *me = unsmob_grob (smob);
   
   Grob * common = me;
-  for (SCM s = me->get_grob_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,41 +114,40 @@ Arpeggio::brew_chord_bracket (SCM smob)
   Interval heads;
   Real my_y = me->relative_coordinate (common, Y_AXIS);
       
-  for (SCM s = me->get_grob_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 dy = heads.length () + sp;
   Real x = 0.7;
 
-  Molecule mol (Lookup::bracket (Y_AXIS, Interval (0, dy), lt, x, lt));
+  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 ();
 }
 
 
 /*
-  We have to do a callback, because brew_molecule () triggers a
+  We have to do a callback, because print () triggers a
   vertical alignment if it is cross-staff.
-  This callback also adds padding.
 */
 MAKE_SCHEME_CALLBACK (Arpeggio, width_callback,2);
 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);
-  Molecule 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) * 1.5);
+  return ly_interval2scm (arpeggio.extent (X_AXIS));
 }