X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-engraver.cc;h=bed12337d8b078f37e4dd48f246fa491b2244626;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=540c32139609d26dd2d87d09b292f16eb86ae5f6;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 540c321396..bed12337d8 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,58 +3,52 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "bar.hh"
+#include "bar-line.hh"
 #include "score-engraver.hh"
-#include "musical-request.hh"
-#include "engraver-group-engraver.hh"
 #include "warn.hh"
 #include "item.hh"
-#include "engraver.hh"
+
+#include "translator.icc"
 
 /*
   generate bars. Either user ("|:"), or default (new measure)
-
-  */
+*/
 class Bar_engraver : public Engraver
 {
 public:
-  Bar_engraver();
-  VIRTUAL_COPY_CONS(Translator);
-  void request_bar (String type_str);
-    
+  TRANSLATOR_DECLARATIONS (Bar_engraver);
+  void request_bar (String type_string);
+
 protected:
   virtual void finalize ();
-  virtual void stop_translation_timestep();
-  virtual void create_grobs ();
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 
 private:
   void typeset_bar ();
   void create_bar ();
 
-  Item * bar_p_;
+  Item *bar_;
 };
 
-Bar_engraver::Bar_engraver()
+Bar_engraver::Bar_engraver ()
 {
-  bar_p_ =0;
+  bar_ = 0;
 }
 
 void
 Bar_engraver::create_bar ()
 {
-  if (!bar_p_)
+  if (!bar_)
     {
-      bar_p_ = new Item (get_property ("BarLine"));
-
+      bar_ = make_item ("BarLine", SCM_EOL);
       SCM gl = get_property ("whichBar");
-      if (scm_equal_p (gl, bar_p_->get_grob_property ("glyph")) != SCM_BOOL_T)
-	  bar_p_->set_grob_property ("glyph", gl);
-      
-      announce_grob (bar_p_, 0);
+      if (scm_equal_p (gl, bar_->get_property ("glyph")) != SCM_BOOL_T)
+	bar_->set_property ("glyph", gl);
     }
 }
 
@@ -65,50 +59,46 @@ Bar_engraver::finalize ()
 }
 
 /*
-  Bar_engraver should come *after* any engravers that expect bars to
-  modify whichBar in  deprecated_process_music () be typeset
+  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::create_grobs ()
+Bar_engraver::process_acknowledged ()
 {
-  if (!bar_p_ && gh_string_p (get_property ("whichBar")))
-    {
-      create_bar ();
-    }
+  if (!bar_ && scm_is_string (get_property ("whichBar")))
+    create_bar ();
 }
 
 void
 Bar_engraver::typeset_bar ()
 {
-  if (bar_p_) 
-    {
-      typeset_grob (bar_p_);
-      bar_p_ =0;
-    }
+  bar_ = 0;
 }
 
 /*
-  lines may only be broken if there is a barline in all staffs 
+  lines may only be broken if there is a barline in all staves
 */
-void 
-Bar_engraver::stop_translation_timestep()
+void
+Bar_engraver::stop_translation_timestep ()
 {
-  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 ();	// guh. Use properties!
-    }
+  if (!bar_)
+    /* guh. Use properties! */
+    get_score_engraver ()->forbid_breaks ();
   else
     typeset_bar ();
 }
 
-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",
+		/* accept */ "",
+		/* read */ "whichBar",
+		/* write */ "");