Run `make grand-replace'.

[lilypond.git] / lily / percent-repeat-item.cc

diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc
index 51b3f81a16fe95629af9ebfc4a045d6431361e88..af527a87946a07a81fe17b342748425c8cb96b28 100644 (file)
--- a/lily/percent-repeat-item.cc
+++ b/lily/percent-repeat-item.cc
@@ -1,57 +1,53 @@
-/*   
+/*
   percent-repeat-item.cc -- implement Percent_repeat_item_interface
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "percent-repeat-item.hh"
+  source file of the GNU LilyPond music typesetter
 
-#include <math.h>
+  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
+#include "percent-repeat-item.hh"
+#include "item.hh"
 #include "lookup.hh"
 #include "font-interface.hh"
 
 Stencil
-Percent_repeat_item_interface::brew_slash ( Grob *me)
+Percent_repeat_item_interface::brew_slash (Grob *me)
 {
   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_property ("thickness"), 1);
   Stencil m = Lookup::repeat_slash (wid, slope, thick);
   m.translate_axis (-m.extent (Y_AXIS).center (), Y_AXIS);
   return m;
 }
 
-/*
-  todo: use grob props for dot_neg_kern, slash_neg_kern?
- */
 Stencil
-Percent_repeat_item_interface::x_percent (Grob *me, int count,
-                                         Real dot_neg_kern,
-                                         Real slash_neg_kern)
+Percent_repeat_item_interface::x_percent (Grob *me, int count)
 {
-  Stencil m ;
+  Stencil m;
   Stencil s = brew_slash (me);
 
-  for (int i  = count; i--;)
-    {
-      m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern, 0);
-    }
+  Real dot_neg_kern =
+    robust_scm2double (me->get_property ("dot-negative-kern"), 0.75);
+  Real slash_neg_kern =
+    robust_scm2double (me->get_property ("slash-negative-kern"), 1.6);
+
+  for (int i = count; i--;)
+    m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern);
   Stencil d1 = Font_interface::get_default_font (me)->find_by_name ("dots.dot");
-  Stencil d2  =  d1;
-  d1.translate_axis (0.5, Y_AXIS );
+  Stencil d2 = d1;
+  d1.translate_axis (0.5, Y_AXIS);
   d2.translate_axis (-0.5, Y_AXIS);
-  
-  m.add_at_edge (X_AXIS, LEFT, d1, -dot_neg_kern, 0);
-  m.add_at_edge (X_AXIS, RIGHT, d2, -dot_neg_kern, 0);
 
+  m.add_at_edge (X_AXIS, LEFT, d1, -dot_neg_kern);
+  m.add_at_edge (X_AXIS, RIGHT, d2, -dot_neg_kern);
+
+  m.translate_axis (- m.extent (X_AXIS).center (), X_AXIS);
   return m;
 }
 
@@ -60,8 +56,7 @@ SCM
 Percent_repeat_item_interface::double_percent (SCM grob)
 {
   Grob *me = unsmob_grob (grob);
-  Stencil m = x_percent (me, 2, 0.75, 1.6);
-  m.translate_axis (- m.extent (X_AXIS).center (), X_AXIS);
+  Stencil m = x_percent (me, 2);
   return m.smobbed_copy ();
 }
 
@@ -75,9 +70,13 @@ Percent_repeat_item_interface::beat_slash (SCM grob)
   return m.smobbed_copy ();
 }
 
-ADD_INTERFACE (Percent_repeat_item_interface, "percent-repeat-interface",
-  "Repeats that look like percent signs",
-  "slope thickness");
-
-
+ADD_INTERFACE (Percent_repeat_item_interface,
+              "Repeats that look like percent signs.",
+              
+              /* properties */
+              "dot-negative-kern "
+              "slash-negative-kern "
+              "slope "
+              "thickness "
+              );