X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fstem-tremolo.cc;h=2036d9a89072e2ef8019761674ebabd45b8d8c23;hb=544e782eb76bb74407ab3c8b3f2e05f522984bb1;hp=5a115835ef55cc8561dfda677b5ef0b7f2c060a0;hpb=def419dfd961fee6fd0bf49321ae130143b618af;p=lilypond.git

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index 5a115835ef..2036d9a890 100644
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -42,23 +42,22 @@ Stem_tremolo::calc_slope (SCM smob)
       Real dy = 0;
       SCM s = beam->get_property ("quantized-positions");
       if (is_number_pair (s))
-	dy = - scm_to_double (scm_car (s)) + scm_to_double (scm_cdr (s));
+        dy = - scm_to_double (scm_car (s)) + scm_to_double (scm_cdr (s));
 
       Grob *s2 = Beam::last_normal_stem (beam);
       Grob *s1 = Beam::first_normal_stem (beam);
-      
+
       Grob *common = s1->common_refpoint (s2, X_AXIS);
-      Real dx = s2->relative_coordinate (common, X_AXIS) -
-	s1->relative_coordinate (common, X_AXIS);
+      Real dx = s2->relative_coordinate (common, X_AXIS)
+                - s1->relative_coordinate (common, X_AXIS);
 
       return scm_from_double (dx ? dy / dx : 0);
     }
   else
     /* down stems with flags should have more sloped trems (helps avoid
        flag/stem collisions without making the stem very long) */
-    return scm_from_double (
-        (Stem::duration_log (stem) >= 3 && get_grob_direction (stem) == DOWN) ?
-          0.40 : 0.25);
+    return scm_from_double ((Stem::duration_log (stem) >= 3 && get_grob_direction (stem) == DOWN)
+                            ? 0.40 : 0.25);
 }
 
 MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_width, 1)
@@ -72,7 +71,7 @@ Stem_tremolo::calc_width (SCM smob)
   bool flag = Stem::duration_log (stem) >= 3 && !beam;
 
   /* beamed stems and up-stems with flags have shorter tremolos */
-  return scm_from_double (((stemdir == UP && flag) || beam)? 1.0 : 1.5);
+  return scm_from_double (((stemdir == UP && flag) || beam) ? 1.0 : 1.5);
 }
 
 MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_style, 1)
@@ -95,9 +94,9 @@ Stem_tremolo::get_beam_translation (Grob *me)
   Spanner *beam = Stem::get_beam (stem);
 
   return (beam && beam->is_live ())
-    ? Beam::get_beam_translation (beam)
-    : (Staff_symbol_referencer::staff_space (me)
-       * robust_scm2double (me->get_property ("length-fraction"), 1.0) * 0.81);
+         ? Beam::get_beam_translation (beam)
+         : (Staff_symbol_referencer::staff_space (me)
+            * robust_scm2double (me->get_property ("length-fraction"), 1.0) * 0.81);
 }
 
 Stencil
@@ -144,8 +143,6 @@ Stem_tremolo::raw_stencil (Grob *me, Real slope, Direction stemdir)
   return mol;
 }
 
-
-
 MAKE_SCHEME_CALLBACK (Stem_tremolo, pure_height, 3);
 SCM
 Stem_tremolo::pure_height (SCM smob, SCM, SCM)
@@ -179,7 +176,7 @@ Stem_tremolo::vertical_length (Grob *me)
 {
   return untranslated_stencil (me, 0.35).extent (Y_AXIS).length ();
 }
-  
+
 Stencil
 Stem_tremolo::untranslated_stencil (Grob *me, Real slope)
 {
@@ -202,7 +199,6 @@ Stem_tremolo::untranslated_stencil (Grob *me, Real slope)
   return raw_stencil (me, slope, stencil_dir);
 }
 
-  
 Stencil
 Stem_tremolo::translated_stencil (Grob *me, Real slope)
 {
@@ -211,7 +207,7 @@ Stem_tremolo::translated_stencil (Grob *me, Real slope)
   Grob *stem = unsmob_grob (me->get_object ("stem"));
   if (!stem)
     return Stencil ();
-  
+
   Direction stemdir = get_grob_direction (stem);
   if (stemdir == 0)
     stemdir = UP;
@@ -224,7 +220,7 @@ Stem_tremolo::translated_stencil (Grob *me, Real slope)
 
   Real end_y
     = Stem::stem_end_position (stem) * ss / 2
-    - stemdir * max (beam_count, 1) * beam_translation;
+      - stemdir * max (beam_count, 1) * beam_translation;
 
   if (!beam && Stem::duration_log (stem) >= 3)
     {
@@ -252,21 +248,21 @@ SCM
 Stem_tremolo::print (SCM grob)
 {
   Grob *me = unsmob_grob (grob);
-  
+
   Stencil s = translated_stencil (me, robust_scm2double (me->get_property ("slope"), 0.25));
   return s.smobbed_copy ();
 }
 
 ADD_INTERFACE (Stem_tremolo,
-	       "A beam slashing a stem to indicate a tremolo.  The property"
-	       " @code{style} can be @code{default} or @code{rectangle}.",
+               "A beam slashing a stem to indicate a tremolo.  The property"
+               " @code{style} can be @code{default} or @code{rectangle}.",
 
                /* properties */
-	       "beam-thickness "
-	       "beam-width "
-	       "flag-count "
-	       "length-fraction "
-	       "stem "
+               "beam-thickness "
+               "beam-width "
+               "flag-count "
+               "length-fraction "
+               "stem "
                "style "
-	       "slope "
-	       );
+               "slope "
+              );