Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 6d38520d207805a0c952c7c119cb8f61a470e69c..29151650094cdc1ccdc03539b88c8dba3e588afe 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,43 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "bar-line.hh"
+#include "context.hh"
+#include "score-context.hh"
 #include "score-engraver.hh"
-#include "event.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:
-  TRANSLATOR_DECLARATIONS(  Bar_engraver );
-  void request_bar (String type_string);
-    
+  TRANSLATOR_DECLARATIONS (Bar_engraver);
+  void request_bar (string type_string);
+
 protected:
   virtual void finalize ();
-  virtual void stop_translation_timestep ();
-  virtual void process_acknowledged_grobs ();
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 
 private:
   void typeset_bar ();
   void create_bar ();
 
-  Item * bar_;
+  Item *bar_;
 };
 
 Bar_engraver::Bar_engraver ()
 {
-  bar_ =0;
+  bar_ = 0;
 }
 
 void
@@ -47,12 +47,10 @@ Bar_engraver::create_bar ()
 {
   if (!bar_)
     {
-      bar_ = new Item (get_property ("BarLine"));
+      bar_ = make_item ("BarLine", SCM_EOL);
       SCM gl = get_property ("whichBar");
-      if (scm_equal_p (gl, bar_->get_grob_property ("glyph")) != SCM_BOOL_T)
-         bar_->set_grob_property ("glyph", gl);
-      
-      announce_grob(bar_, SCM_EOL);
+      if (scm_equal_p (gl, bar_->get_property ("glyph")) != SCM_BOOL_T)
+       bar_->set_property ("glyph", gl);
     }
 }
 
@@ -63,56 +61,45 @@ Bar_engraver::finalize ()
 }
 
 /*
-  Bar_engraver should come *after* any engravers that  
+  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
+  process_music. We do stuff process_acknowledged (), just to be
   on the safe side.
-     
 */
 
 void
-Bar_engraver::process_acknowledged_grobs ()
+Bar_engraver::process_acknowledged ()
 {
-  if (!bar_ && 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_) 
-    {
-      typeset_grob (bar_);
-      bar_ =0;
-    }
+  bar_ = 0;
 }
 
 /*
-  lines may only be broken if there is a barline in all staves 
+  lines may only be broken if there is a barline in all staves
 */
-void 
+void
 Bar_engraver::stop_translation_timestep ()
 {
   if (!bar_)
-    {
-      top_engraver ()->forbid_breaks ();       // guh. Use properties!
-    }
+    context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
   else
     typeset_bar ();
 }
 
-
-ENTER_DESCRIPTION(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 */       "");
+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 */ "forbidBreak");