release: 0.0.78

[lilypond.git] / lily / crescendo.cc

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index e8a36e29a8de635d276bb0dd3913853ae736abdc..df349421bb658035b7020c45132a70c39d96d113 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -1,56 +1,67 @@
 /*
   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"
 #include "paper-def.hh"
 #include "debug.hh"
-Crescendo::Crescendo(int s)
+
+Crescendo::Crescendo()
 {
-    staff_size_i_ = s;
     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;
 }
 
+static Real absdyn_dim = 10 PT;        // ugh
 
-Molecule*
-Crescendo::brew_molecule_p() const return m_p ;
-{
-    Real x_off_dim=0.0;
-    Real absdyn_dim = 10 PT;   // UGR
-    
-    m_p = new Molecule;
+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_ ) {
        w_dim -= absdyn_dim;
     }
     
     if (w_dim < 0) {
-       error("Crescendo too small");
+       warning("Crescendo too small");
        w_dim = 0;
     }
-    Symbol s( paper()->lookup_l()->hairpin(w_dim, grow_dir_i_ < 0) );
+
+    return Symbol( paper()->lookup_l()->hairpin( w_dim, grow_dir_i_ < 0) );
+}
+
+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));
-    int pos = (dir_i_ >0) ? staff_size_i_ + 4 : - 4 ;
-    if(dir_i_<0 )              // should do something better anyway.
-       m_p->translate(Offset(0, -m_p->extent().y.left ));
-    m_p->translate(Offset(x_off_dim,pos * paper()->internote()));
+    m_p->translate(Offset(x_off_dim, pos_i_ * paper()->internote_f()));
+    return m_p;
 }
 
-IMPLEMENT_STATIC_NAME(Crescendo);
+
+IMPLEMENT_IS_TYPE_B1(Crescendo,Spanner);