release: 1.1.33

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

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index e23b3226781ca2d4eb15b55cd4ce9bea8fb8d369..62c2c66fac81b964a309b5edd1bcc40d6c48a2d6 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -3,120 +3,138 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "dimen.hh"
 #include "span-bar.hh"
 #include "lookup.hh"
-#include "symbol.hh"
+#include "dimensions.hh"
 #include "paper-def.hh"
 #include "molecule.hh"
-#include "vertical-align-elem.hh"
+#include "align-element.hh"
+#include "warn.hh"
 
 void
-Span_bar::add (Bar*b)
+Span_bar::add_bar (Score_element*b)
 {
-  b->spanned_i_ ++;
   spanning_l_arr_.push (b);
   add_dependency (b);
 }
 
-
+void
+Span_bar::do_substitute_element_pointer (Score_element*o, Score_element*n)
+{
+  spanning_l_arr_.unordered_substitute (o, n);
+}
 
 void
-Span_bar::do_substitute_dependency (Score_elem*o, Score_elem*n)
+Span_bar::set_align (Align_element *a)
 {
-  Bar * bold = 0;
-  if  (o->is_type_b (Bar::static_name())) 
-    bold = (Bar*)o->item();
-  else
-    return;
+  add_dependency (a);
+}
 
-  bold->spanned_i_ --;
-  Bar * b =0;
-  if (n && n->is_type_b (Bar::static_name())) 
+Interval
+Span_bar::do_width () const
+{
+  if (no_width_b_)
     {
-      b = (Bar*)n->item();
-      b->spanned_i_ ++;
+      return Interval (0,0);
     }
   
-  spanning_l_arr_.substitute (bold , b);
+  Molecule m = lookup_l ()->bar (type_str_, 40 PT);
+  
+  return m.extent (X_AXIS);
 }
 
-
 void
-Span_bar::set (Vertical_align_element *a)
+Span_bar::do_pre_processing ()
 {
-  add_dependency (a);
-}
+  Bar::do_pre_processing ();
+  
+  evaluate_empty ();
+  translate_axis (extra_x_off_, X_AXIS);
   
+  dim_cache_[Y_AXIS].set_empty (false); // a hack to make mark scripts work.
+}
 
-Interval
-Span_bar::do_width() const
+void
+Span_bar::do_post_processing ()
 {
-  return paper()->lookup_l ()->bar (type_str_, 40 PT).dim.x (); // ugh
+  Bar::do_post_processing ();
 }
+
 void
-Span_bar::do_pre_processing()
-{
-  if (spanning_l_arr_.size() < 1) 
+Span_bar::evaluate_empty ()
+{ 
+  if (spanning_l_arr_.size () < 1) 
     {
       transparent_b_ = true;
       set_empty (true);   
     }
-  else 
+  if (type_str_.empty_b ()) 
     {
-      if (!type_str_)
-       type_str_ = spanning_l_arr_[0]->type_str_;
-      if (!type_str_) 
-       {
-         transparent_b_=true;
-         set_empty (true);
-       }
-      else if (type_str_ == "|:") 
-       {
-         type_str_ = ".|";
-       }
-      else if (type_str_ == ":|")
-       {
-         type_str_ = "|.";
-       }
+      transparent_b_=true;
+      set_empty (true);
+    }
+  else if (type_str_ == "|:") 
+    {
+      type_str_ = ".|";
+    }
+  else if (type_str_ == ":|")
+    {
+      type_str_ = "|.";
+    }
+  else if (type_str_ == ":|:")
+    {
+      type_str_ = ".|.";
     }
 }
 
-Symbol
-Span_bar::get_bar_sym (Real dy) const
-{
-  return paper()->lookup_l ()->bar (type_str_, dy);
-}
-
-
-Molecule*
-Span_bar::brew_molecule_p() const
+Interval
+Span_bar::get_spanned_interval () const
 {
   Interval y_int;
-  for (int i=0; i < spanning_l_arr_.size(); i++) 
+  for (int i=0; i < spanning_l_arr_.size (); i++) 
     {
-      Axis_group_element *common = 
+      Dimension_cache*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);
+      Real y = spanning_l_arr_[i]->dim_cache_[Y_AXIS].relative_coordinate (common)  
+       -dim_cache_[Y_AXIS].relative_coordinate (common);
 
-      y_int.unite (y + spanning_l_arr_[i]->height());
+      y_int.unite (y + spanning_l_arr_[i]->extent(Y_AXIS));
     }
+  return y_int;
+}
 
-  Symbol s = get_bar_sym (y_int.length());
-  Molecule*output = new Molecule (Atom (s));
-  output->translate (y_int[-1], Y_AXIS);
+Interval
+Span_bar::do_height () const
+{
+  return get_spanned_interval ();
+}
+
+Molecule*
+Span_bar::do_brew_molecule_p () const
+{
+  Interval iv (get_spanned_interval ());
+  Molecule*output = new Molecule;
+  if (!iv.empty_b())
+    {
+      output->add_molecule (lookup_l ()->bar (type_str_, iv.length ()));
+      output->translate_axis (iv.center (), Y_AXIS);
+    }
+  else
+    {
+      warning("Huh? My children deflated (FIXME)");
+    }
   return output;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Span_bar,Bar);
 
-Span_bar::Span_bar()
+Span_bar::Span_bar ()
 {
   type_str_ = "";
+  extra_x_off_ = 0.0;
+  no_width_b_ = false;
 }