Merge with master

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

diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc
index a80015d396456354f68e0c6d3cebdc8eddcc488f..451647fb5cc03739fc9a98ee58dc1f12e7621eb1 100644 (file)
--- a/lily/percent-repeat-item.cc
+++ b/lily/percent-repeat-item.cc
@@ -3,12 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "percent-repeat-item.hh"
-
-
+#include "item.hh"
 #include "lookup.hh"
 #include "font-interface.hh"
 
@@ -39,14 +38,14 @@ Percent_repeat_item_interface::x_percent (Grob *me, int count,
   Stencil s = brew_slash (me);
 
   for (int i = count; i--;)
-    m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern, 0);
+    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);
   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);
 
   return m;
 }
@@ -71,7 +70,7 @@ Percent_repeat_item_interface::beat_slash (SCM grob)
   return m.smobbed_copy ();
 }
 
-ADD_INTERFACE (Percent_repeat_item_interface, "percent-repeat-item-interface",
+ADD_INTERFACE (Percent_repeat_item_interface,
               "Repeats that look like percent signs",
               
               "slope "