release: 1.1.51

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 91c23feb2caa12d78ea21fefd783bac7c99b923b..04eca124294c70aba9497db0b6e3ce39a698fb5f 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -1,19 +1,19 @@
 /*
-  bar-reg.cc -- implement Bar_engraver
+  bar-engraver.cc -- implement Bar_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997, 1998, 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #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"
 
 Bar_engraver::Bar_engraver()
 {
@@ -30,7 +30,6 @@ Bar_engraver::do_try_music (Music*r_l)
        return false;
       
       bar_req_l_ = b;
-
       return true;
     }
   
@@ -38,22 +37,52 @@ Bar_engraver::do_try_music (Music*r_l)
 
 }
 
+
+
 void
 Bar_engraver::create_bar ()
 {
   if (!bar_p_)
     {
-      bar_p_ = new Bar;
-      bar_p_->break_priority_i_  = 0;
-      String default_type = get_property ("defaultBarType");
+      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_->set_elt_property (at_line_start_scm_sym, SCM_BOOL_T);
+       }
       announce_element (Score_element_info (bar_p_, bar_req_l_));
     }
 }
 
+void
+Bar_engraver::request_bar (String type_str)
+{
+  Scalar prop = get_property ("barAtLineStart", 0);
+  if (!now_mom ())
+    {
+      Scalar prop = get_property ("barAtLineStart", 0);
+      if (!prop.to_bool ())
+       return;
+    }
+  create_bar ();
+  if (((type_str == "|:") && (bar_p_->type_str_ == ":|"))
+    || ((type_str == ":|") && (bar_p_->type_str_ == "|:")))
+    bar_p_->type_str_ = ":|:";
+  else
+    bar_p_->type_str_ = type_str;
+}
 
 void 
 Bar_engraver::do_creation_processing ()
@@ -75,22 +104,27 @@ Bar_engraver::do_removal_processing ()
 void
 Bar_engraver::do_process_requests()
 {  
+  Time_description const *time = get_staff_info().time_C_;
   if (bar_req_l_) 
     {
-      if (!bar_p_)
-       create_bar ();    
-
+      create_bar ();    
       bar_p_->type_str_ = bar_req_l_->type_str_;
     }
+  else if (!now_mom ())
+    {
+      create_bar ();
+      bar_p_->type_str_ = "|";
+    }
   else 
     {
-      Time_description const *time = get_staff_info().time_C_;
-      String always = get_property ("barAlways");
-      if ((time && !time->whole_in_measure_) || always.length_i ()) 
-       create_bar ();
+      Scalar nonauto = get_property ("barNonAuto", 0);
+      if (!nonauto.to_bool ())
+       {
+         Scalar always = get_property ("barAlways", 0);
+         if ((time && !time->whole_in_measure_) || always.to_bool ())
+           create_bar ();
+       }
     }
-
-  
   
   if (!bar_p_)
     {