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()
{
do_post_move_processing();
}
-
-
-
void
Bar_engraver::create_bar ()
{
if (!bar_p_)
{
- bar_p_ = new Staff_bar;
- bar_p_->set_elt_property ("break-aligned", SCM_BOOL_T);
-
- // urg: "" != empty...
- SCM default_type = get_property ("defaultBarType");
- if (gh_string_p (default_type))
- {
- bar_p_->set_elt_property ("glyph", default_type); // gu.h
- }
+ bar_p_ = new Item (get_property ("basicBarProperties"));
-#if 0
- /*
- urg. Why did I implement this? And did I implement this so
- clumsily?
-
- input/test/just-friends.ly
- Maybe a staffgroup of just one staff would be a better solution.
- */
- SCM prop = get_property ("barAtLineStart");
- if (to_boolean (prop))
- {
- bar_p_->set_elt_property ("at-line-start", SCM_BOOL_T);
- }
-#endif
- 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");
- if (!to_boolean (prop))
- return;
- }
- bool bar_existed = bar_p_;
- create_bar ();
- if (bar_existed && requested_type == "")
- {
- return;
- }
-
- String current = ly_scm2string (bar_p_->get_elt_property ("glyph"));
-
- if ((requested_type == "|:" && current== ":|")
- || (requested_type == ":|" && current == "|:"))
- requested_type = ":|:";
-
-
- bar_p_->set_elt_property ("glyph",
- ly_str02scm (requested_type.ch_C ()));
+ 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_)
{
}
}
-void
-Bar_engraver::do_process_music()
-{
- 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_->set_elt_property ("glyph", ly_str02scm (which.ch_C ()));
- }
-
+/*
+ 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;
{
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);
-
-
-