* lily/pfb.cc (LY_DEFINE): set ttf_verbosity from ttf-verbosity

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 2feb5f12a71a5a964f3a06002b76ade104946aad..dad72a4fe4f7648f1125d65df46ea1e2d4569b36 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,28 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "bar-line.hh"
 #include "score-engraver.hh"
-#include "event.hh"
-#include "engraver-group-engraver.hh"
 #include "warn.hh"
 #include "item.hh"
-#include "engraver.hh"
 
 /*
   generate bars. Either user ("|:"), or default (new measure)
-
-  */
+*/
 class Bar_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Bar_engraver);
   void request_bar (String type_string);
-    
+
 protected:
   virtual void finalize ();
   virtual void stop_translation_timestep ();
@@ -34,12 +30,12 @@ private:
   void typeset_bar ();
   void create_bar ();
 
-  Item * bar_;
+  Item *bar_;
 };
 
 Bar_engraver::Bar_engraver ()
 {
-  bar_ =0;
+  bar_ = 0;
 }
 
 void
@@ -47,12 +43,10 @@ Bar_engraver::create_bar ()
 {
   if (!bar_)
     {
-      bar_ = make_item ("BarLine");
+      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);
-      
-      announce_grob (bar_, SCM_EOL);
+       bar_->set_property ("glyph", gl);
     }
 }
 
@@ -63,7 +57,7 @@ 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
@@ -71,48 +65,39 @@ Bar_engraver::finalize ()
   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::process_acknowledged_grobs ()
 {
-  if (!bar_ && ly_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_)
-    {
-      get_score_engraver ()->forbid_breaks (); // guh. Use properties!
-    }
+    /* guh. Use properties! */
+    get_score_engraver ()->forbid_breaks ();
   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,
+               /* 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 */ "");