release: 1.3.8

[lilypond.git] / lily / crescendo.cc

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index 0dee71825b0d00460808363c74b578cefb0a6974..b8ab2137faed4ffa55c605484fdc50912c055d9b 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -3,36 +3,28 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 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_ =0;
-  dir_ = DOWN;
   dyn_b_drul_[LEFT] = dyn_b_drul_[RIGHT] =false;
 }
 
-Interval
-Crescendo::symbol_height() const
+Molecule
+Crescendo::get_symbol () const
 {
-  return get_symbol().dim_[Y_AXIS];
-}
-
-static Real absdyn_dim = 10 PT;        // ugh
-
-Atom
-Crescendo::get_symbol() const
-{
-  Real w_dim = width().length ();
+  Real w_dim = extent (X_AXIS).length () - get_broken_left_end_align ();
+  Real absdyn_dim = paper_l ()-> get_var ("crescendo_shorten");
   if (dyn_b_drul_[LEFT])
     {
       w_dim -= absdyn_dim;
@@ -44,36 +36,40 @@ Crescendo::get_symbol() const
 
   if (w_dim < 0)
     {
-      warning (_("Crescendo too small"));
+      warning (_ ("crescendo") + " " + _ ("too small"));
       w_dim = 0;
     }
 
   Drul_array<bool> broken;
   Direction d = LEFT;
   do {
-    Score_column* s = (Score_column* )spanned_drul_[d] ; // UGH
-    broken[d] = (!s->musical_b());
-  } while (flip(&d) != LEFT);
+    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_];
-  return Atom (paper()->lookup_l ()->hairpin (w_dim, grow_dir_ < 0, continued));
+  bool continued = broken[Direction (-grow_dir_)];
+  Real height = paper_l()->get_var ("crescendo_height");
+  Real thick = paper_l ()->get_var ("crescendo_thickness");
+
+  return Molecule (lookup_l ()->hairpin (w_dim, height, thick, grow_dir_ < 0, continued));
 }
 
 Molecule*
-Crescendo::brew_molecule_p() const
+Crescendo::do_brew_molecule_p () const
 {
   Molecule* m_p =0;
-  Real x_off_dim=0.0;
+  Real absdyn_dim = paper_l ()-> get_var ("crescendo_shorten");
+  Real x_off_dim =  get_broken_left_end_align ();
+
   if (dyn_b_drul_[LEFT])
     x_off_dim += absdyn_dim;
 
   m_p = new Molecule;
-  Atom s (get_symbol());
-  m_p->add (Atom (s));
-  m_p->translate (Offset (x_off_dim, y_));
+  Molecule s (get_symbol ());
+  m_p->add_molecule (s);
+  m_p->translate_axis (x_off_dim, X_AXIS);
   return m_p;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Crescendo,Spanner);