release: 0.1.9

[lilypond.git] / lily / crescendo.cc

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index f520106c19f0e7cc571f7d635ed368740c470f5d..d5c16cb442e5e607fbdbe9d2b0ac81e99429b5ee 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -1,10 +1,12 @@
 /*
   crescendo.cc -- implement Crescendo
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
+
+#include "molecule.hh"
 #include "dimen.hh"
 #include "crescendo.hh"
 #include "lookup.hh"
@@ -12,49 +14,57 @@
 #include "debug.hh"
 
 Crescendo::Crescendo()
-    : Staff_side(this)
 {
-    grow_dir_i_ =0;
-    dir_i_ = -1 ;
-    left_dyn_b_ = right_dyn_b_ =false;
+  grow_dir_i_ =0;
+  dir_i_ = -1 ;
+  left_dyn_b_ = right_dyn_b_ =false;
+  inside_staff_b_ = false;
 }
 
-Spanner*
-Crescendo::do_break_at(PCol*, PCol*)const
+Interval
+Crescendo::symbol_height()const
 {
-    return new Crescendo(*this);
+  return get_symbol().dim[Y_AXIS];
 }
 
+static Real absdyn_dim = 10 PT;        // ugh
 
-Molecule*
-Crescendo::brew_molecule_p() const
-{
-    Molecule* m_p =0;
-    Real x_off_dim=0.0;
-    Real absdyn_dim = 10 PT;   // ugh
-    
-    m_p = new Molecule;
-    Real w_dim = width().length();
-    if ( left_dyn_b_ ) {
+Symbol
+Crescendo::get_symbol()const
+{    
+  Real w_dim = width().length ();
+  if ( left_dyn_b_) 
+    {
        w_dim -= absdyn_dim;
-       x_off_dim += absdyn_dim;
     }
-    if ( right_dyn_b_ ) {
+  if ( right_dyn_b_) 
+    {
        w_dim -= absdyn_dim;
     }
-    
-    if (w_dim < 0) {
-       error("Crescendo too small");
+  
+  if (w_dim < 0) 
+    {
+       warning ("Crescendo too small");
        w_dim = 0;
     }
-    Real lookup_wid = w_dim * 0.9; // make it slightly smaller.
-
-    Symbol s( paper()->lookup_l()->hairpin( lookup_wid, grow_dir_i_ < 0) );
-    m_p->add(Atom(s));
-    int pos = get_position_i(s.dim.y);
-    m_p->translate(Offset(x_off_dim + 0.05 * w_dim, 
-                         pos * paper()->internote()));
-    return m_p;
+
+  return Symbol (paper()->lookup_l ()->hairpin (w_dim, grow_dir_i_ < 0));
 }
 
-IMPLEMENT_STATIC_NAME(Crescendo);
+Molecule*
+Crescendo::brew_molecule_p() const
+{
+  Molecule* m_p =0;
+  Real x_off_dim=0.0;
+  if ( left_dyn_b_)
+       x_off_dim += absdyn_dim;
+  
+  m_p = new Molecule;
+  Symbol s (get_symbol());
+  m_p->add (Atom (s));
+  m_p->translate (Offset (x_off_dim, pos_i_ * paper()->internote_f ()));
+  return m_p;
+}
+
+
+IMPLEMENT_IS_TYPE_B1(Crescendo,Spanner);