release: 1.3.65

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

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 1c9a8ba15962356d32c56b5979a206656c058ed3..91ab2a0ab291a43a9a41da542c970af3e5a4f682 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -3,110 +3,128 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-
-#include "dimen.hh"
+#include "dimension-cache.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 "warn.hh"
+#include "axis-group-interface.hh"
+#include "group-interface.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 );
-}
+  Pointer_group_interface gi (this);
+  gi.add_element (b);
 
+  add_dependency (b);
+}
 
 
-void
-Span_bar::do_substitute_dependency(Score_elem*o, Score_elem*n)
+Interval
+Span_bar::width_callback (Score_element const *se, Axis )
 {
-    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);
+  Span_bar*  s= dynamic_cast<Span_bar*> ((Score_element*)se);
+  String gl = ly_scm2string (s->get_elt_property ("glyph"));
+
+  /*
+    urg.
+   */
+  Molecule m = s->compound_barline (gl, 40 PT);
+  
+  return m.extent (X_AXIS);
 }
 
-
-void
-Span_bar::set(Vertical_align_element *a)
+GLUE_SCORE_ELEMENT(Span_bar,before_line_breaking);
+SCM
+Span_bar::member_before_line_breaking ()
 {
-    add_dependency( a );
+  Bar::member_before_line_breaking ();
+  
+  evaluate_empty ();
+
+  return SCM_UNDEFINED;
 }
-    
 
-Interval
-Span_bar::do_width() const
+GLUE_SCORE_ELEMENT(Span_bar,after_line_breaking);
+SCM
+Span_bar::member_after_line_breaking ()
 {
-    return paper()->lookup_l()->bar(type_str_, 40 PT).dim.x(); // ugh
+  Interval i (get_spanned_interval ());
+
+  /*
+    Bar::brew_molecule delivers a barline of y-extent (-h/2,h/2), so
+    we have to translate ourselves to be in the center of the 
+    interval that we span.  */
+  translate_axis (i.center (), Y_AXIS);
+  return SCM_UNDEFINED;
 }
+
 void
-Span_bar::do_pre_processing()
-{
-    if ( spanning_l_arr_.size () < 1) {
-       transparent_b_ = true;
-       empty_b_ =true;
-    } else {
-       if (type_str_ == "")
-           type_str_ = spanning_l_arr_[0]->type_str_;
-       if (type_str_ =="") {
-           transparent_b_=true;
-           empty_b_ = true;
-       } else if ( type_str_ == "|:") {
-           type_str_ = ".|";
-       } else if ( type_str_ == ":|"){
-           type_str_ = "|.";
-       }
+Span_bar::evaluate_empty ()
+{ 
+  if (!gh_pair_p (get_elt_pointer ("elements")))
+    {
+      suicide ();
+    }
+  
+  SCM gl = get_elt_property ("glyph");
+  if (!gh_string_p (gl))
+    {
+      suicide ();
+      return ; 
     }
+  else {
+    String type_str = ly_scm2string (gl);
+    String orig = type_str;
+    if (type_str == "|:") 
+      {
+       type_str= ".|";
+      }
+    else if (type_str== ":|")
+      {
+       type_str= "|.";
+      }
+    else if (type_str== ":|:")
+      {
+       type_str= ".|.";
+      }
+    if (orig != type_str)
+      set_elt_property ("glyph", ly_str02scm (type_str.ch_C()));
+  }
 }
 
-Symbol
-Span_bar::get_bar_sym(Real dy) const
+Interval
+Span_bar::get_spanned_interval () const
 {
-    return paper()->lookup_l()->bar(type_str_, dy);
+  return Axis_group_interface::group_extent_callback (this, Y_AXIS);  
 }
 
 
-Molecule*
-Span_bar::brew_molecule_p()const
+Real
+Span_bar::get_bar_size () const
 {
-    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() );
+  Interval iv (get_spanned_interval ());
+  if (iv.empty_b ())
+    {
+      programming_error("Huh? My children deflated (FIXME)");
+      iv = Interval (0,0);
     }
-
-    Symbol s = get_bar_sym(y_int.length());
-    Molecule*output = new Molecule(Atom(s));
-    output->translate (  y_int[-1], Y_AXIS );
-    return output;
+  return iv.length ();
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Span_bar,Bar);
-
-Span_bar::Span_bar()
+Span_bar::Span_bar (SCM s)
+  : Bar (s)
 {
-    type_str_ = "";
+  Pointer_group_interface(this).set_interface ();
+  set_extent_callback (width_callback, X_AXIS);
+  
+  // dim_cache_[Y_AXIS]->set_extent_callback (Axis_group_interface::group_extent_callback);
+
+  set_extent_callback (0, Y_AXIS);
 }
+