release: 1.3.25

[lilypond.git] / lily / volta-spanner.cc

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index ac0973f9e5954f210780934254de57346042b2fd..6258b17008f142d414fc23ced7e59b64515953e4 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
@@ -19,15 +19,19 @@
 #include "stem.hh"
 #include "dimension-cache.hh"
 #include "group-interface.hh"
+#include "atom.hh"
+
 
 Volta_spanner::Volta_spanner ()
 {
-  last_b_ = false;
   dim_cache_ [Y_AXIS]->set_callback (dim_callback);
   set_elt_property ("bars", SCM_EOL);
   set_elt_property ("note-columns", SCM_EOL);
 }
 
+/*
+  FIXME: too complicated.
+ */
 Molecule*
 Volta_spanner::do_brew_molecule_p () const
 {
@@ -39,35 +43,57 @@ Volta_spanner::do_brew_molecule_p () const
   if (!bar_arr.size ())
     return mol_p;
 
-  Link_array<Bar> note_column_arr
-    = Group_interface__extract_elements (this, (Bar*)0, "note-columns");
-
+  Link_array<Score_element> note_column_arr
+    = Group_interface__extract_elements (this, (Score_element*)0, "note-columns");
   
   bool no_vertical_start = false;
-  bool no_vertical_end = last_b_;
+  bool no_vertical_end = to_boolean (get_elt_property ("last-volta"));
   Spanner *orig_span =  dynamic_cast<Spanner*> (original_l_);
   if (orig_span && (orig_span->broken_into_l_arr_[0] != (Spanner*)this))
     no_vertical_start = true;
   if (orig_span && (orig_span->broken_into_l_arr_.top () != (Spanner*)this))
     no_vertical_end = true;
-  if (bar_arr.top ()->type_str_.length_i () > 1)
+
+#if 0
+  // FIXME
+  if (bar_arr.top ()->get_elt_property (type_str_.length_i () > 1)
     no_vertical_end = false;
+#endif
 
-  Real interline_f = paper_l ()->get_var ("interline");
-  Real internote_f = interline_f/2;
+  Real staff_space = paper_l ()->get_var ("interline");
+  Real half_staff_space = staff_space/2;
   Real t = paper_l ()->get_var ("volta_thick");
 
-  Real dx = internote_f;
+  Real dx = half_staff_space;
   Real w = spanner_length() - dx - get_broken_left_end_align ();
   Real h = paper_l()->get_var ("volta_spanner_height");
-  Molecule volta (lookup_l ()->volta (h, w, t, no_vertical_start, no_vertical_end));
 
+  Molecule volta; 
+
+  Atom *at = new Atom(gh_list (ly_symbol2scm ("volta"),
+                    gh_double2scm (h),
+                    gh_double2scm (w),
+                    gh_double2scm (t),
+                    gh_int2scm (no_vertical_start),
+                    gh_int2scm (no_vertical_end),
+                    SCM_UNDEFINED));
+
+  volta.dim_[Y_AXIS] = Interval (- h/2, h/2);
+  volta.dim_[X_AXIS] = Interval (0, w);
+  volta.add_atom (at->self_scm_);
   
-  Molecule num (lookup_l ()->text ("volta", number_str_, paper_l ()));
-  Real dy = bar_arr.top ()->extent (Y_AXIS) [UP] > 
+  Molecule num (lookup_l ()->text ("volta",
+                                  ly_scm2string (get_elt_property("text")),
+                                  paper_l ()));
+  Real dy = bar_arr.top ()->extent (Y_AXIS) [UP] >? 
      bar_arr[0]->extent (Y_AXIS) [UP];
   dy += 2 * h;
 
+
+  /*
+    CODE DUPLICATION.
+    FIXME (see axis-group-elt, side-pos interface.)
+   */
   for (int i = 0; i < note_column_arr.size (); i++)
     dy = dy >? note_column_arr[i]->extent (Y_AXIS)[BIGGER];
   dy -= h;
@@ -75,7 +101,7 @@ Volta_spanner::do_brew_molecule_p () const
   Molecule two (lookup_l ()->text ("number", "2", paper_l ()));
   Real gap = two.dim_.x ().length () / 2;
   Offset off (num.dim_.x ().length () + gap, 
-             h / internote_f - gap);
+             h / half_staff_space - gap);
   num.translate (off);
   mol_p->add_molecule (volta);
   mol_p->add_molecule (num);
@@ -117,7 +143,6 @@ Volta_spanner::dim_callback (Dimension_cache const *c)
 void
 Volta_spanner::do_post_processing ()
 {
-
   Link_array<Bar> bar_arr
     = Group_interface__extract_elements (this, (Bar*)0, "bars");
   
@@ -125,8 +150,6 @@ Volta_spanner::do_post_processing ()
     translate_axis (bar_arr[0]->extent (Y_AXIS)[UP], Y_AXIS);
   translate_axis (get_broken_left_end_align (), X_AXIS);
 }
-
-
   
 void
 Volta_spanner::add_bar  (Bar* c)