release: 1.3.100

[lilypond.git] / lily / crescendo.cc

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index 36bdcbdbec6a308431b2dd4cb560907aee1f99d1..be54a96e62e0057a377b78697d250dc77144ec3b 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -8,63 +8,41 @@
 
 #include "molecule.hh"
 #include "crescendo.hh"
-#include "lookup.hh"
+#include "spanner.hh"
+#include "font-interface.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
 #include "debug.hh"
 #include "paper-column.hh"
 
+MAKE_SCHEME_CALLBACK (Crescendo, brew_molecule, 1);
 
-Crescendo::Crescendo ()
+SCM
+Crescendo::brew_molecule (SCM smob) 
 {
-  set_elt_property ("dynamic-drul", gh_cons (SCM_BOOL_F, SCM_BOOL_F));
-}
-
-
-
-
-Molecule 
-Crescendo::do_brew_molecule () const
-{
-  Real absdyn_dim = paper_l ()-> get_var ("crescendo_shorten");
-  Real extra_left =  get_broken_left_end_align ();
-
-  SCM dir = get_elt_property("grow-direction");
-  SCM dyns = get_elt_property ("dynamic-drul");
+  Score_element *me= unsmob_element (smob);
+  Spanner *span = dynamic_cast<Spanner*>(me);
+  Real staff_space = me->paper_l ()->get_var ("staffspace");
+  Real line = me->paper_l ()->get_var ("stafflinethickness");  
+  
+  Real broken_left =  span->get_broken_left_end_align ();
 
-  if (!isdir_b (dir) || !gh_pair_p (dyns))
+  SCM s = me->get_elt_property("grow-direction");
+  if (!isdir_b (s))
     {
-      Crescendo * me = (Crescendo*)this;
-      me->set_elt_property ("transparent", SCM_BOOL_T);
-      Molecule m;
-      
-      return m;
+      me->suicide ();
+      return SCM_EOL;
     }
   
-  Direction gd = to_dir (dir);
+  Direction grow_dir = to_dir (s);
 
-  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 (dynleft)
-    {
-      width -= absdyn_dim;
-    }
-  if (dynright)
-    {
-      width -= absdyn_dim;
-    }
+  Real width = span->spanner_length ();
+  width -= span->get_broken_left_end_align ();
 
   if (width < 0)
     {
-      warning (_ ("crescendo") + " " + _ ("too small"));
+      warning (_ ((grow_dir < 0) ? "decrescendo too small"
+                 : "crescendo too small"));
       width = 0;
     }
 
@@ -72,66 +50,28 @@ Crescendo::do_brew_molecule () const
   Direction d = LEFT;
   do
     {
-      Paper_column* s = dynamic_cast<Paper_column*>(spanned_drul_[d]); // UGH
+      Paper_column* s = dynamic_cast<Paper_column*> (span->get_bound (d)); // UGH
       broken[d] = (!s->musical_b ());
     }
   while (flip (&d) != LEFT);
   
- 
-  Molecule m;
+  bool continued = broken[Direction (-grow_dir)];
+  Real height = staff_space * gh_scm2double (me->get_elt_property ("height"));
+  Real thick = line * gh_scm2double (me->get_elt_property ("thickness"));
   
-  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),
+  const char* type = (grow_dir < 0) ? "decrescendo" :  "crescendo";
+  SCM hairpin = gh_list (ly_symbol2scm (type),
                    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);
+  Box b (Interval (0, width), Interval (-2*height, 2*height));
+  Molecule mol (b, hairpin);
+  mol.translate_axis (broken_left, X_AXIS);
 
-  return m;
+  return mol.create_scheme ();
 }