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 dad72a4fe4f7648f1125d65df46ea1e2d4569b36..29151650094cdc1ccdc03539b88c8dba3e588afe 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,15 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 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 "warn.hh"
 #include "item.hh"
 
+#include "translator.icc"
+
 /*
   generate bars. Either user ("|:"), or default (new measure)
 */
@@ -19,12 +23,12 @@ class Bar_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Bar_engraver);
-  void request_bar (String type_string);
+  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 ();
@@ -63,12 +67,12 @@ Bar_engraver::finalize ()
   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_ && scm_is_string (get_property ("whichBar")))
     create_bar ();
@@ -87,17 +91,15 @@ void
 Bar_engraver::stop_translation_timestep ()
 {
   if (!bar_)
-    /* guh. Use properties! */
-    get_score_engraver ()->forbid_breaks ();
+    context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
   else
     typeset_bar ();
 }
 
 ADD_TRANSLATOR (Bar_engraver,
-               /* descr */ "Create barlines. This engraver is controlled through the "
+               /* 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",
-               /* creats*/ "BarLine",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "whichBar",
-               /* write */ "");
+               /* create */ "BarLine",
+               /* accept */ "",
+               /* read */ "whichBar",
+               /* write */ "forbidBreak");