release: 1.3.45

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

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 884f8c9dd2b6de53429540b814332d74d1860137..b9467fb08144dab54c17aed5d3d83d6b80051e2f 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -3,80 +3,122 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "atom.hh"
+
 #include "box.hh"
 #include "debug.hh"
 #include "lookup.hh"
 #include "molecule.hh"
 #include "note-column.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
+#include "bar.hh"
 #include "paper-def.hh"
 #include "volta-spanner.hh"
 #include "stem.hh"
-#include "text-def.hh"
-
-/*
-   Hmm, should probably make generic Bracket_spanner,
-   or and derive Plet and volta spanner from that.
- */
+#include "dimension-cache.hh"
+#include "group-interface.hh"
+#include "side-position-interface.hh"
+#include "directional-element-interface.hh"
 
 Volta_spanner::Volta_spanner ()
 {
-  dir_ = UP;
-  last_b_ = false;
-  tdef_p_.set_p (new Text_def);
-  tdef_p_->align_dir_ = CENTER;
-  tdef_p_->style_str_ = "nummer";
+  set_elt_property ("bars", SCM_EOL);
+  side_position (this).set_axis (Y_AXIS);
+  directional_element (this).set (UP);
 }
 
-Molecule*
-Volta_spanner::brew_molecule_p () const
+
+/*
+  this is too complicated. Yet another version of side-positioning,
+  badly implemented.  */
+Molecule 
+Volta_spanner::do_brew_molecule () const
 {
-  Molecule* mol_p = new Molecule;
-
-  if (column_arr_.size ()){
-    Real w = width ().length ();
-    Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_]
-      - column_arr_[0]->extent (Y_AXIS) [dir_];
-
-    Atom num (tdef_p_->get_atom (paper (), CENTER));
-    mol_p->add_atom (num);
-    mol_p->add_atom (lookup_l ()->volta (w, last_b_));
-  }
-  return mol_p;
+  Molecule  mol;
+
+  Link_array<Bar> bar_arr
+    = Group_interface__extract_elements (this, (Bar*)0, "bars");
+
+  if (!bar_arr.size ())
+    return mol;
+
+  bool no_vertical_start = false;
+  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 0
+  // FIXME
+  if (bar_arr.top ()->get_elt_property (type_str_.length_i () > 1)
+    no_vertical_end = false;
+#endif
+
+  Real staff_space = paper_l ()->get_var ("interline");
+  Real half_space = staff_space / 2;
+
+  Real w = spanner_length () - get_broken_left_end_align () - half_space;
+  Real h = paper_l()->get_var ("volta_spanner_height");
+  Real t = paper_l ()->get_var ("volta_thick");
+
+  SCM at = (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));
+  //Box b (Interval (0, w), Interval (- h/2, h/2));
+  Box b (Interval (0, w), Interval (0, h));
+  Molecule volta (b, at);
+  mol.add_molecule (volta);
+  
+  Molecule num (lookup_l ()->text ("volta",
+                                  ly_scm2string (get_elt_property("text")),
+                                  paper_l ()));
+
+  mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
+                  - staff_space);
+  return mol;
 }
   
 void
 Volta_spanner::do_add_processing ()
 {
-  if (column_arr_.size ())
+
+  Link_array<Bar> bar_arr
+    = Group_interface__extract_elements (this, (Bar*)0, "bars");
+
+  if (bar_arr.size ())
     {
-      set_bounds (LEFT, column_arr_[0]);
-      set_bounds (RIGHT, column_arr_.top ());  
+      set_bound (LEFT, bar_arr[0]);
+      set_bound (RIGHT, bar_arr.top ());  
     }
 }
-  
-void
-Volta_spanner::do_post_processing ()
-{
-    if (column_arr_.size())
-       translate_axis (column_arr_[0]->extent (Y_AXIS)[dir_], Y_AXIS);
-}
 
 void
-Volta_spanner::do_substitute_dependency (Score_element* o, Score_element* n)
+Volta_spanner::after_line_breaking ()
 {
-  if (Note_column *onc = dynamic_cast <Note_column *> (o))
-    column_arr_.substitute (onc, dynamic_cast<Note_column*> (n));
+  side_position (this).add_staff_support ();
 }
   
 void
-Volta_spanner::add_column (Note_column*n)
+Volta_spanner::add_bar  (Bar* b)
 {
-  column_arr_.push (n);
-  add_dependency (n);
+  Group_interface gi(this, "bars");
+  gi.add_element (b);
+
+  side_position (this).add_support (b);
+  add_dependency (b);
 }
 
+void
+Volta_spanner::add_column (Note_column* c)
+{
+  side_position (this).add_support (c);
+  add_dependency (c);
+}