release: 1.3.92

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 5811e6dc864c1b4a4be43938f9f920c03852fc33..5a45005be8cfc6e19a28e9ec0672b0dab3c5e942 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,19 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997, 1998, 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "bar.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 "engraver.hh"
+
+/**
+  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);
+    
+protected:
+  virtual void do_creation_processing ();
+  virtual void do_removal_processing ();
+  virtual void do_process_music();
+  virtual void do_pre_move_processing();
+
+private:
+  void typeset_bar ();
+  void create_bar ();
+
+  Item * bar_p_;
+};
 
 Bar_engraver::Bar_engraver()
 {
@@ -23,75 +47,48 @@ Bar_engraver::Bar_engraver()
   do_post_move_processing();
 }
 
-
-
-
 void
 Bar_engraver::create_bar ()
 {
   if (!bar_p_)
     {
-      bar_p_ = new Staff_bar;
-      bar_p_->set_elt_property (break_priority_scm_sym, gh_int2scm (0));
-
-      // urg: "" != empty...
-      SCM default_type = get_property ("defaultBarType", 0);
-      if (gh_string_p (default_type))
-       {
-         bar_p_->type_str_ = ly_scm2string (default_type);
-       }
+      bar_p_ = new Item (get_property ("basicBarProperties"));
 
-      /*
-       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_sym, SCM_BOOL_T);
-       }
-      prop = get_property ("barSize", 0);
-      if (SCM_NUMBERP(prop))
-       {
-         bar_p_->set_elt_property (bar_size_scm_sym, prop);
-       }
-      announce_element (Score_element_info (bar_p_, 0));
+      SCM gl = get_property ("whichBar");
+      if (scm_equal_p (gl, bar_p_->get_elt_property ("glyph")) != SCM_BOOL_T)
+         bar_p_->set_elt_property ("glyph", gl);
+      
+      announce_element (bar_p_, 0);
     }
 }
 
-/**
-   Make a barline.  If there are both |: and :| requested, merge them
-   to :|:.
+void 
+Bar_engraver::do_creation_processing ()
+{
+}
 
-*/
 void
-Bar_engraver::request_bar (String requested_type)
+Bar_engraver::do_removal_processing ()
 {
-  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;
+  typeset_bar ();
 }
 
-void 
-Bar_engraver::do_creation_processing ()
+/*
+  Bar_engraver should come *after* any engravers that expect bars to
+  modify whichBar in do_process_music () be typeset
+*/
+void
+Bar_engraver::do_process_music()
 {
+  SCM b =get_property ("whichBar");
+  if (gh_string_p (b))
+    {
+      create_bar ();
+    }
 }
 
 void
-Bar_engraver::do_removal_processing ()
+Bar_engraver::typeset_bar ()
 {
   if (bar_p_) 
     {
@@ -100,20 +97,12 @@ Bar_engraver::do_removal_processing ()
     }
 }
 
-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 () : "";
-
-  if (which.length_i ())
-    {
-      create_bar();
-      bar_p_->type_str_ = which;
-    }
-  
+/*
+  lines may only be broken if there is a barline in all staffs 
+*/
+void 
+Bar_engraver::do_pre_move_processing()
+{
   if (!bar_p_)
     {
       Score_engraver * e = 0;
@@ -122,25 +111,14 @@ Bar_engraver::do_process_requests()
        {
          e = dynamic_cast<Score_engraver*> (t);
        }
-      
+
       if (!e)
        programming_error ("No score engraver!");
       else
-       e->forbid_breaks ();
-    }
-}
-
-
-void 
-Bar_engraver::do_pre_move_processing()
-{
-  if (bar_p_) 
-    {
-      typeset_element (bar_p_);
-      bar_p_ =0;
+       e->forbid_breaks ();    // guh. Use properties!
     }
+  else
+    typeset_bar ();
 }
 
 ADD_THIS_TRANSLATOR(Bar_engraver);
-
-