Corrected typo by Jan

[lilypond.git] / lily / stem-tremolo.cc

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index b4bb45f6949997be0e57a69c05b50c3f8ed4c7ba..b1daa6284bc8cc1e14dc61eb4ed10f1018c48bc9 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -1,11 +1,13 @@
-/*   
-  stem-tremolo.cc --  implement Stem_tremolo
-  
+/*
+  stem-tremolo.cc -- implement Stem_tremolo
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#include "stem-tremolo.hh"
+
 #include "spanner.hh"
 #include "beam.hh"
 #include "directional-element-interface.hh"
@@ -13,7 +15,6 @@
 #include "lookup.hh"
 #include "output-def.hh"
 #include "staff-symbol-referencer.hh"
-#include "stem-tremolo.hh"
 #include "stem.hh"
 #include "warn.hh"
 
@@ -26,7 +27,7 @@ SCM
 Stem_tremolo::dim_callback (SCM e, SCM)
 {
   Grob *se = unsmob_grob (e);
-  
+
   Real space = Staff_symbol_referencer::staff_space (se);
   return ly_interval2scm (Interval (-space, space));
 }
@@ -52,34 +53,34 @@ Stencil
 Stem_tremolo::raw_stencil (Grob *me)
 {
   Grob *stem = unsmob_grob (me->get_property ("stem"));
-  Spanner*beam = Stem::get_beam (stem);
+  Spanner *beam = Stem::get_beam (stem);
   Real dydx;
   if (beam)
     {
       Real dy = 0;
       SCM s = beam->get_property ("positions");
       if (is_number_pair (s))
-       dy = -scm_to_double (ly_car (s)) +scm_to_double (ly_cdr (s));
-      
+       dy = -scm_to_double (scm_car (s)) +scm_to_double (scm_cdr (s));
+
       Real dx = Beam::last_visible_stem (beam)->relative_coordinate (0, X_AXIS)
        - Beam::first_visible_stem (beam)->relative_coordinate (0, X_AXIS);
-      dydx = dx ? dy/dx : 0;
+      dydx = dx ? dy / dx : 0;
     }
   else
     // urg
     dydx = 0.25;
 
   Real ss = Staff_symbol_referencer::staff_space (me);
-  Real thick = robust_scm2double (me->get_property ("beam-thickness"),1);
-  Real width = robust_scm2double (me->get_property ("beam-width"),1);
-  Real blot = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real thick = robust_scm2double (me->get_property ("beam-thickness"), 1);
+  Real width = robust_scm2double (me->get_property ("beam-width"), 1);
+  Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   width *= ss;
   thick *= ss;
-  
+
   Stencil a (Lookup::beam (dydx, width, thick, blot));
   a.translate (Offset (-width * 0.5, width * 0.5 * dydx));
-  
+
   int tremolo_flags = 0;
   SCM s = me->get_property ("flag-count");
   if (scm_is_number (s))
@@ -87,7 +88,7 @@ Stem_tremolo::raw_stencil (Grob *me)
 
   if (!tremolo_flags)
     {
-      programming_error ("No tremolo flags?");
+      programming_error ("no tremolo flags");
 
       me->suicide ();
       return Stencil ();
@@ -96,7 +97,7 @@ Stem_tremolo::raw_stencil (Grob *me)
   /* Who the fuck is 0.81 ? --hwn.   */
   Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81;
 
-  Stencil mol; 
+  Stencil mol;
   for (int i = 0; i < tremolo_flags; i++)
     {
       Stencil b (a);
@@ -106,18 +107,18 @@ Stem_tremolo::raw_stencil (Grob *me)
   return mol;
 }
 
-MAKE_SCHEME_CALLBACK (Stem_tremolo,print,1);
+MAKE_SCHEME_CALLBACK (Stem_tremolo, print, 1);
 SCM
-Stem_tremolo::print (SCM grob) 
+Stem_tremolo::print (SCM grob)
 {
   Grob *me = unsmob_grob (grob);
   Grob *stem = unsmob_grob (me->get_property ("stem"));
   if (!stem)
     {
-      programming_error ("No stem for stem-tremolo");
+      programming_error ("no stem for stem-tremolo");
       return SCM_EOL;
     }
-  
+
   Spanner *beam = Stem::get_beam (stem);
   Direction stemdir = Stem::get_direction (stem);
   if (stemdir == 0)
@@ -136,14 +137,14 @@ Stem_tremolo::print (SCM grob)
   int beam_count = beam ? (Stem::beam_multiplicity (stem).length () + 1) : 0;
 
   Real beamthickness = 0.0;
-  SCM sbt = (beam) ? beam->get_property ("thickness") : SCM_EOL ;
+  SCM sbt = (beam) ? beam->get_property ("thickness") : SCM_EOL;
   if (scm_is_number (sbt))
     beamthickness = scm_to_double (sbt) * ss;
 
   Real end_y
     = Stem::stem_end_position (stem) * ss / 2
     - stemdir * (beam_count * beamthickness
-                + ((beam_count -1) >? 0) * beam_translation);
+                + (max (beam_count -1, 0) * beam_translation));
 
   /* FIXME: the 0.33 ss is to compensate for the size of the note head.  */
   Real chord_start_y = Stem::chord_start_y (stem) + 0.33 * ss * stemdir;
@@ -169,8 +170,6 @@ Stem_tremolo::print (SCM grob)
   return mol.smobbed_copy ();
 }
 
-
-
-ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface",
-  "A beam slashing a stem to indicate a tremolo.",
-  "stem beam-width beam-thickness flag-count");
+ADD_INTERFACE (Stem_tremolo, "stem-tremolo-interface",
+              "A beam slashing a stem to indicate a tremolo.",
+              "stem beam-width beam-thickness flag-count");