tremolo fixes

[lilypond.git] / lily / staff-symbol.cc

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 50399d33b5eeb7bd272e1fa6d3c60d6423e824b2..c2e2bb0c7f8c6f88163f6a983431934bc19471e7 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -1,70 +1,121 @@
 /*
-  staffsym.cc -- implement Staff_symbol
+  staff-symbol.cc -- implement Staff_symbol
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "staff-symbol.hh"
+
 #include "lookup.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
 #include "molecule.hh"
 #include "debug.hh"
 #include "item.hh"
+#include "staff-symbol.hh"
+#include "staff-symbol-referencer.hh"
+#include "spanner.hh"
 
 
 
-Molecule 
-Staff_symbol::do_brew_molecule() const
+MAKE_SCHEME_CALLBACK (Staff_symbol,brew_molecule,1);
+
+SCM
+Staff_symbol::brew_molecule (SCM smob)
 {
-  Score_element * common
-    = get_bound (LEFT)->common_refpoint (get_bound (RIGHT), X_AXIS);
+  Grob *me = unsmob_grob (smob);
+  Spanner* sp = dynamic_cast<Spanner*> (me);
+  Grob * common
+    = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
+  
+  bool paper_raggedright = to_boolean (me->paper_l ()->get_scmvar ("raggedright"));
+  bool grob_raggedright = to_boolean (me->get_grob_property ("ragged-right"));
+  Real width;
+
+  SCM width_scm = me->get_grob_property ("width");
+  if (gh_number_p (width_scm)) // user-defined width
+    {
+      width = gh_scm2double (width_scm) *
+       Staff_symbol_referencer::staff_space (me);
+    }
+  else // determine width automatically
+    {
+      if (paper_raggedright && !grob_raggedright)
+       {
+         // *prevent* staff symbol from being ragged right; instead, use
+         // paper variable "linewidth"
+         width = me->paper_l ()->get_var ("linewidth");
+       }
+      else // determine width from my own bounds
+       {
+         width = sp->get_bound (RIGHT)->relative_coordinate (common , X_AXIS);
+       }
+    }
+
+  // respect indentation, if any
+  width -= sp->get_bound (LEFT)->relative_coordinate (common, X_AXIS);
+
+  if (width < 0)
+    {
+      warning (_f ("staff symbol: indentation yields beyond end of line"));
+      width = 0;
+    }
+
+  Real t = me->paper_l ()->get_var ("linethickness");
+  SCM my_thick = me->get_grob_property("thickness");
+  if (gh_number_p(my_thick))
+    t *= gh_scm2double (my_thick);
   
-  Real width =
-    // right_shift     - left_shift
-    + get_bound (RIGHT)->relative_coordinate (common , X_AXIS)
-    - get_bound (LEFT)->relative_coordinate (common, X_AXIS)
-    ;
-
-  Real t = paper_l ()->get_var ("stafflinethickness");
-  int l = line_count ();
+  int l = Staff_symbol::line_count (me);
   
-  Real height = (l-1) * staff_space () /2;
-  Molecule  m;
+  Real height = (l-1) * staff_space (me) /2;
+  Molecule m;
   for (int i=0; i < l; i++)
     {
       Molecule a =
-       lookup_l ()->filledbox (Box (Interval (0,width),
-                                    Interval (-t/2, t/2)));
+       Lookup::filledbox (Box (Interval (0,width),
+                                        Interval (-t/2, t/2)));
 
-      a.translate_axis (height - i * staff_space (), Y_AXIS);
+      a.translate_axis (height - i * staff_space (me), Y_AXIS);
       m.add_molecule (a);
     }
 
-  return m;
+  return m.smobbed_copy ();
 }
 
 int
-Staff_symbol::steps_i() const
+Staff_symbol::steps_i (Grob*me) 
 {
-  return line_count () * 2;
+  return line_count (me) * 2;
 }
 
 int
-Staff_symbol::line_count () const
+Staff_symbol::line_count (Grob*me) 
 {
-  return gh_scm2int (get_elt_property ("line-count"));
+  SCM c = me->get_grob_property ("line-count");
+  if (gh_number_p (c))
+    return gh_scm2int (c);
+  else
+    return 0;
 }
 
 Real
-Staff_symbol::staff_space ()const
+Staff_symbol::staff_space (Grob*me)
 {
-  return gh_scm2double (get_elt_property ("staff-space")) *
-    paper_l ()->get_var ("staffspace");
+  Real ss = 1.0;
+  
+  SCM s = me->get_grob_property ("staff-space");
+  if (gh_number_p (s))
+    ss *= gh_scm2double (s);
+  return ss;
 }
 
-Staff_symbol::Staff_symbol( SCM s)
-  : Spanner (s)
-{
-}
+
+
+
+ADD_INTERFACE (Staff_symbol,"staff-symbol-interface",
+  "This spanner draws the lines of a staff.  The center (i.e. middle line
+or space) is position 0.",
+              
+  "ragged-right staff-space thickness line-count");
+