X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-item.cc;h=eddb2656a9606c2d2b9a739be142cf785d6ffad0;hb=77dba2aad902de14961ca17d32e3551eba7bab08;hp=5688ce5fa5841c14c7d5ea14744bf7a278b7c7e9;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc
index 5688ce5fa5..eddb2656a9 100644
--- a/lily/percent-repeat-item.cc
+++ b/lily/percent-repeat-item.cc
@@ -6,27 +6,25 @@
   (c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include <math.h>
 
-#include "grob.hh"
-#include "lookup.hh"
-#include "molecule.hh"
-#include "font-interface.hh"
-#include "font-metric.hh" 
 #include "percent-repeat-item.hh"
 
+#include <cmath>
+
+#include "lookup.hh"
+#include "font-interface.hh"
 
-Molecule
+Stencil
 Percent_repeat_item_interface::brew_slash ( Grob *me)
 {
-  Real slope = robust_scm2double (me->get_grob_property ("slope"), 1);
+  Real slope = robust_scm2double (me->get_property ("slope"), 1);
   Real wid = 2.0 / slope;
 
   /*
     todo: check out if in staff-rule thickness normally.
    */
-  Real thick = robust_scm2double (me->get_grob_property ("thickness"), 1);
-  Molecule m = Lookup::repeat_slash (wid, slope, thick);
+  Real thick = robust_scm2double (me->get_property ("thickness"), 1);
+  Stencil m = Lookup::repeat_slash (wid, slope, thick);
   m.translate_axis (-m.extent (Y_AXIS).center (), Y_AXIS);
   return m;
 }
@@ -34,20 +32,20 @@ Percent_repeat_item_interface::brew_slash ( Grob *me)
 /*
   todo: use grob props for dot_neg_kern, slash_neg_kern?
  */
-Molecule
+Stencil
 Percent_repeat_item_interface::x_percent (Grob *me, int count,
 					  Real dot_neg_kern,
 					  Real slash_neg_kern)
 {
-  Molecule m ;
-  Molecule s = brew_slash (me);
+  Stencil m ;
+  Stencil s = brew_slash (me);
 
   for (int i  = count; i--;)
     {
       m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern,0);
     }
-  Molecule d1 = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
-  Molecule d2  =  d1;
+  Stencil d1 = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
+  Stencil d2  =  d1;
   d1.translate_axis (0.5, Y_AXIS );
   d2.translate_axis (-0.5, Y_AXIS);
   
@@ -57,22 +55,22 @@ Percent_repeat_item_interface::x_percent (Grob *me, int count,
   return m;
 }
 
-MAKE_SCHEME_CALLBACK(Percent_repeat_item_interface,double_percent,1);
+MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface,double_percent,1);
 SCM
 Percent_repeat_item_interface::double_percent (SCM grob)
 {
   Grob *me = unsmob_grob (grob);
-  Molecule m = x_percent (me, 2, 0.75, 1.6);
+  Stencil m = x_percent (me, 2, 0.75, 1.6);
   m.translate_axis (- m.extent (X_AXIS).center (), X_AXIS);
   return m.smobbed_copy ();
 }
 
-MAKE_SCHEME_CALLBACK(Percent_repeat_item_interface,beat_slash,1);
+MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface,beat_slash,1);
 SCM
 Percent_repeat_item_interface::beat_slash (SCM grob)
 {
   Grob *me = unsmob_grob (grob);
-  Molecule m = brew_slash (me);
+  Stencil m = brew_slash (me);
 
   return m.smobbed_copy ();
 }