release: 1.3.56

[lilypond.git] / lily / crescendo.cc

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index 972846498a9e6a1be2692d9a144addab1aa45a04..d119ca9a04cf818ae9e70b370e11c56517aafd5a 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "molecule.hh"
@@ -13,34 +13,53 @@
 #include "paper-def.hh"
 #include "debug.hh"
 #include "paper-column.hh"
-#include "atom.hh"
 
-Crescendo::Crescendo ()
+
+Crescendo::Crescendo (SCM s)
+  : Spanner (s)
 {
-  grow_dir_ =0;
-  dyn_b_drul_[LEFT] = dyn_b_drul_[RIGHT] =false;
+  set_elt_property ("dynamic-drul", gh_cons (SCM_BOOL_F, SCM_BOOL_F));
 }
 
 
 
-Molecule*
-Crescendo::do_brew_molecule_p () const
+
+MAKE_SCHEME_SCORE_ELEMENT_CALLBACKS(Crescendo)
+Molecule 
+Crescendo::do_brew_molecule () const
 {
   Real absdyn_dim = paper_l ()-> get_var ("crescendo_shorten");
   Real extra_left =  get_broken_left_end_align ();
 
-  if (dyn_b_drul_[LEFT])
+  SCM dir = get_elt_property("grow-direction");
+  SCM dyns = get_elt_property ("dynamic-drul");
+
+  if (!isdir_b (dir) || !gh_pair_p (dyns))
+    {
+      Crescendo * me = (Crescendo*)this;
+      me->suicide ();
+      Molecule m;
+      
+      return m;
+    }
+  
+  Direction gd = to_dir (dir);
+
+  bool dynleft= to_boolean (gh_car (dyns));
+  bool dynright = to_boolean (gh_cdr (dyns));
+  
+  if (dynleft)
     extra_left += absdyn_dim;
 
   
 
   Real width = spanner_length()- get_broken_left_end_align ();
 
-  if (dyn_b_drul_[LEFT])
+  if (dynleft)
     {
       width -= absdyn_dim;
     }
-  if (dyn_b_drul_[RIGHT])
+  if (dynright)
     {
       width -= absdyn_dim;
     }
@@ -53,31 +72,67 @@ Crescendo::do_brew_molecule_p () const
 
   Drul_array<bool> broken;
   Direction d = LEFT;
-  do {
-    Paper_column* s = dynamic_cast<Paper_column*>(spanned_drul_[d]); // UGH
-    broken[d] = (!s->musical_b ());
-  } while (flip (&d) != LEFT);
-  
-
-  bool continued = broken[Direction (-grow_dir_)];
-  Real height = paper_l()->get_var ("crescendo_height");
-  Real thick = paper_l ()->get_var ("crescendo_thickness");
-
-  const char* hairpin = (grow_dir_ < 0)? "decrescendo" :  "crescendo";
-  Atom at  (gh_list (ly_symbol2scm (hairpin),
-                    gh_double2scm (thick),
-                    gh_double2scm (width),
-                    gh_double2scm (height),
-                    gh_double2scm (continued ? height/2 : 0.0),
-                    SCM_UNDEFINED));
-  Molecule * m
-    = new Molecule;
+  do
+    {
+      Paper_column* s = dynamic_cast<Paper_column*>(get_bound (d)); // UGH
+      broken[d] = (!s->musical_b ());
+    }
+  while (flip (&d) != LEFT);
   
-  m->dim_.x () = Interval (0, width);
-  m->dim_.y () = Interval (-2*height, 2*height);
-  m->add_atom (&at);
+ 
+  Molecule m;
   
-  m->translate_axis (extra_left, X_AXIS);
+  Real pad = 0;
+  SCM s = get_elt_property ("start-text");
+  if (gh_string_p (s))
+    {
+      Molecule start_text (lookup_l ()->text ("italic",
+                                             ly_scm2string (s),
+                                             paper_l ()));
+      m.add_molecule (start_text);
+
+      pad = paper_l ()->get_var ("interline") / 2;
+
+      width -= start_text.extent (X_AXIS).length ();
+      width -= pad;
+      width = width >? 0;
+    }
+
+  SCM at;
+  s = get_elt_property ("spanner");
+  Real height;
+  if (gh_string_p (s) && ly_scm2string (s) == "dashed-line")
+    {
+      Real thick = paper_l ()->get_var ("crescendo_dash_thickness");
+      Real dash = paper_l ()->get_var ("crescendo_dash");
+      height = thick;
+      at = gh_list (ly_symbol2scm (ly_scm2string (s).ch_C ()),
+                   gh_double2scm (thick),
+                   gh_double2scm (dash),
+                   gh_double2scm (width),
+                   SCM_UNDEFINED);
+    }
+  else
+    {
+      bool continued = broken[Direction (-gd)];
+      height = paper_l()->get_var ("crescendo_height");
+      Real thick = paper_l ()->get_var ("crescendo_thickness");
+      
+      const char* hairpin = (gd < 0)? "decrescendo" :  "crescendo";
+
+      at = gh_list (ly_symbol2scm (hairpin),
+                   gh_double2scm (thick),
+                   gh_double2scm (width),
+                   gh_double2scm (height),
+                   gh_double2scm (continued ? height/2 : 0.0),
+                   SCM_UNDEFINED);
+    }
+  Box b (Interval (0, width), Interval (-2*height, 2*height));
+  Molecule span (b, at);
+
+  m.add_at_edge (X_AXIS, RIGHT, span, pad);
+  m.translate_axis (extra_left, X_AXIS);
+
   return m;
 }