X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-item.cc;h=6799abc9ca18f253f31be362cc455553f253df59;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=337df4505866894e67436d4a107e3ebd6136da20;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc
index 337df45058..6799abc9ca 100644
--- a/lily/percent-repeat-item.cc
+++ b/lily/percent-repeat-item.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2001--2011  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2001--2015  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,12 +18,14 @@
 */
 
 #include "percent-repeat-item.hh"
+
 #include "item.hh"
-#include "lookup.hh"
 #include "font-interface.hh"
+#include "lookup.hh"
+#include "stream-event.hh"
 
 Stencil
-Percent_repeat_item_interface::brew_slash (Grob *me)
+Percent_repeat_item_interface::brew_slash (Grob *me, int count)
 {
   Real slope = robust_scm2double (me->get_property ("slope"), 1);
   Real wid = 2.0 / slope;
@@ -32,7 +34,14 @@ Percent_repeat_item_interface::brew_slash (Grob *me)
     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);
+  Stencil slash = Lookup::repeat_slash (wid, slope, thick);
+  Stencil m = slash;
+
+  Real slash_neg_kern
+    = robust_scm2double (me->get_property ("slash-negative-kern"), 1.6);
+  for (int i = count - 1; i--;)
+    m.add_at_edge (X_AXIS, RIGHT, slash, -slash_neg_kern);
+
   m.translate_axis (-m.extent (Y_AXIS).center (), Y_AXIS);
   return m;
 }
@@ -40,16 +49,11 @@ Percent_repeat_item_interface::brew_slash (Grob *me)
 Stencil
 Percent_repeat_item_interface::x_percent (Grob *me, int count)
 {
-  Stencil m;
-  Stencil s = brew_slash (me);
+  Stencil m = brew_slash (me, count);
 
-  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);
+  Real dot_neg_kern
+    = robust_scm2double (me->get_property ("dot-negative-kern"), 0.75);
 
-  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);
@@ -58,7 +62,6 @@ Percent_repeat_item_interface::x_percent (Grob *me, int count)
   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;
 }
 
@@ -66,8 +69,9 @@ MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface, double_percent, 1);
 SCM
 Percent_repeat_item_interface::double_percent (SCM grob)
 {
-  Grob *me = unsmob_grob (grob);
+  Grob *me = unsmob<Grob> (grob);
   Stencil m = x_percent (me, 2);
+  m.translate_axis (-m.extent (X_AXIS).center (), X_AXIS);
   return m.smobbed_copy ();
 }
 
@@ -75,19 +79,25 @@ MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface, beat_slash, 1);
 SCM
 Percent_repeat_item_interface::beat_slash (SCM grob)
 {
-  Grob *me = unsmob_grob (grob);
-  Stencil m = brew_slash (me);
+  Grob *me = unsmob<Grob> (grob);
+  Stream_event *cause = unsmob<Stream_event> (me->get_property ("cause"));
+  int count = robust_scm2int (cause->get_property ("slash-count"), 1);
+
+  Stencil m;
+  if (count == 0)
+    m = x_percent (me, 2);
+  else
+    m = brew_slash (me, count);
 
   return m.smobbed_copy ();
 }
 
 ADD_INTERFACE (Percent_repeat_item_interface,
-	       "Repeats that look like percent signs.",
-	       
-	       /* properties */
-	       "dot-negative-kern "
-	       "slash-negative-kern "
-	       "slope "
-	       "thickness "
-	       );
-
+               "Repeats that look like percent signs.",
+
+               /* properties */
+               "dot-negative-kern "
+               "slash-negative-kern "
+               "slope "
+               "thickness "
+              );