release: 0.1.59

[lilypond.git] / lily / span-bar.cc

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index eed9237f653b8bd93af9191c0f7a7e41b649588f..a371dc019d312527a0ccf65250ea5acfeedeeb57 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -6,78 +6,100 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
-
+#include "dimen.hh"
 #include "span-bar.hh"
 #include "lookup.hh"
-#include "symbol.hh"
+#include "atom.hh"
 #include "paper-def.hh"
 #include "molecule.hh"
 #include "vertical-align-elem.hh"
 
 void
-Span_bar::add(Bar*b)
+Span_bar::add (Bar*b)
 {
-    b->spanned_i_ ++;
-    spanning_l_arr_.push(b);
-    add_dependency( b );
+  spanning_l_arr_.push (b);
+  add_dependency (b);
 }
 
 
 
 void
-Span_bar::do_substitute_dependency(Score_elem*o, Score_elem*n)
+Span_bar::do_substitute_dependency (Score_elem*o, Score_elem*n)
 {
-    Bar * bold = 0;
-    if  (o->is_type_b(Bar::static_name() )) 
-       bold = (Bar*)o->item();
-    else
-       return;
-
-    bold->spanned_i_ --;
-    Bar * b =0;
-    if (n && n->is_type_b(Bar::static_name() )) {
-       b = (Bar*)n->item();
-       b->spanned_i_ ++;
-    }
-    
-    spanning_l_arr_.substitute( bold , b);
-
+  spanning_l_arr_.unordered_substitute (o, n);
 }
 
+
 void
-Span_bar::set(Vertical_align_element *a)
+Span_bar::set (Vertical_align_element *a)
 {
-    add_dependency( a );
+  add_dependency (a);
+}
+  
+
+Interval
+Span_bar::do_width() const
+{
+  return paper()->lookup_l ()->bar (type_str_, 40 PT).dim_.x (); // ugh
 }
-    
 
 void
 Span_bar::do_pre_processing()
 {
-    if ( spanning_l_arr_.size () < 1) {
-       transparent_b_ = true;
-       empty_b_ =true;
-    } else {
-       type_str_ = spanning_l_arr_[0]->type_str_;
-       if (type_str_ =="") {
-           transparent_b_=true;
-           empty_b_ = true;
-       }
+  Bar::do_pre_processing ();
+  
+  if (spanning_l_arr_.size() < 1) 
+    {
+      transparent_b_ = true;
+      set_empty (true);   
+    }
+  if (type_str_.empty_b ()) 
+    {
+      transparent_b_=true;
+      set_empty (true);
+    }
+  else if (type_str_ == "|:") 
+    {
+      type_str_ = ".|";
+    }
+  else if (type_str_ == ":|")
+    {
+      type_str_ = "|.";
     }
 }
 
+Atom
+Span_bar::get_bar_sym (Real dy) const
+{
+  return paper()->lookup_l ()->bar (type_str_, dy);
+}
+
+
 Molecule*
-Span_bar::brew_molecule_p()const
+Span_bar::brew_molecule_p() const
 {
-    Interval y;
-    for (int i=0; i < spanning_l_arr_.size(); i++)
-       y.unite( spanning_l_arr_[i]->height() );
-    Symbol s = paper()->lookup_l()->bar(type_str_, y.length());
-        Molecule*output = new Molecule(Atom(s));
-    output->translate_y (  y[-1] );
-
-    return output;
+  Interval y_int;
+  for (int i=0; i < spanning_l_arr_.size(); i++) 
+    {
+      Axis_group_element *common = 
+       common_group (spanning_l_arr_[i], Y_AXIS);
+       
+      Real y = spanning_l_arr_[i]->relative_coordinate (common, Y_AXIS)  
+       -relative_coordinate (common,Y_AXIS);
+
+      y_int.unite (y + spanning_l_arr_[i]->height());
+    }
+
+  Atom s = get_bar_sym (y_int.length());
+  Molecule*output = new Molecule (Atom (s));
+  output->translate_axis (y_int.center(), Y_AXIS);
+  return output;
 }
 
-IMPLEMENT_STATIC_NAME(Span_bar);
+
 IMPLEMENT_IS_TYPE_B1(Span_bar,Bar);
+
+Span_bar::Span_bar()
+{
+  type_str_ = "";
+}