X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-engraver.cc;h=dad72a4fe4f7648f1125d65df46ea1e2d4569b36;hb=28240aceaab110b424d8e37cb8024ad5f815d57f;hp=e38ad23499bbc842f100535a1ad7105752756e7a;hpb=d6048913c2c793a6298a3e16a1a25c76711463b1;p=lilypond.git

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index e38ad23499..dad72a4fe4 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,156 +3,101 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997, 1998, 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "bar-engraver.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 "bar-line.hh"
+#include "score-engraver.hh"
+#include "warn.hh"
+#include "item.hh"
 
-Bar_engraver::Bar_engraver()
+/*
+  generate bars. Either user ("|:"), or default (new measure)
+*/
+class Bar_engraver : public Engraver
 {
-  bar_p_ =0;
-  do_post_move_processing();
-}
+public:
+  TRANSLATOR_DECLARATIONS (Bar_engraver);
+  void request_bar (String type_string);
 
-bool
-Bar_engraver::do_try_music (Music*r_l)
-{
-  if (Bar_req  * b= dynamic_cast <Bar_req *> (r_l))
-    {
-      if (bar_req_l_ && bar_req_l_->equal_b (b)) // huh?
-	return false;
-      
-      bar_req_l_ = b;
-      return true;
-    }
-  
-  return false;
+protected:
+  virtual void finalize ();
+  virtual void stop_translation_timestep ();
+  virtual void process_acknowledged_grobs ();
 
-}
+private:
+  void typeset_bar ();
+  void create_bar ();
 
+  Item *bar_;
+};
 
+Bar_engraver::Bar_engraver ()
+{
+  bar_ = 0;
+}
 
 void
 Bar_engraver::create_bar ()
 {
-  if (!bar_p_)
+  if (!bar_)
     {
-      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_));
+      bar_ = make_item ("BarLine", SCM_EOL);
+      SCM gl = get_property ("whichBar");
+      if (scm_equal_p (gl, bar_->get_property ("glyph")) != SCM_BOOL_T)
+	bar_->set_property ("glyph", gl);
     }
 }
 
 void
-Bar_engraver::request_bar (String type_str)
+Bar_engraver::finalize ()
 {
-  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;
+  typeset_bar ();
 }
 
-void 
-Bar_engraver::do_creation_processing ()
-{
-  create_bar ();
-  bar_p_->type_str_ = "";
-}
+/*
+  Bar_engraver should come *after* any engravers that
+  modify whichBar
+
+  This is a little hairy : whichBar may be set by
+  Repeat_acknowledge_engraver::process_music, which is at score
+  context. This means that grobs could should be created after
+  process_music. We do stuff process_acknowledged_grobs (), just to be
+  on the safe side.
+*/
 
 void
-Bar_engraver::do_removal_processing ()
+Bar_engraver::process_acknowledged_grobs ()
 {
-  if (bar_p_) 
-    {
-      typeset_element (bar_p_);
-      bar_p_ =0;
-    }
+  if (!bar_ && scm_is_string (get_property ("whichBar")))
+    create_bar ();
 }
 
 void
-Bar_engraver::do_process_requests()
-{  
-  Time_description const *time = get_staff_info().time_C_;
-  if (bar_req_l_) 
-    {
-      create_bar ();    
-      bar_p_->type_str_ = bar_req_l_->type_str_;
-    }
-  else if (!now_mom ())
-    {
-      create_bar ();
-      bar_p_->type_str_ = "|";
-    }
-  else 
-    {
-      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_)
-    {
-      Break_req r;
-      r.penalty_i_ = Break_req::DISALLOW;
-      daddy_grav_l ()->try_music (&r);
-    }
-}
-
-
-void 
-Bar_engraver::do_pre_move_processing()
+Bar_engraver::typeset_bar ()
 {
-  if (bar_p_) 
-    {
-      typeset_element (bar_p_);
-      bar_p_ =0;
-    }
+  bar_ = 0;
 }
 
+/*
+  lines may only be broken if there is a barline in all staves
+*/
 void
-Bar_engraver::do_post_move_processing()
+Bar_engraver::stop_translation_timestep ()
 {
-  bar_req_l_ = 0;
+  if (!bar_)
+    /* guh. Use properties! */
+    get_score_engraver ()->forbid_breaks ();
+  else
+    typeset_bar ();
 }
 
-
-
-ADD_THIS_TRANSLATOR(Bar_engraver);
-
-
+ADD_TRANSLATOR (Bar_engraver,
+		/* descr */ "Create barlines. This engraver is controlled through the "
+		"@code{whichBar} property. If it has no bar line to create, it will forbid a linebreak at this point",
+		/* creats*/ "BarLine",
+		/* accepts */ "",
+		/* acks  */ "",
+		/* reads */ "whichBar",
+		/* write */ "");