release: 1.1.58

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 5d3993f232aa4de588d5d9a9baa4e46d9e71d55a..2d48eb6c4a3e5e1fa00c169ca67a8f8b19cc8a5e 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -6,15 +6,15 @@
   (c)  1997, 1998, 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
-
+#include "score-engraver.hh"
 #include "bar-engraver.hh"
-#include "bar.hh"
+#include "staff-bar.hh"
 #include "musical-request.hh"
 #include "multi-measure-rest.hh"
 #include "command-request.hh"
 #include "time-description.hh"
-#include "engraver-group.hh"
-#include "repeated-music.hh"
+#include "engraver-group-engraver.hh"
+#include "warn.hh"
 
 Bar_engraver::Bar_engraver()
 {
@@ -35,41 +35,48 @@ Bar_engraver::do_try_music (Music*r_l)
     }
   
   return false;
-
 }
 
-void
-Bar_engraver::acknowledge_element (Score_element_info i)
-{
-  if (Bar *b = dynamic_cast<Bar *> (i.elem_l_))
-    {
-      // only bar-engraver should create bars
-      assert (0);
-    }
-}
+
 
 void
 Bar_engraver::create_bar ()
 {
   if (!bar_p_)
     {
-      bar_p_ = new Bar;
-      bar_p_->break_priority_i_  = 0;
+      bar_p_ = new Staff_bar;
+      bar_p_->set_elt_property (break_priority_scm_sym, gh_int2scm (0));
+
       // urg: "" != empty...
       String default_type = get_property ("defaultBarType", 0);
       if (default_type.length_i ())
        {
          bar_p_->type_str_ = default_type;
        }
+
+      /*
+       urg.  Why did I implement this?
+       */
       Scalar prop = get_property ("barAtLineStart", 0);
       if (prop.to_bool ())
        {
-         bar_p_->at_line_start_b_ = true;
+         bar_p_->set_elt_property (at_line_start_scm_sym, SCM_BOOL_T);
+       }
+      prop = get_property ("barSize", 0);
+      if (prop.isnum_b ())
+       {
+         bar_p_->set_elt_property (bar_size_scm_sym, 
+                                   gh_double2scm (Real(prop)));
        }
       announce_element (Score_element_info (bar_p_, bar_req_l_));
     }
 }
 
+/**
+   Make a barline.  If there are both |: and :| requested, merge them
+   to :|:
+
+*/
 void
 Bar_engraver::request_bar (String type_str)
 {
@@ -81,10 +88,11 @@ Bar_engraver::request_bar (String type_str)
        return;
     }
   create_bar ();
+
   if (((type_str == "|:") && (bar_p_->type_str_ == ":|"))
     || ((type_str == ":|") && (bar_p_->type_str_ == "|:")))
     bar_p_->type_str_ = ":|:";
-  else
+  else if (type_str_.length_i ())
     bar_p_->type_str_ = type_str;
 }
 
@@ -93,8 +101,6 @@ Bar_engraver::do_creation_processing ()
 {
   create_bar ();
   bar_p_->type_str_ = "";
-  Scalar prop = get_property ("barAuto", 0);
-  auto_create_bar_b_ = prop.to_bool ();
 }
 
 void
@@ -123,21 +129,28 @@ Bar_engraver::do_process_requests()
     }
   else 
     {
-      Scalar always = get_property ("barAlways", 0);
-      if ((time && !time->whole_in_measure_) || always.to_bool ())
+      Scalar nonauto = get_property ("barNonAuto", 0);
+      if (!nonauto.to_bool ())
        {
-         if (auto_create_bar_b_)
+         Scalar always = get_property ("barAlways", 0);
+         if ((time && !time->whole_in_measure_) || always.to_bool ())
            create_bar ();
-         Scalar prop = get_property ("barAuto", 0);
-         auto_create_bar_b_ = prop.to_bool ();
        }
     }
   
   if (!bar_p_)
     {
-      Break_req r;
-      r.penalty_i_ = Break_req::DISALLOW;
-      daddy_grav_l ()->try_music (&r);
+      Score_engraver * e = 0;
+      Translator * t  =  daddy_grav_l ();
+      for (; !e && t;  t = t->daddy_trans_l_)
+       {
+         e = dynamic_cast<Score_engraver*> (t);
+       }
+      
+      if (!e)
+       programming_error ("No score engraver!");
+      else
+       e->forbid_breaks ();
     }
 }