release: 1.2.0

[lilypond.git] / lily / crescendo.cc

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index 4ca1196b091090d27deeccf8d6d7cad9422bb0d3..2401502c9c9124a35d9ba6e8c9449b689fb2d741 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -3,54 +3,75 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "molecule.hh"
-#include "dimen.hh"
 #include "crescendo.hh"
 #include "lookup.hh"
+#include "dimensions.hh"
 #include "paper-def.hh"
 #include "debug.hh"
+#include "score-column.hh"
 
-Crescendo::Crescendo()
+Crescendo::Crescendo ()
 {
-    grow_dir_i_ =0;
-    dir_i_ = -1 ;
-    left_dyn_b_ = right_dyn_b_ =false;
+  grow_dir_ =0;
+  dyn_b_drul_[LEFT] = dyn_b_drul_[RIGHT] =false;
 }
 
 
 
-Molecule*
-Crescendo::brew_molecule_p() const
+
+Molecule
+Crescendo::get_symbol () 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_ ) {
-       w_dim -= absdyn_dim;
-       x_off_dim += absdyn_dim;
+  Real w_dim = extent (X_AXIS).length ();
+  Real absdyn_dim = paper_l ()-> get_realvar (ly_symbol ("crescendo_shorten"));
+  if (dyn_b_drul_[LEFT])
+    {
+      w_dim -= absdyn_dim;
     }
-    if ( right_dyn_b_ ) {
-       w_dim -= absdyn_dim;
+  if (dyn_b_drul_[RIGHT])
+    {
+      w_dim -= absdyn_dim;
     }
-    
-    if (w_dim < 0) {
-       warning("Crescendo too small");
-       w_dim = 0;
+
+  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_f()));
-    return m_p;
+
+  Drul_array<bool> broken;
+  Direction d = LEFT;
+  do {
+    Score_column* s = dynamic_cast<Score_column*>(spanned_drul_[d]); // UGH
+    broken[d] = (!s->musical_b ());
+  } while (flip (&d) != LEFT);
+  
+
+  bool continued = broken[Direction (-grow_dir_)];
+  Real height = paper_l()->staffheight_f () / 6;
+  Real thick = paper_l ()->get_var ("crescendo_thickness");
+
+  return Molecule (lookup_l ()->hairpin (w_dim, height, thick, grow_dir_ < 0, continued));
 }
 
-IMPLEMENT_STATIC_NAME(Crescendo);
+Molecule*
+Crescendo::do_brew_molecule_p () const
+{
+  Molecule* m_p =0;
+  Real absdyn_dim = paper_l ()-> get_realvar (ly_symbol ("crescendo_shorten"));
+  Real x_off_dim=0.0;
+  if (dyn_b_drul_[LEFT])
+    x_off_dim += absdyn_dim;
+
+  m_p = new Molecule;
+  Molecule s (get_symbol ());
+  m_p->add_molecule (s);
+  m_p->translate_axis (x_off_dim, X_AXIS);
+  return m_p;
+}
+
+