X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-engraver.cc;h=3d751ecf1282ef88d750761a2f71ddcc5424a55d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e8b29882f86e45bb3d667a1941c8292adaa1c4d7;hpb=7ed4019033adf7db7a8f64c4eb7b7f6d0449402f;p=lilypond.git

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index e8b29882f8..3d751ecf12 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,140 +3,116 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997, 1998, 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "bar-line.hh"
+#include "context.hh"
 #include "score-engraver.hh"
-#include "bar-engraver.hh"
-#include "staff-bar.hh"
-#include "musical-request.hh"
-#include "multi-measure-rest.hh"
-#include "command-request.hh"
-#include "timing-engraver.hh"
-#include "engraver-group-engraver.hh"
 #include "warn.hh"
+#include "item.hh"
+#include "spanner.hh"
 
-Bar_engraver::Bar_engraver()
+#include "translator.icc"
+
+/*
+  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);
+
+protected:
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 
+  DECLARE_END_ACKNOWLEDGER (spanner);
 
+private:
+  void create_bar ();
 
+  Item *bar_;
+  vector<Spanner*> spanners_;
+};
+
+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-aligned", SCM_BOOL_T);
-
-      // urg: "" != empty...
-      SCM default_type = get_property ("defaultBarType", 0);
-      if (gh_string_p (default_type))
-	{
-	  bar_p_->type_str_ = ly_scm2string (default_type);
-	}
-
-      /*
-	urg.  Why did I implement this?
-       */
-      SCM prop = get_property ("barAtLineStart", 0);
-      if (gh_boolean_p (prop) && gh_scm2bool (prop))
-	{
-	  bar_p_->set_elt_property ("at-line-start", SCM_BOOL_T);
-	}
-      announce_element (Score_element_info (bar_p_, 0));
+      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);
     }
 }
 
-/**
-   Make a barline.  If there are both |: and :| requested, merge them
-   to :|:.
-
+/*
+  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 (), just to be
+  on the safe side.
 */
+
 void
-Bar_engraver::request_bar (String requested_type)
+Bar_engraver::process_acknowledged ()
 {
-  if (!now_mom ())
-    {
-      SCM prop = get_property ("barAtLineStart", 0);
-      if (!gh_boolean_p (prop) && gh_scm2bool (prop))
-	return;
-    }
-  bool  bar_existed = bar_p_;
-  create_bar ();
-  if (bar_existed && requested_type == "")
-    {
-      return;
-    }
-  else if (((requested_type == "|:") && (bar_p_->type_str_ == ":|"))
-    || ((requested_type == ":|") && (bar_p_->type_str_ == "|:")))
-    bar_p_->type_str_ = ":|:";
-  else
-    bar_p_->type_str_ = requested_type;
-}
+  if (!bar_ && scm_is_string (get_property ("whichBar")))
+    create_bar ();
 
-void 
-Bar_engraver::do_creation_processing ()
-{
+  if (bar_)
+    for (vsize i = 0; i < spanners_.size (); i++)
+      spanners_[i]->set_bound (RIGHT, bar_);
 }
 
+/*
+  lines may only be broken if there is a barline in all staves
+*/
 void
-Bar_engraver::do_removal_processing ()
+Bar_engraver::stop_translation_timestep ()
 {
-  if (bar_p_) 
-    {
-      typeset_element (bar_p_);
-      bar_p_ =0;
-    }
+  if (!bar_)
+    context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
+
+  bar_ = 0;
+  spanners_.clear ();
 }
 
 void
-Bar_engraver::do_process_requests()
-{  
-  Translator * t = daddy_grav_l  ()->get_simple_translator ("Timing_engraver");
-
-  Timing_engraver * te = dynamic_cast<Timing_engraver*>(t);
-  String which = (te) ? te->which_bar () : "";
+Bar_engraver::acknowledge_end_spanner (Grob_info gi)
+{
+  Grob *g = gi.grob ();
 
-  if (which.length_i ())
-    {
-      create_bar();
-      bar_p_->type_str_ = which;
-    }
-  
-  if (!bar_p_)
-    {
-      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 ();
-    }
+  if (to_boolean (g->get_property ("to-barline")))
+    spanners_.push_back (dynamic_cast<Spanner*> (g));
 }
 
+ADD_END_ACKNOWLEDGER (Bar_engraver, spanner);
 
-void 
-Bar_engraver::do_pre_move_processing()
-{
-  if (bar_p_) 
-    {
-      typeset_element (bar_p_);
-      bar_p_ =0;
-    }
-}
-
-ADD_THIS_TRANSLATOR(Bar_engraver);
+ADD_TRANSLATOR (Bar_engraver,
+		/* doc */
+		"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.",
 
+		/* create */
+		"BarLine ",
 
+		/* read */
+		"whichBar ",
 
+		/* write */
+		"forbidBreak "
+		);